fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonDistributionController.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.controller.cmmon;
+
+import cn.hutool.core.lang.Validator;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.course.vo.CourseModuleFreeExamVo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo;
+import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
+import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
+import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.user.entity.ClientLoginSeller;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 商品Controller
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Api(value = "游客商品管理", tags = {"游客商品管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/common/distribution")
+public class CommonDistributionController extends BaseController {
+
+
+    private final IDistributionActivityPosterService iDistributionActivityPosterService;
+
+    @ApiOperation("获取分享页面参数")
+    @PreAuthorize("@ss.hasPermi('system:poster:query')")
+    @GetMapping("/sharePoster")
+    public AjaxResult<Map<String,Object>> sharePoster(DistributionActivityPosterQueryBo bo) {
+
+        return AjaxResult.success("成功",iDistributionActivityPosterService.sharePoster(bo));
+    }
+
+}

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityController.java

@@ -7,8 +7,11 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityQueryBo;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,6 +37,7 @@ public class DistributionActivityController extends BaseController {
 
     private final IDistributionActivityService iDistributionActivityService;
 
+    private final IDistributionActivityGoodsService iDistributionActivityGoodsService;
     /**
      * 查询【请填写功能名称】列表
      */
@@ -58,4 +62,17 @@ public class DistributionActivityController extends BaseController {
     }
 
 
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation("查询活动详情商品列表")
+    @PreAuthorize("@ss.hasPermi('system:activity:list')")
+    @GetMapping("/goodsList")
+    public TableDataInfo<DistributionActivityGoodsVo> getDetailGoodsList(DistributionActivityGoodsQueryBo bo) {
+        startPage();
+        List<DistributionActivityGoodsVo> list = iDistributionActivityGoodsService.getDetailGoodsList(bo);
+        return getDataTable(list);
+    }
+
+
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityPosterController.java

@@ -2,6 +2,7 @@ package com.zhongzheng.controller.distribution;
 
 import java.util.List;
 import java.util.Arrays;
+import java.util.Map;
 
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.SellerTokenService;
@@ -56,5 +57,14 @@ public class DistributionActivityPosterController extends BaseController {
         return AjaxResult.success("成功",iDistributionActivityPosterService.makePoster(bo));
     }
 
+    @ApiOperation("获取分享链条码")
+    @PreAuthorize("@ss.hasPermi('system:poster:query')")
+    @GetMapping("/linkCode")
+    public AjaxResult<String> linkCode(DistributionActivityPosterQueryBo bo) {
+        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setSellerId(loginUser.getSeller().getSellerId());
+        return AjaxResult.success("成功",iDistributionActivityPosterService.getLinkCode(bo));
+    }
+
 
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionLinkController.java

@@ -58,7 +58,7 @@ public class DistributionLinkController extends BaseController {
     public AjaxResult<Void> add(@RequestBody DistributionLinkAddBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
-        return toAjax(iDistributionLinkService.insertByAddBo(bo) ? 1 : 0);
+        return toAjax(iDistributionLinkService.bindLink(bo) ? 1 : 0);
     }
 
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/wx/WxLoginController.java

@@ -18,6 +18,7 @@ import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.vo.UserVo;
 import com.zhongzheng.modules.wx.bo.WxLoginBody;
 import com.zhongzheng.modules.wx.bo.WxShareGoodsBo;
+import com.zhongzheng.modules.wx.service.IWxPayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -39,6 +40,9 @@ public class WxLoginController
     @Autowired
     private WxLoginService wxLoginService;
 
+    @Autowired
+    private IWxPayService iWxPayService;
+
     @Autowired
     private WxTokenService wxTokenService;
 
@@ -155,8 +159,6 @@ public class WxLoginController
     }
 
 
-
-
     @ApiOperation("刷新登录令牌")
     @GetMapping("/refreshToken/{userAccount}")
     public AjaxResult refreshToken(@PathVariable("userAccount") String userAccount)
@@ -167,5 +169,12 @@ public class WxLoginController
         return AjaxResult.success(map);
     }
 
+    @ApiOperation("公众号分享微信参数")
+    @GetMapping("/app/common/shareGzh")
+    public AjaxResult shareGzh(String url)
+    {
+        Map<String,String> map = iWxPayService.shareGzh(url);
+        return AjaxResult.success(map);
+    }
 
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineHandler.java

@@ -1,7 +1,6 @@
 package com.zhongzheng.framework.mybatisplus;
 
 import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
@@ -89,7 +88,7 @@ public class CustomTenantLineHandler implements TenantLineHandler {
      */
     @Override
     public boolean ignoreTable(String tableName) {
-        if (!enabledTenant){
+        if (!enabledTenant || tableName.contains("top_")){
             //总平台忽略tenantId
             return true;
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionChapterExamService.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.bank.bo.QuestionChapterExamQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionChapterExam;
 import com.zhongzheng.modules.bank.vo.ExamVo;
 import com.zhongzheng.modules.bank.vo.QuestionChapterExamVo;
+import com.zhongzheng.modules.top.goods.domain.TopQuestionChapterExam;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionChapterExamServiceImpl.java

@@ -14,8 +14,11 @@ import com.zhongzheng.modules.bank.mapper.QuestionChapterExamMapper;
 import com.zhongzheng.modules.bank.service.IQuestionChapterExamService;
 import com.zhongzheng.modules.bank.vo.ExamVo;
 import com.zhongzheng.modules.bank.vo.QuestionChapterExamVo;
+import com.zhongzheng.modules.top.goods.domain.TopQuestionChapterExam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -115,4 +118,6 @@ public class QuestionChapterExamServiceImpl extends ServiceImpl<QuestionChapterE
     public void deleteByIdAndTenant(Long newChapterExamId, Long newTenantId) {
         baseMapper.deleteByIdAndTenant(newChapterExamId, newTenantId);
     }
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseBusinessService.java

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.course.bo.CourseBusinessEditBo;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.vo.CourseBusinessVo;
+import com.zhongzheng.modules.top.goods.domain.TopCourseBusiness;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseChapterBusinessService.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.course.bo.CourseChapterBusinessQueryBo;
 import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
 import com.zhongzheng.modules.course.domain.CourseSectionBusiness;
 import com.zhongzheng.modules.course.vo.CourseChapterBusinessVo;
+import com.zhongzheng.modules.top.goods.domain.TopCourseChapterBusiness;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSectionBusinessService.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.course.bo.SectionWatchPerBo;
 import com.zhongzheng.modules.course.domain.CourseSectionBusiness;
 import com.zhongzheng.modules.course.vo.CourseSectionBusinessVo;
 import com.zhongzheng.modules.course.vo.CourseSectionWatchPerVo;
+import com.zhongzheng.modules.top.goods.domain.TopCourseSectionBusiness;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseSubjectService.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.course.bo.CourseSubjectAddBo;
 import com.zhongzheng.modules.course.bo.CourseSubjectEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.grade.bo.ClassGradeListBo;
+import com.zhongzheng.modules.top.goods.domain.TopCourseSubject;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterBusinessServiceImpl.java

@@ -13,8 +13,11 @@ import com.zhongzheng.modules.course.domain.CourseChapterBusiness;
 import com.zhongzheng.modules.course.mapper.CourseChapterBusinessMapper;
 import com.zhongzheng.modules.course.service.ICourseChapterBusinessService;
 import com.zhongzheng.modules.course.vo.CourseChapterBusinessVo;
+import com.zhongzheng.modules.top.goods.domain.TopCourseChapterBusiness;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionBusinessServiceImpl.java

@@ -13,8 +13,11 @@ import com.zhongzheng.modules.course.domain.CourseSectionBusiness;
 import com.zhongzheng.modules.course.mapper.CourseSectionBusinessMapper;
 import com.zhongzheng.modules.course.service.ICourseSectionBusinessService;
 import com.zhongzheng.modules.course.vo.CourseSectionBusinessVo;
+import com.zhongzheng.modules.top.goods.domain.TopCourseSectionBusiness;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -109,4 +112,6 @@ public class CourseSectionBusinessServiceImpl extends ServiceImpl<CourseSectionB
     public void deleteByIdAndTenant(Long sectionId, Long newTenantId) {
         baseMapper.deleteByIdAndTenant(sectionId, newTenantId);
     }
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityAddBo.java

@@ -27,7 +27,7 @@ public class DistributionActivityAddBo {
     @ApiModelProperty("活动名称")
     private String name;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，-1无效")
+    @ApiModelProperty("状态：1有效，0关闭，-1无效")
     private Integer status;
     /** 开始时间 */
     @ApiModelProperty("开始时间")
@@ -35,9 +35,6 @@ public class DistributionActivityAddBo {
     /** 结束时间 */
     @ApiModelProperty("结束时间")
     private Long endTime;
-    /** 使用状态：1启用，0关闭 */
-    @ApiModelProperty("使用状态：1启用，0关闭 ")
-    private Integer useStatus;
     /** 模板ID */
     @ApiModelProperty("模板ID")
     private Long tempId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityEditBo.java

@@ -34,7 +34,7 @@ public class DistributionActivityEditBo {
     private String name;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，-1无效")
+    @ApiModelProperty("状态：1有效，0关闭，-1无效")
     private Integer status;
 
     /** 开始时间 */
@@ -45,10 +45,6 @@ public class DistributionActivityEditBo {
     @ApiModelProperty("结束时间")
     private Long endTime;
 
-    /** 使用状态：1启用，0关闭 */
-    @ApiModelProperty("使用状态：1启用，0关闭 ")
-    private Integer useStatus;
-
     /** 模板ID */
     @ApiModelProperty("模板ID")
     private Long tempId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterAddBo.java

@@ -27,11 +27,8 @@ public class DistributionActivityPosterAddBo {
     private String posterConfig;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，-1无效")
+    @ApiModelProperty("状态：1有效，0关闭，-1无效")
     private Integer status;
-    /** 使用状态：1启用，0关闭 */
-    @ApiModelProperty("使用状态：1启用，0关闭")
-    private Integer useStatus;
     /** 添加时间 */
     @ApiModelProperty("添加时间")
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterEditBo.java

@@ -32,11 +32,8 @@ public class DistributionActivityPosterEditBo {
     private String posterConfig;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，-1无效")
+    @ApiModelProperty("状态：1有效，0关闭，-1无效")
     private Integer status;
-    /** 使用状态：1启用，0关闭 */
-    @ApiModelProperty("使用状态：1启用，0关闭")
-    private Integer useStatus;
 
     /** 修改时间 */
     @ApiModelProperty("修改时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterQueryBo.java

@@ -1,15 +1,12 @@
 package com.zhongzheng.modules.distribution.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
+import java.util.List;
 
 /**
  * 【请填写功能名称】分页查询对象 distribution_activity_poster
@@ -37,14 +34,21 @@ public class DistributionActivityPosterQueryBo extends BaseEntity {
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
 
-
 	/** 海报模板地址 */
 	@ApiModelProperty("海报模板地址")
 	private String url;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，-1无效")
-	private Integer status;
 
 	@ApiModelProperty("业务员ID")
 	private Long sellerId;
+
+	@ApiModelProperty("状态：1有效，0关闭，-1无效")
+	private List<Integer> status;
+
+	@ApiModelProperty("链条码")
+	private String linkCode;
+
+	@ApiModelProperty("分享码")
+	private String shareCode;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityQueryBo.java

@@ -1,15 +1,12 @@
 package com.zhongzheng.modules.distribution.bo;
 
+import com.zhongzheng.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
+import java.util.List;
 
 /**
  * 【请填写功能名称】分页查询对象 distribution_activity
@@ -46,8 +43,8 @@ public class DistributionActivityQueryBo extends BaseEntity {
 	@ApiModelProperty("活动名称")
 	private String name;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，-1无效")
-	private Integer status;
+	@ApiModelProperty("状态：1有效，0,关闭 -1无效")
+	private List<Integer> status;
 	/** 开始时间 */
 	@ApiModelProperty("开始时间")
 	private Long startTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivity.java

@@ -43,8 +43,6 @@ private static final long serialVersionUID=1L;
     private Long tempId;
     /** 海报ID */
     private Long posterId;
-    /** 使用状态：1启用，0关闭 */
-    private Integer useStatus;
     /** 拥挤冻结期（天） */
     private Integer freezingPeriod;
     /** 备注 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivityPoster.java

@@ -31,10 +31,8 @@ private static final long serialVersionUID=1L;
     private String name;
     /** 海报模板地址 */
     private String url;
-    /** 状态：1有效，0无效 */
+    /** 状态：1有效，0关闭 -1无效 */
     private Integer status;
-    /** 使用状态：1启用，0关闭 */
-    private Integer useStatus;
     /** 海报配置 */
     private String posterConfig;
     /** 添加时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionActivityGoodsMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
 
 import java.util.List;
 
@@ -15,4 +16,5 @@ import java.util.List;
  */
 public interface DistributionActivityGoodsMapper extends BaseMapper<DistributionActivityGoods> {
    List<ActivityGoodsPriceVo> getGoodsList(DistributionActivityGoodsQueryBo bo);
+   List<DistributionActivityGoodsVo> getDetailGoodsList(DistributionActivityGoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityGoodsService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
+import com.zhongzheng.modules.goods.bo.GoodsPullResultBo;
 import com.zhongzheng.modules.goods.bo.GoodsPullTenantBo;
 
 import java.util.List;
@@ -16,10 +18,12 @@ import java.util.List;
  */
 public interface IDistributionActivityGoodsService extends IService<DistributionActivityGoods> {
 
-    boolean pullGoods(GoodsPullTenantBo bo);
+    List<GoodsPullResultBo> pullGoods(GoodsPullTenantBo bo);
 
     void saveBatchEntity(List<DistributionActivityGoods> activityGoodsList);
 
     List<ActivityGoodsPriceVo> getGoodsList(DistributionActivityGoodsQueryBo bo);
 
+    List<DistributionActivityGoodsVo> getDetailGoodsList(DistributionActivityGoodsQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionActivityPosterService.java

@@ -9,6 +9,7 @@ import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Service接口
@@ -25,6 +26,10 @@ public interface IDistributionActivityPosterService extends IService<Distributio
 
 	String makePoster(DistributionActivityPosterQueryBo bo);
 
+	String getLinkCode(DistributionActivityPosterQueryBo bo);
+
+	Map<String,Object> sharePoster(DistributionActivityPosterQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionLinkService.java

@@ -35,6 +35,8 @@ public interface IDistributionLinkService extends IService<DistributionLink> {
 	 */
 	Boolean insertByAddBo(DistributionLinkAddBo bo);
 
+	Boolean bindLink(DistributionLinkAddBo bo);
+
 	/**
 	 * 根据编辑业务对象修改分销链路
 	 * @param bo 分销链路编辑业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityPosterServiceImpl.java

@@ -45,8 +45,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.net.URL;
-import java.util.Base64;
-import java.util.Collection;
+import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -157,11 +156,55 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
         return urlBase64;
     }
 
+    @Override
+    public String getLinkCode(DistributionActivityPosterQueryBo bo) {
+        DistributionActivityVo activityVo = iDistributionActivityService.queryById(bo.getDistributionId());
+        if(Validator.isEmpty(activityVo)){
+            throw new CustomException("活动不存在");
+        }
+        DistributionSellerVo sellerVo = iDistributionSellerService.queryById(bo.getSellerId());
+        DistributionLinkAddBo addBo = new DistributionLinkAddBo();
+        String linkCode =activityVo.getDistributionId()+"_"+sellerVo.getSellerId()+"_"+ToolsUtils.getRandomString(8);
+        addBo.setLinkCode(linkCode);
+        addBo.setSellerId(sellerVo.getSellerId());
+        addBo.setDistributionId(activityVo.getDistributionId());
+        addBo.setOwner(1);
+        iDistributionLinkService.insertByAddBo(addBo);
+        return linkCode;
+    }
+
+    @Override
+    public Map<String, Object> sharePoster(DistributionActivityPosterQueryBo bo) {
+        if(Validator.isEmpty(bo.getLinkCode())||Validator.isEmpty(bo.getShareCode())){
+            throw new CustomException("参数错误");
+        }
+        if(Validator.isEmpty(bo.getDistributionId())){
+            throw new CustomException("活动ID缺失");
+        }
+        Map<String, Object> map = new HashMap<>();
+        DistributionActivityVo activityVo = iDistributionActivityService.queryById(bo.getDistributionId());
+        DistributionActivityPoster db = this.baseMapper.selectById(activityVo.getPosterId());
+        DistributionSellerVo sellerVo = iDistributionSellerService.queryById(bo.getSellerId());
+
+        SysTenant sysTenant = iSysTenantService.getOne(new LambdaQueryWrapper<SysTenant>().eq(SysTenant::getTenantId, ToolsUtils.getTenantId()));
+        String urlActivity = "https://"+sysTenant.getHostH5Seller()+"/pages5/scan/retailact?shareCode="+sellerVo.getShareCode()+"&distributionId="+activityVo.getDistributionId()+"&linkCode="+bo.getLinkCode()+"&distributionCode="+activityVo.getCode();
+
+        String urlCard = "https://"+sysTenant.getHostH5Seller()+"/pages/vcard/index?shareCode="+sellerVo.getShareCode();
+        map.put("urlActivity",urlActivity);
+        map.put("urlCard",urlCard);
+        map.put("posterUrl",db.getUrl());
+        map.put("posterConfig",db.getPosterConfig());
+        map.put("startTime",activityVo.getStartTime());
+        map.put("endTime",activityVo.getEndTime());
+        map.put("status",activityVo.getStatus());
+        return map;
+    }
+
     @Override
     public List<DistributionActivityPosterVo> queryList(DistributionActivityPosterQueryBo bo) {
         LambdaQueryWrapper<DistributionActivityPoster> lqw = Wrappers.lambdaQuery();
         lqw.eq(StrUtil.isNotBlank(bo.getUrl()), DistributionActivityPoster::getUrl, bo.getUrl());
-        lqw.eq(bo.getStatus() != null, DistributionActivityPoster::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, DistributionActivityPoster::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 
@@ -199,8 +242,7 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
         //校验是否有绑定活动
         int count = iDistributionActivityService.count(new LambdaQueryWrapper<DistributionActivity>()
                 .eq(DistributionActivity::getPosterId, bo.getPosterId())
-                .eq(DistributionActivity::getStatus, 1)
-                .eq(DistributionActivity::getUseStatus, 1));
+                .eq(DistributionActivity::getStatus, 1));
         if (count > 0 ){
             throw new CustomException("该海报已绑定启用的分销活动，请勿修改！");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.modules.activity.domain.ActivityGoodsPrice;
 import com.zhongzheng.modules.activity.service.IActivityGoodsPriceService;
@@ -27,11 +28,17 @@ import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterSe
 import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
+import com.zhongzheng.modules.goods.bo.GoodsPullResultBo;
+import com.zhongzheng.modules.goods.bo.GoodsPullTenantBo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplate;
 import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateGoods;
 import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.top.goods.domain.TopActivityGoodsPrice;
 import com.zhongzheng.modules.top.goods.domain.TopGoods;
+import com.zhongzheng.modules.top.goods.service.ITopActivityGoodsPriceService;
 import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,6 +73,10 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
     private IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
     @Autowired
     private IActivityGoodsPriceService iActivityGoodsPriceService;
+    @Autowired
+    private ITopActivityGoodsPriceService iTopActivityGoodsPriceService;
+    @Autowired
+    private IDistributionActivityTemplateService iDistributionActivityTemplateService;
 
     @Override
     public DistributionActivityVo queryById(Long distributionId){
@@ -110,7 +121,7 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), DistributionActivity::getCode, bo.getCode());
         lqw.eq(bo.getType() != null, DistributionActivity::getType, bo.getType());
         lqw.like(StrUtil.isNotBlank(bo.getName()), DistributionActivity::getName, bo.getName());
-        lqw.eq(bo.getStatus() != null, DistributionActivity::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, DistributionActivity::getStatus, bo.getStatus());
         lqw.eq(bo.getStartTime() != null, DistributionActivity::getStartTime, bo.getStartTime());
         lqw.eq(bo.getEndTime() != null, DistributionActivity::getEndTime, bo.getEndTime());
         lqw.eq(bo.getTempId() != null, DistributionActivity::getTempId, bo.getTempId());
@@ -196,7 +207,7 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
     public Boolean updateByEditBo(DistributionActivityEditBo bo) {
         //校验
         DistributionActivity activityTemp = getById(bo.getDistributionId());
-        if (activityTemp.getUseStatus() == 1){
+        if (activityTemp.getStatus() == 1){
             throw new CustomException("活动已启用，不能修改！");
         }
         DistributionActivity update = BeanUtil.toBean(bo, DistributionActivity.class);
@@ -269,8 +280,8 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
         DistributionActivity activity = getById(bo.getDistributionId());
         if (bo.getStatus() == 1){
             //启用活动
-            if (DateUtils.getNowTime() > activity.getEndTime()){
-                throw new CustomException("活动已结束，禁止启用！");
+            if (DateUtils.getNowTime()< activity.getStartTime() || DateUtils.getNowTime() > activity.getEndTime()){
+                throw new CustomException("不在活动时间内，禁止启用！");
             }
             if (ObjectUtils.isNotNull(activity.getTempId())){
                 //总平台下发活动对比商品是否缺失
@@ -292,17 +303,19 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean pullGoods(Long distributionId) {
         DistributionActivity activity = getById(distributionId);
+        if (ObjectUtils.isNull(activity.getTempId())){
+            //不是总平台下发的活动
+            return true;
+        }
         //总平台下发活动对比商品是否缺失
         List<DistributionActivityGoods> activityGoods = iDistributionActivityGoodsService
                 .list(new LambdaQueryWrapper<DistributionActivityGoods>()
                         .eq(DistributionActivityGoods::getDistributionId, activity.getDistributionId())
                         .eq(DistributionActivityGoods::getStatus, 1));
-        List<DistributionActivityTemplateGoods> templateGoods = iDistributionActivityTemplateGoodsService
-                .list(new LambdaQueryWrapper<DistributionActivityTemplateGoods>()
-                        .eq(DistributionActivityTemplateGoods::getDistributionTempId, activity.getTempId())
-                        .eq(DistributionActivityTemplateGoods::getStatus, 1));
+        List<DistributionActivityTemplateGoods> templateGoods = iDistributionActivityTemplateGoodsService.getListEntity(activity.getTempId());
         if (activityGoods.size() == templateGoods.size()){
             //不缺失商品信息
             return true;
@@ -311,12 +324,74 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
             //总平台活动商品没有
             return true;
         }
+        DistributionActivityTemplate activityTemplate = iDistributionActivityTemplateService.getEntityById(activity.getTempId());
+        Long tenantId = Long.valueOf(ServletUtils.getRequest().getHeader("TenantId"));
         if (CollectionUtils.isEmpty(activityGoods)){
             //全部缺失
-            List<TopGoods> topGoods = iTopGoodsService.listByIds(templateGoods.stream().map(DistributionActivityTemplateGoods::getGoodsId).collect(Collectors.toList()));
-
+            List<TopGoods> topGoods = iTopGoodsService.listEntityByIds(templateGoods.stream().map(DistributionActivityTemplateGoods::getGoodsId).collect(Collectors.toList()));
+            GoodsPullTenantBo bo = new GoodsPullTenantBo();
+            bo.setGoodsList(topGoods);
+            bo.setTenantId(tenantId);
+            List<GoodsPullResultBo> result = iDistributionActivityGoodsService.pullGoods(bo);
+            //添加关联关系
+            List<ActivityGoodsPrice> goodsPriceList = new ArrayList<>();
+            List<DistributionActivityGoods> distributionActivityGo = templateGoods.stream().map(item -> {
+                DistributionActivityGoods activityGo = BeanUtil.toBean(item, DistributionActivityGoods.class);
+                activityGo.setTenantId(tenantId);
+                activityGo.setDistributionId(distributionId);
+                GoodsPullResultBo pul = result.stream().filter(x -> x.getOldGoodsId().equals(item.getGoodsId())).findFirst().orElse(null);
+                if (ObjectUtils.isNotNull(pul)) {
+                    activityGo.setGoodsId(pul.getNewGoodsId());
+                    //商品活动价格
+                    TopActivityGoodsPrice topGoodsPrice = iTopActivityGoodsPriceService.getEntity(item.getGoodsId(),activityTemplate.getCode());
+                    if (ObjectUtils.isNotNull(topGoodsPrice)){
+                        ActivityGoodsPrice goodsPrice = BeanUtil.toBean(topGoodsPrice, ActivityGoodsPrice.class);
+                        goodsPrice.setGoodsId(pul.getNewGoodsId());
+                        goodsPrice.setTenantId(tenantId);
+                        goodsPriceList.add(goodsPrice);
+                    }
+                }
+                return activityGo;
+            }).collect(Collectors.toList());
+            iDistributionActivityGoodsService.saveBatch(distributionActivityGo);
+            iActivityGoodsPriceService.saveBatch(goodsPriceList);
+        }else {
+            //部分缺失
+            List<Goods> goodsList = iGoodsService.listByIds(activityGoods.stream().map(DistributionActivityGoods::getGoodsId).collect(Collectors.toList()));
+            List<TopGoods> topGoods = iTopGoodsService.listEntityByIds(templateGoods.stream().map(DistributionActivityTemplateGoods::getGoodsId).collect(Collectors.toList()));
+            List<String> codes = goodsList.stream().map(Goods::getCode).collect(Collectors.toList());
+            List<TopGoods> goods = topGoods.stream().filter(item -> !codes.contains(item.getCode())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(goods)){
+                GoodsPullTenantBo bo = new GoodsPullTenantBo();
+                bo.setGoodsList(goods);
+                bo.setTenantId(tenantId);
+                List<GoodsPullResultBo> result = iDistributionActivityGoodsService.pullGoods(bo);
+                List<Long> ids = goods.stream().map(TopGoods::getGoodsId).collect(Collectors.toList());
+                //添加关联关系
+                List<ActivityGoodsPrice> goodsPriceList = new ArrayList<>();
+                List<DistributionActivityTemplateGoods> collect = templateGoods.stream().filter(x -> ids.contains(x.getGoodsId())).collect(Collectors.toList());
+                List<DistributionActivityGoods> distributionActivityGo = collect.stream().map(item -> {
+                    DistributionActivityGoods activityGo = BeanUtil.toBean(item, DistributionActivityGoods.class);
+                    activityGo.setTenantId(tenantId);
+                    activityGo.setDistributionId(distributionId);
+                    GoodsPullResultBo pul = result.stream().filter(x -> x.getOldGoodsId().equals(item.getGoodsId())).findFirst().orElse(null);
+                    if (ObjectUtils.isNotNull(pul)) {
+                        activityGo.setGoodsId(pul.getNewGoodsId());
+                        //商品活动价格
+                        TopActivityGoodsPrice topGoodsPrice = iTopActivityGoodsPriceService.getEntity(item.getGoodsId(),activityTemplate.getCode());
+                        if (ObjectUtils.isNotNull(topGoodsPrice)){
+                            ActivityGoodsPrice goodsPrice = BeanUtil.toBean(topGoodsPrice, ActivityGoodsPrice.class);
+                            goodsPrice.setGoodsId(pul.getNewGoodsId());
+                            goodsPrice.setTenantId(tenantId);
+                            goodsPriceList.add(goodsPrice);
+                        }
+                    }
+                    return activityGo;
+                }).collect(Collectors.toList());
+                iDistributionActivityGoodsService.saveBatch(distributionActivityGo);
+                iActivityGoodsPriceService.saveBatch(goodsPriceList);
+            }
         }
-
         return true;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionLinkServiceImpl.java

@@ -79,12 +79,25 @@ public class DistributionLinkServiceImpl extends ServiceImpl<DistributionLinkMap
 
     @Override
     public Boolean insertByAddBo(DistributionLinkAddBo bo) {
-        if(Validator.isNotEmpty(bo.getDistributionId())){
+        if(Validator.isEmpty(bo.getDistributionId())){
             throw new CustomException("活动ID不能为空");
         }
-        if(Validator.isNotEmpty(bo.getLinkCode())){
+        if(Validator.isEmpty(bo.getLinkCode())){
+            throw new CustomException("code不能为空");
+        }
+        DistributionLink add = BeanUtil.toBean(bo, DistributionLink.class);
+        add.setCreateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean bindLink(DistributionLinkAddBo bo) {
+        if(Validator.isEmpty(bo.getDistributionId())){
             throw new CustomException("活动ID不能为空");
         }
+        if(Validator.isEmpty(bo.getLinkCode())){
+            throw new CustomException("code不能为空");
+        }
         DistributionLink add = BeanUtil.toBean(bo, DistributionLink.class);
         DistributionSeller seller = iDistributionSellerService.getOne(new LambdaQueryWrapper<DistributionSeller>().eq(DistributionSeller::getUserId, bo.getUserId()));
         if(Validator.isNotEmpty(seller)){

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityPosterVo.java

@@ -33,12 +33,8 @@ public class DistributionActivityPosterVo {
 	@ApiModelProperty("海报配置")
 	private String posterConfig;
 	/** 状态：1有效，0无效 */
-	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，-1无效")
+	@ApiModelProperty("状态：1有效，0关闭，-1无效")
 	private Integer status;
-	/** 使用状态：1启用，0关闭 */
-	@ApiModelProperty("使用状态：1启用，0关闭")
-	private Integer useStatus;
 	/** 备注 */
 	@ApiModelProperty("备注")
 	private String remark;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityVo.java

@@ -37,7 +37,7 @@ public class DistributionActivityVo {
 	private String name;
 	/** 状态：1有效，0无效 */
 	@Excel(name = "状态：1有效，0无效")
-	@ApiModelProperty("状态：1有效，-1无效")
+	@ApiModelProperty("状态：1有效，0关闭，-1无效")
 	private Integer status;
 	/** 拥挤冻结期（天） */
 	@ApiModelProperty("拥挤冻结期（天）")
@@ -53,9 +53,6 @@ public class DistributionActivityVo {
 	@Excel(name = "结束时间")
 	@ApiModelProperty("结束时间")
 	private Long endTime;
-	/** 使用状态：1启用，0关闭 */
-	@ApiModelProperty("使用状态：1启用，0关闭 ")
-	private Integer useStatus;
 	/** 模板ID */
 	@Excel(name = "模板ID")
 	@ApiModelProperty("模板ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsPullResultBo.java

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2022年12月28日 9:28
+ */
+@Data
+public class GoodsPullResultBo implements Serializable {
+
+    @ApiModelProperty("旧商品ID")
+    private Long oldGoodsId;
+
+    @ApiModelProperty("新商品ID")
+    private Long newGoodsId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/bo/DistributionActivityTemplatePosterAddBo.java

@@ -23,11 +23,8 @@ public class DistributionActivityTemplatePosterAddBo {
     @ApiModelProperty("海报模板名称")
     private String name;
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，-1无效")
+    @ApiModelProperty("状态：1有效，0关闭，-1无效")
     private Integer status;
-    /** 使用状态：1启用，0关闭 */
-    @ApiModelProperty("使用状态：1启用，0关闭")
-    private Integer useStatus;
     /** 海报配置 */
     @ApiModelProperty("海报配置")
     private String posterConfig;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/bo/distributionActivityTemplatePosterEditBo.java

@@ -30,13 +30,9 @@ public class distributionActivityTemplatePosterEditBo {
     private String posterConfig;
 
     /** 状态：1有效，0无效 */
-    @ApiModelProperty("状态：1有效，-1无效")
+    @ApiModelProperty("状态：1有效，0关闭，-1无效")
     private Integer status;
 
-    /** 使用状态：1启用，0关闭 */
-    @ApiModelProperty("使用状态：1启用，0关闭")
-    private Integer useStatus;
-
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplate.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_template")
+@TableName("top_distribution_activity_template")
 public class DistributionActivityTemplate implements Serializable {
 
 private static final long serialVersionUID=1L;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplateGoods.java

@@ -20,7 +20,7 @@ import java.math.BigDecimal;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_template_goods")
+@TableName("top_distribution_activity_template_goods")
 public class DistributionActivityTemplateGoods implements Serializable {
 
 private static final long serialVersionUID=1L;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplateImage.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_template_image")
+@TableName("top_distribution_activity_template_image")
 public class DistributionActivityTemplateImage implements Serializable {
 
 private static final long serialVersionUID=1L;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplatePoster.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_template_poster")
+@TableName("top_distribution_activity_template_poster")
 public class DistributionActivityTemplatePoster implements Serializable {
 
 private static final long serialVersionUID=1L;
@@ -35,8 +35,6 @@ private static final long serialVersionUID=1L;
     private String posterConfig;
     /** 状态：1有效，0无效 */
     private Integer status;
-    /** 使用状态：1启用，0关闭 */
-    private Integer useStatus;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplateRelation.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("distribution_activity_template_relation")
+@TableName("top_distribution_activity_template_relation")
 public class DistributionActivityTemplateRelation implements Serializable {
 
 private static final long serialVersionUID=1L;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/IDistributionActivityTemplateGoodsService.java

@@ -49,4 +49,6 @@ public interface IDistributionActivityTemplateGoodsService extends IService<Dist
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<DistributionActivityTemplateGoods> getListEntity(Long tempId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/IDistributionActivityTemplateService.java

@@ -66,4 +66,6 @@ public interface IDistributionActivityTemplateService extends IService<Distribut
     boolean publishActivity(Long templateId);
 
     List<DistributionSellerVo> sellerList(DistributionSellerQuery query);
+
+    DistributionActivityTemplate getEntityById(Long tempId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateGoodsServiceImpl.java

@@ -15,6 +15,8 @@ import com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempGo
 import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateGoodsService;
 import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateGoodsVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -99,4 +101,12 @@ public class DistributionActivityTemplateGoodsServiceImpl extends ServiceImpl<Di
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public List<DistributionActivityTemplateGoods> getListEntity(Long tempId) {
+        return list(new LambdaQueryWrapper<DistributionActivityTemplateGoods>()
+                .eq(DistributionActivityTemplateGoods::getDistributionTempId, tempId)
+                .eq(DistributionActivityTemplateGoods::getStatus, 1));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.distribution.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -58,6 +59,7 @@ import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
 import com.zhongzheng.modules.top.user.service.ITopSysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -73,6 +75,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-06
  */
 @Service
+@DS("master")
 public class DistributionActivityTemplateServiceImpl extends ServiceImpl<DistributionActivityTempMapper, DistributionActivityTemplate> implements IDistributionActivityTemplateService {
 
     @Autowired
@@ -396,7 +399,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
             dailyActivity.setPosterId(poster.getPosterId());
             dailyActivity.setTempId(template.getId());
             dailyActivity.setTenantId(id);
-            dailyActivity.setUseStatus(0);
+            dailyActivity.setStatus(0);//默认关闭
             iDistributionActivityService.saveEntity(dailyActivity);
             //商品
             List<DistributionActivityGoods> activityGoodsList = new ArrayList<>();
@@ -461,4 +464,10 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
     public List<DistributionSellerVo> sellerList(DistributionSellerQuery query) {
         return iDistributionSellerService.getSellerListByTenant(query);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public DistributionActivityTemplate getEntityById(Long tempId) {
+        return getById(tempId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/vo/DistributionActivityTemplatePosterVo.java

@@ -30,11 +30,8 @@ public class DistributionActivityTemplatePosterVo {
 	@ApiModelProperty("海报配置")
 	private String posterConfig;
 	/** 状态：1有效，0无效 */
-	@ApiModelProperty("状态：1有效，-1无效")
+	@ApiModelProperty("状态：1有效，0关闭，-1无效")
 	private Integer status;
-	/** 使用状态：1启用，0关闭 */
-	@ApiModelProperty("使用状态：1启用，0关闭")
-	private Integer useStatus;
 	@ApiModelProperty("添加时间")
 	private Long createTime;
 	@ApiModelProperty("修改时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopActivityGoodsPriceService.java

@@ -10,4 +10,5 @@ import com.zhongzheng.modules.top.goods.domain.TopActivityGoodsPrice;
  * @date 2023-03-15
  */
 public interface ITopActivityGoodsPriceService extends IService<TopActivityGoodsPrice> {
+    TopActivityGoodsPrice getEntity(Long goodsId, String code);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCertificateCommonService.java

@@ -50,4 +50,6 @@ public interface ITopCertificateCommonService extends IService<TopCertificateCom
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCertificateCommon getEntityById(Long certificateId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCertificateService.java

@@ -49,4 +49,7 @@ public interface ITopCertificateService extends IService<TopCertificate> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCertificate getEntityBuId(Long certificateTypeId);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCertificateTpService.java

@@ -50,4 +50,6 @@ public interface ITopCertificateTpService extends IService<TopCertificateTp> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCertificateTp getEntity(Long certificateTpId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseBusinessService.java

@@ -49,4 +49,6 @@ public interface ITopCourseBusinessService extends IService<TopCourseBusiness> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourseBusiness getEntityById(Long businessId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseChapterBusinessService.java

@@ -49,4 +49,6 @@ public interface ITopCourseChapterBusinessService extends IService<TopCourseChap
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseChapterBusiness> getListEntity(Long oldChapterId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseChapterSectionService.java

@@ -49,4 +49,6 @@ public interface ITopCourseChapterSectionService extends IService<TopCourseChapt
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseChapterSection> getListEntity(Long oldChapterId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseChapterService.java

@@ -49,4 +49,6 @@ public interface ITopCourseChapterService extends IService<TopCourseChapter> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourseChapter getEntity(Long oldChapterId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseEducationTypeService.java

@@ -50,4 +50,6 @@ public interface ITopCourseEducationTypeService extends IService<TopCourseEducat
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourseEducationType getEntityById(Long oldEducationTypeId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseHandoutsBusinessService.java

@@ -49,4 +49,6 @@ public interface ITopCourseHandoutsBusinessService extends IService<TopCourseHan
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseHandoutsBusiness> listEntity(Long handoutsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseHandoutsService.java

@@ -49,4 +49,6 @@ public interface ITopCourseHandoutsService extends IService<TopCourseHandouts> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourseHandouts getEntity(Long handoutsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseMenuExamService.java

@@ -49,4 +49,6 @@ public interface ITopCourseMenuExamService extends IService<TopCourseMenuExam> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseMenuExam> getListEntity(Long oldCourseId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseMenuService.java

@@ -49,4 +49,6 @@ public interface ITopCourseMenuService extends IService<TopCourseMenu> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseMenu> listEntity(Long oldCourseId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseModuleBusinessService.java

@@ -49,4 +49,6 @@ public interface ITopCourseModuleBusinessService extends IService<TopCourseModul
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseModuleBusiness> getListEntity(Long oldModuleId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseModuleChapterService.java

@@ -49,4 +49,6 @@ public interface ITopCourseModuleChapterService extends IService<TopCourseModule
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseModuleChapter> getListEntity(Long oldModuleId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseModuleService.java

@@ -49,4 +49,7 @@ public interface ITopCourseModuleService extends IService<TopCourseModule> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourseModule getEntityById(Long oldModuleId);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseProjectTypeService.java

@@ -49,4 +49,6 @@ public interface ITopCourseProjectTypeService extends IService<TopCourseProjectT
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	TopCourseProjectType getEntity(Long projectTypeId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseSectionBusinessService.java

@@ -49,4 +49,7 @@ public interface ITopCourseSectionBusinessService extends IService<TopCourseSect
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseSectionBusiness> getListEntity(Long oldSectionId);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseSectionService.java

@@ -49,4 +49,6 @@ public interface ITopCourseSectionService extends IService<TopCourseSection> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourseSection getEntityById(Long oldSectionId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseService.java

@@ -49,4 +49,6 @@ public interface ITopCourseService extends IService<TopCourse> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourse getEntityById(Long courseId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseSubjectProjectService.java

@@ -49,4 +49,6 @@ public interface ITopCourseSubjectProjectService extends IService<TopCourseSubje
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopCourseSubjectProject> listEntity(Long id);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopCourseSubjectService.java

@@ -49,4 +49,6 @@ public interface ITopCourseSubjectService extends IService<TopCourseSubject> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopCourseSubject getEntityById(Long subjectId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopExamPaperService.java

@@ -49,4 +49,6 @@ public interface ITopExamPaperService extends IService<TopExamPaper> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopExamPaper getEntity(Long examPaperId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopExamQuestionService.java

@@ -49,4 +49,6 @@ public interface ITopExamQuestionService extends IService<TopExamQuestion> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopExamQuestion> getListEntity(Long oldExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopExamService.java

@@ -49,4 +49,6 @@ public interface ITopExamService extends IService<TopExam> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopExam getEntity(Long oldExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsAttachedService.java

@@ -49,4 +49,6 @@ public interface ITopGoodsAttachedService extends IService<TopGoodsAttached> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopGoodsAttached> getListEntity(Long oldGoodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsCourseService.java

@@ -49,4 +49,6 @@ public interface ITopGoodsCourseService extends IService<TopGoodsCourse> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopGoodsCourse> listEntity(Long oldGoodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsCourseTeacherService.java

@@ -49,4 +49,6 @@ public interface ITopGoodsCourseTeacherService extends IService<TopGoodsCourseTe
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopGoodsCourseTeacher> getListEntity(Long oldGoodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsService.java

@@ -23,4 +23,6 @@ public interface ITopGoodsService extends IService<TopGoods> {
     boolean goodsBatchCopyDisposeTenant();
 
 	List<TopGoodsVo> selectList(TopGoodsQueryBo bo);
+
+    List<TopGoods> listEntityByIds(List<Long> collect);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsSpecAttributeRelationService.java

@@ -49,4 +49,6 @@ public interface ITopGoodsSpecAttributeRelationService extends IService<TopGoods
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopGoodsSpecAttributeRelation> listEntity(Long oldSpecTemplateId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsSpecAttributeService.java

@@ -49,4 +49,6 @@ public interface ITopGoodsSpecAttributeService extends IService<TopGoodsSpecAttr
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopGoodsSpecAttribute> listEntity(Long oldSpecId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsSpecService.java

@@ -49,4 +49,6 @@ public interface ITopGoodsSpecService extends IService<TopGoodsSpec> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopGoodsSpec> listEntity(Long oldSpecTemplateId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopGoodsSpecTemplateService.java

@@ -49,4 +49,6 @@ public interface ITopGoodsSpecTemplateService extends IService<TopGoodsSpecTempl
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopGoodsSpecTemplate getEntityById(Long oldSpecTemplateId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopMajorProjectService.java

@@ -49,4 +49,6 @@ public interface ITopMajorProjectService extends IService<TopMajorProject> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopMajorProject> listEntiy(Long majorId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopMajorService.java

@@ -49,4 +49,6 @@ public interface ITopMajorService extends IService<TopMajor> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopMajor getEntityById(Long majorId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopPayServeService.java

@@ -49,4 +49,6 @@ public interface ITopPayServeService extends IService<TopPayServe> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopPayServe getEntityById(Long serverId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopPaySupplyService.java

@@ -49,4 +49,6 @@ public interface ITopPaySupplyService extends IService<TopPaySupply> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopPaySupply getEntityById(Long supplyId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopQuestionBusinessService.java

@@ -49,4 +49,6 @@ public interface ITopQuestionBusinessService extends IService<TopQuestionBusines
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopQuestionBusiness> getListEntity(Long oldModuleExamId, Integer type);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopQuestionChapterExamService.java

@@ -49,4 +49,6 @@ public interface ITopQuestionChapterExamService extends IService<TopQuestionChap
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopQuestionChapterExam> getListEntity(Long oldChapterExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopQuestionChapterService.java

@@ -49,4 +49,6 @@ public interface ITopQuestionChapterService extends IService<TopQuestionChapter>
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopQuestionChapter getEntitiy(Long oldChapterExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopQuestionModuleChapterService.java

@@ -49,4 +49,6 @@ public interface ITopQuestionModuleChapterService extends IService<TopQuestionMo
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TopQuestionModuleChapter> getListEntity(Long oldModuleExamId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopQuestionModuleService.java

@@ -49,4 +49,7 @@ public interface ITopQuestionModuleService extends IService<TopQuestionModule> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TopQuestionModule getEntityById(Long moduleExamId);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopQuestionService.java

@@ -52,4 +52,6 @@ public interface ITopQuestionService extends IService<TopQuestion> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<TopBankGoodsExamVo> getBankGoodsExamList(Long goodsId);
+
+    TopQuestion getEntity(Long oldQuestionId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopActivityGoodsPriceServiceImpl.java

@@ -1,10 +1,14 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.modules.top.goods.domain.TopActivityGoodsPrice;
 import com.zhongzheng.modules.top.goods.mapper.TopActivityGoodsPriceMapper;
 import com.zhongzheng.modules.top.goods.service.ITopActivityGoodsPriceService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 业务层次过滤器Service业务层处理
@@ -13,6 +17,14 @@ import org.springframework.stereotype.Service;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopActivityGoodsPriceServiceImpl extends ServiceImpl<TopActivityGoodsPriceMapper, TopActivityGoodsPrice> implements ITopActivityGoodsPriceService {
 
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopActivityGoodsPrice getEntity(Long goodsId, String code) {
+        return getOne(new LambdaQueryWrapper<TopActivityGoodsPrice>()
+        .eq(TopActivityGoodsPrice::getGoodsId,goodsId)
+        .eq(TopActivityGoodsPrice::getActivityCode,code));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCertificateCommonServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCertificateCommonMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCertificateCommonService;
 import com.zhongzheng.modules.top.goods.vo.TopCertificateCommonVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +30,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCertificateCommonServiceImpl extends ServiceImpl<TopCertificateCommonMapper, TopCertificateCommon> implements ITopCertificateCommonService {
 
     @Override
@@ -98,4 +102,10 @@ public class TopCertificateCommonServiceImpl extends ServiceImpl<TopCertificateC
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopCertificateCommon getEntityById(Long certificateId) {
+        return getById(certificateId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCertificateServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCertificateMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCertificateService;
 import com.zhongzheng.modules.top.goods.vo.TopCertificateVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +30,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCertificateServiceImpl extends ServiceImpl<TopCertificateMapper, TopCertificate> implements ITopCertificateService {
 
     @Override
@@ -97,4 +101,10 @@ public class TopCertificateServiceImpl extends ServiceImpl<TopCertificateMapper,
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopCertificate getEntityBuId(Long certificateTypeId) {
+        return getById(certificateTypeId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCertificateTpServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCertificateTpMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCertificateTpService;
 import com.zhongzheng.modules.top.goods.vo.TopCertificateTpVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +30,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCertificateTpServiceImpl extends ServiceImpl<TopCertificateTpMapper, TopCertificateTp> implements ITopCertificateTpService {
 
     @Override
@@ -101,4 +105,10 @@ public class TopCertificateTpServiceImpl extends ServiceImpl<TopCertificateTpMap
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopCertificateTp getEntity(Long certificateTpId) {
+        return getById(certificateTpId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseBusinessServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
@@ -12,6 +13,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCourseBusinessMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCourseBusinessService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseBusinessVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -24,6 +27,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseBusinessServiceImpl extends ServiceImpl<TopCourseBusinessMapper, TopCourseBusiness> implements ITopCourseBusinessService {
 
     @Override
@@ -90,4 +94,10 @@ public class TopCourseBusinessServiceImpl extends ServiceImpl<TopCourseBusinessM
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopCourseBusiness getEntityById(Long businessId) {
+        return getById(businessId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseChapterBusinessServiceImpl.java

@@ -1,11 +1,11 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.top.goods.bo.TopCourseChapterBusinessAddBo;
 import com.zhongzheng.modules.top.goods.bo.TopCourseChapterBusinessEditBo;
 import com.zhongzheng.modules.top.goods.bo.TopCourseChapterBusinessQueryBo;
@@ -14,6 +14,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCourseChapterBusinessMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCourseChapterBusinessService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseChapterBusinessVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,6 +28,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseChapterBusinessServiceImpl extends ServiceImpl<TopCourseChapterBusinessMapper, TopCourseChapterBusiness> implements ITopCourseChapterBusinessService {
 
     @Override
@@ -95,4 +98,11 @@ public class TopCourseChapterBusinessServiceImpl extends ServiceImpl<TopCourseCh
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public List<TopCourseChapterBusiness> getListEntity(Long oldChapterId) {
+        return  list(new LambdaQueryWrapper<TopCourseChapterBusiness>()
+                .eq(TopCourseChapterBusiness::getChapterId, oldChapterId));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseChapterSectionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +14,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCourseChapterSectionMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCourseChapterSectionService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseChapterSectionVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,6 +28,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseChapterSectionServiceImpl extends ServiceImpl<TopCourseChapterSectionMapper, TopCourseChapterSection> implements ITopCourseChapterSectionService {
 
     @Override
@@ -92,4 +96,11 @@ public class TopCourseChapterSectionServiceImpl extends ServiceImpl<TopCourseCha
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public List<TopCourseChapterSection> getListEntity(Long oldChapterId) {
+        return   list(new LambdaQueryWrapper<TopCourseChapterSection>()
+                .eq(TopCourseChapterSection::getChapterId, oldChapterId));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseChapterServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCourseChapterMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCourseChapterService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseChapterVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +30,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseChapterServiceImpl extends ServiceImpl<TopCourseChapterMapper, TopCourseChapter> implements ITopCourseChapterService {
 
     @Override
@@ -105,4 +109,10 @@ public class TopCourseChapterServiceImpl extends ServiceImpl<TopCourseChapterMap
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopCourseChapter getEntity(Long oldChapterId) {
+        return getById(oldChapterId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseEducationTypeServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -20,6 +21,8 @@ import com.zhongzheng.modules.top.goods.service.ITopCourseEducationTypeService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseEducationTypeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,6 +36,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseEducationTypeServiceImpl extends ServiceImpl<TopCourseEducationTypeMapper, TopCourseEducationType> implements ITopCourseEducationTypeService {
 
     @Autowired
@@ -119,4 +123,10 @@ public class TopCourseEducationTypeServiceImpl extends ServiceImpl<TopCourseEduc
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopCourseEducationType getEntityById(Long oldEducationTypeId) {
+        return getById(oldEducationTypeId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseHandoutsBusinessServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +15,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCourseHandoutsBusinessMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCourseHandoutsBusinessService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseHandoutsBusinessVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,6 +29,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseHandoutsBusinessServiceImpl extends ServiceImpl<TopCourseHandoutsBusinessMapper, TopCourseHandoutsBusiness> implements ITopCourseHandoutsBusinessService {
 
     @Override
@@ -97,4 +101,10 @@ public class TopCourseHandoutsBusinessServiceImpl extends ServiceImpl<TopCourseH
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public List<TopCourseHandoutsBusiness> listEntity(Long handoutsId) {
+        return null;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseHandoutsServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCourseHandoutsMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCourseHandoutsService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseHandoutsVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +30,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseHandoutsServiceImpl extends ServiceImpl<TopCourseHandoutsMapper, TopCourseHandouts> implements ITopCourseHandoutsService {
 
     @Override
@@ -100,4 +104,10 @@ public class TopCourseHandoutsServiceImpl extends ServiceImpl<TopCourseHandoutsM
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public TopCourseHandouts getEntity(Long handoutsId) {
+        return getById(handoutsId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopCourseMenuExamServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +15,8 @@ import com.zhongzheng.modules.top.goods.mapper.TopCourseMenuExamMapper;
 import com.zhongzheng.modules.top.goods.service.ITopCourseMenuExamService;
 import com.zhongzheng.modules.top.goods.vo.TopCourseMenuExamVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -26,6 +29,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopCourseMenuExamServiceImpl extends ServiceImpl<TopCourseMenuExamMapper, TopCourseMenuExam> implements ITopCourseMenuExamService {
 
     @Override
@@ -99,4 +103,11 @@ public class TopCourseMenuExamServiceImpl extends ServiceImpl<TopCourseMenuExamM
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public List<TopCourseMenuExam> getListEntity(Long oldCourseId) {
+        return list(new LambdaQueryWrapper<TopCourseMenuExam>()
+                .eq(TopCourseMenuExam::getCourseId, oldCourseId));
+    }
 }