submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateController.java

@@ -8,9 +8,11 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateAddBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateEditBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateQueryBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
 import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
 import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateVo;
 import io.swagger.annotations.Api;
@@ -106,4 +108,16 @@ public class DistributionActivityTemplateController extends BaseController {
         return toAjax(iDistributionActivityTemplateService.publishActivity(templateId) ? 1 : 0);
     }
 
+
+    /**
+     * 分销业务员列表
+     */
+    @ApiOperation("分销业务员列表")
+    @GetMapping("/seller/list")
+    public TableDataInfo<DistributionSellerVo> sellerList(DistributionSellerQuery query) {
+        startPage();
+        List<DistributionSellerVo> list = iDistributionActivityTemplateService.sellerList(query);
+        return getDataTable(list);
+    }
+
 }

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

@@ -93,5 +93,14 @@ public class DistributionActivityController extends BaseController {
         return toAjax(iDistributionActivityService.editStatus(bo) ? 1 : 0);
     }
 
+    /**
+     * 拉取商品信息
+     */
+    @ApiOperation("拉取商品信息")
+    @GetMapping("/pull/goods/{distributionId}")
+    public AjaxResult<Void> pullGoods(@PathVariable("distributionId") Long distributionId) {
+        return toAjax(iDistributionActivityService.pullGoods(distributionId) ? 1 : 0);
+    }
+
 
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/DistributionSellerServiceImpl.java

@@ -3,8 +3,13 @@ package com.zhongzheng.framework.web.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 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.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.UserStatus;
@@ -17,20 +22,18 @@ import com.zhongzheng.modules.distribution.domain.DistributionSeller;
 import com.zhongzheng.modules.distribution.mapper.DistributionSellerMapper;
 import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
 import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.user.bo.UserAppRegisterBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +43,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-13
  */
 @Service
+@DS("slave")
 public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSellerMapper, DistributionSeller> implements IDistributionSellerService {
 
     @Autowired
@@ -229,6 +233,11 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
         return map;
     }
 
+    @Override
+    public List<DistributionSellerVo> getSellerListByTenant(DistributionSellerQuery query) {
+        return baseMapper.getSellerListByTenant(query);
+    }
+
     @Override
     public DistributionSellerVo queryById(Long sellerId){
         DistributionSeller db = this.baseMapper.selectById(sellerId);

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

@@ -23,6 +23,9 @@ public class DistributionActivityGoodsAddBo {
     /** 商品ID */
     @ApiModelProperty("商品ID")
     private Long goodsId;
+    /** 商品活动价格 */
+    @ApiModelProperty("商品活动价格")
+    private BigDecimal goodsPrice;
     /** 总佣金上限 */
     @ApiModelProperty("总佣金上限")
     private BigDecimal profitMax;

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

@@ -29,6 +29,10 @@ public class DistributionActivityGoodsEditBo {
     @ApiModelProperty("商品ID")
     private Long goodsId;
 
+    /** 商品活动价格 */
+    @ApiModelProperty("商品活动价格")
+    private BigDecimal goodsPrice;
+
     /** 总佣金上限 */
     @ApiModelProperty("总佣金上限")
     private BigDecimal profitMax;

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

@@ -18,6 +18,8 @@ public class DistributionStatusEditBo {
     /** 分销活动模板ID */
     @ApiModelProperty("分销活动模板ID")
     private Long distributionTemplateId;
+    @ApiModelProperty("分销活动ID")
+    private Long distributionId;
     /** 商品ID */
     @ApiModelProperty("状态：1有效，0,禁用，-1无效")
     private Integer status;

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

@@ -57,4 +57,5 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    private Long tenantId;
 }

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

@@ -32,6 +32,8 @@ private static final long serialVersionUID=1L;
     private Long distributionId;
     /** 商品ID */
     private Long goodsId;
+    /** 商品活动价格 */
+    private BigDecimal goodsPrice;
     /** 总佣金上限 */
     private BigDecimal profitMax;
     /** 状态：1有效，0无效 */

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

@@ -2,6 +2,10 @@ package com.zhongzheng.modules.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.distribution.domain.DistributionSeller;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
+
+import java.util.List;
 
 /**
  * 分销业务员Mapper接口
@@ -11,4 +15,5 @@ import com.zhongzheng.modules.distribution.domain.DistributionSeller;
  */
 public interface DistributionSellerMapper extends BaseMapper<DistributionSeller> {
 
+    List<DistributionSellerVo> getSellerListByTenant(DistributionSellerQuery query);
 }

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

@@ -52,4 +52,6 @@ public interface IDistributionActivityService extends IService<DistributionActiv
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     boolean editStatus(DistributionStatusEditBo bo);
+
+	boolean pullGoods(Long distributionId);
 }

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

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.distribution.bo.*;
 import com.zhongzheng.modules.distribution.domain.DistributionSeller;
 import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.user.bo.UserAppAccountLoginBo;
-import com.zhongzheng.modules.user.bo.UserAppForgetBo;
-import com.zhongzheng.modules.user.bo.UserAppRegisterBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
 import com.zhongzheng.modules.user.domain.User;
 
 import java.util.Collection;
@@ -61,4 +59,6 @@ public interface IDistributionSellerService extends IService<DistributionSeller>
 	Boolean syncSellerToUser(DistributionSeller seller, User user,Integer type);
 
 	Map<String,Object> accountLogin(SellerAppAccountLoginBo bo);
+
+	List<DistributionSellerVo> getSellerListByTenant(DistributionSellerQuery query);
 }

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

@@ -28,6 +28,8 @@ import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplateGoods;
 import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateGoodsService;
+import com.zhongzheng.modules.top.goods.domain.TopGoods;
+import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -51,6 +53,8 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
     @Autowired
     private IGoodsService iGoodsService;
     @Autowired
+    private ITopGoodsService iTopGoodsService;
+    @Autowired
     private IDistributionActivityPosterService iDistributionActivityPosterService;
     @Autowired
     private IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
@@ -191,7 +195,7 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
         if (ObjectUtils.isNull(bo.getStatus())){
             throw new CustomException("状态不能为空");
         }
-        DistributionActivity activity = getById(bo.getDistributionTemplateId());
+        DistributionActivity activity = getById(bo.getDistributionId());
         if (bo.getStatus() == 1){
             //启用活动
             if (DateUtils.getNowTime() > activity.getEndTime()){
@@ -211,11 +215,37 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
                     throw new CustomException("活动商品缺失，请先拉取商品信息",777);
                 }
             }
-        }else if (bo.getStatus() == 0){
-            //禁用
+        }
+        activity.setStatus(bo.getStatus());
+        return updateById(activity);
+    }
 
+    @Override
+    public boolean pullGoods(Long distributionId) {
+        DistributionActivity activity = getById(distributionId);
+        //总平台下发活动对比商品是否缺失
+        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));
+        if (activityGoods.size() == templateGoods.size()){
+            //不缺失商品信息
+            return true;
+        }
+        if (CollectionUtils.isEmpty(templateGoods)){
+            //总平台活动商品没有
+            return true;
+        }
+        if (CollectionUtils.isEmpty(activityGoods)){
+            //全部缺失
+            List<TopGoods> topGoods = iTopGoodsService.listByIds(templateGoods.stream().map(DistributionActivityTemplateGoods::getGoodsId).collect(Collectors.toList()));
 
         }
-        return false;
+
+        return true;
     }
 }

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

@@ -33,7 +33,7 @@ public class DistributionActivityGoodsVo {
 	private Long goodsId;
 	@ApiModelProperty("商品名称")
 	private String goodsName;
-	@ApiModelProperty("商品价格")
+	@ApiModelProperty("商品活动价格")
 	private BigDecimal goodsPrice;
 	/** 总佣金上限 */
 	@Excel(name = "总佣金上限")

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

@@ -1,11 +1,9 @@
 package com.zhongzheng.modules.distribution.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
 
 
@@ -72,4 +70,17 @@ public class DistributionSellerVo {
 	@Excel(name = "分享码")
 	@ApiModelProperty("分享码")
 	private String shareCode;
+
+	@ApiModelProperty("邀请人姓名")
+	private String parentName;
+
+	@ApiModelProperty("邀请人编号	")
+	private String parentAccount;
+
+	@ApiModelProperty("推广人数	")
+	private String promotionNum;
+
+	@ApiModelProperty("所属机构")
+	private String tenantName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/vo/SysTenantVo.java

@@ -3,11 +3,9 @@ package com.zhongzheng.modules.system.vo;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
 
 
@@ -36,4 +34,7 @@ public class SysTenantVo {
 	@ApiModelProperty("名称")
 	private String tenantName;
 
+	@ApiModelProperty("地址")
+	private String address;
+
 }

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

@@ -23,6 +23,9 @@ public class DistributionActivityTemplateGoodsAddBo {
     /** 商品ID */
     @ApiModelProperty("商品ID")
     private Long goodsId;
+    /** 商品活动价格 */
+    @ApiModelProperty("商品活动价格")
+    private BigDecimal goodsPrice;
     /** 佣金上限 */
     @ApiModelProperty("佣金上限")
     private BigDecimal profitMax;

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

@@ -29,6 +29,10 @@ public class DistributionActivityTemplateGoodsEditBo {
     @ApiModelProperty("商品ID")
     private Long goodsId;
 
+    /** 商品活动价格 */
+    @ApiModelProperty("商品活动价格")
+    private BigDecimal goodsPrice;
+
     /** 佣金上限 */
     @ApiModelProperty("佣金上限")
     private BigDecimal profitMax;

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

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.top.distribution.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年03月22日 9:53
+ */
+@Data
+public class DistributionSellerQuery implements Serializable {
+
+    /** 分页大小 */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+    /** 当前页数 */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+    /** 排序列 */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+    /** 排序的方向desc或者asc */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+    @ApiModelProperty("机构ID")
+    private Long tenantId;
+
+    @ApiModelProperty("邀请人")
+    private String parentName;
+
+    @ApiModelProperty("姓名")
+    private String realname;
+}

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

@@ -32,6 +32,8 @@ private static final long serialVersionUID=1L;
     private Long distributionTempId;
     /** 商品ID */
     private Long goodsId;
+    /** 商品活动价格 */
+    private BigDecimal goodsPrice;
     /** 佣金上限 */
     private BigDecimal profitMax;
     /** 状态：1有效，0无效 */

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

@@ -2,10 +2,12 @@ package com.zhongzheng.modules.top.distribution.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateAddBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateEditBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
+import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
 import com.zhongzheng.modules.top.distribution.domain.DistributionActivityTemplate;
 import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateVo;
 
@@ -62,4 +64,6 @@ public interface IDistributionActivityTemplateService extends IService<Distribut
 	 * @return boolean
 	 */
     boolean publishActivity(Long templateId);
+
+    List<DistributionSellerVo> sellerList(DistributionSellerQuery query);
 }

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

@@ -12,11 +12,13 @@ import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateAddBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateEditBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateQueryBo;
 import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
 import com.zhongzheng.modules.distribution.domain.*;
+import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
 import com.zhongzheng.modules.top.distribution.mapper.DistributionActivityTempMapper;
 import com.zhongzheng.modules.distribution.service.*;
 import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateGoodsVo;
@@ -90,6 +92,8 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
     private IInformRemindService informRemindService;
     @Autowired
     private ITopSysUserService iTopSysUserService;
+    @Autowired
+    private IDistributionSellerService iDistributionSellerService;
 
     @Override
     public DistributionActivityTemplateVo queryById(Long id){
@@ -112,6 +116,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
                     tenantVo.setTenantId(tenant.getTenantId());
                     tenantVo.setTenantName(tenant.getTenantName());
                     tenantVo.setAddress(tenant.getAddress());
+                    tenantVo.setStatus(tenant.getStatus());
                     return tenantVo;
                 }).collect(Collectors.toList());
                 vo.setTenantList(activityTenantVos);
@@ -177,7 +182,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(DistributionActivityTemplateAddBo bo) {
         //活动模板基本信息
         DistributionActivityTemplate add = BeanUtil.toBean(bo, DistributionActivityTemplate.class);
@@ -190,6 +195,9 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
         }
         this.save(add);
         this.saveRelation(bo,add.getId());
+        if (ObjectUtils.isNotNull(bo.getPublishStatus()) && bo.getPublishStatus() == 1){
+            this.publishActivity(add.getId());
+        }
         return true;
     }
 
@@ -322,6 +330,8 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
             DistributionActivity dailyActivity = BeanUtil.toBean(template, DistributionActivity.class);
             dailyActivity.setPosterId(poster.getPosterId());
             dailyActivity.setTempId(template.getId());
+            dailyActivity.setTenantId(id);
+            dailyActivity.setUseStatus(0);
             iDistributionActivityService.save(dailyActivity);
             //商品
             List<DistributionActivityGoods> activityGoodsList = new ArrayList<>();
@@ -371,7 +381,12 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
             }
 
         });
+        template.setPublishStatus(1);
+        return updateById(template);
+    }
 
-        return true;
+    @Override
+    public List<DistributionSellerVo> sellerList(DistributionSellerQuery query) {
+        return iDistributionSellerService.getSellerListByTenant(query);
     }
 }

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

@@ -33,7 +33,7 @@ public class DistributionActivityTemplateGoodsVo {
 	private Long goodsId;
 	@ApiModelProperty("商品名称")
 	private String goodsName;
-	@ApiModelProperty("商品价格")
+	@ApiModelProperty("商品活动价格")
 	private BigDecimal goodsPrice;
 	/** 佣金上限 */
 	@Excel(name = "佣金上限")

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

@@ -21,4 +21,7 @@ public class DistributionActivityTenantVo implements Serializable {
     @ApiModelProperty("地址")
     private String address;
 
+    @ApiModelProperty("0 失效 1启用")
+    private Integer status;
+
 }

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.top.goods.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -34,6 +35,7 @@ import com.zhongzheng.modules.top.goods.domain.*;
 import com.zhongzheng.modules.top.goods.mapper.TopGoodsMapper;
 import com.zhongzheng.modules.top.goods.service.*;
 import com.zhongzheng.modules.top.goods.vo.TopBankGoodsExamVo;
+import com.zhongzheng.modules.user.service.ISchoolService;
 import net.polyv.common.v1.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +54,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-15
  */
 @Service
+@DS("master")
 public class TopGoodsServiceImpl extends ServiceImpl<TopGoodsMapper, TopGoods> implements ITopGoodsService {
 
     @Autowired
@@ -156,6 +159,8 @@ public class TopGoodsServiceImpl extends ServiceImpl<TopGoodsMapper, TopGoods> i
     private IMajorProjectService iMajorProjectService;
     @Autowired
     private IPayServeService iPayServeService;
+    @Autowired
+    private ISchoolService iSchoolService;
 
     @Autowired
     private ITopGoodsCopyService iTopGoodsCopyService;
@@ -260,7 +265,6 @@ public class TopGoodsServiceImpl extends ServiceImpl<TopGoodsMapper, TopGoods> i
     @Autowired
     private ITopPayServeService iTopPayServeService;
 
-
     @Override
 //    @Transactional(rollbackFor = Exception.class)
     public boolean goodsBatchCopyTenant() {
@@ -1175,7 +1179,6 @@ public class TopGoodsServiceImpl extends ServiceImpl<TopGoodsMapper, TopGoods> i
         return true;
     }
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean goodsBatchCopyDisposeTenant() {

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionSellerMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.DistributionSellerMapper">
+<mapper namespace="com.zhongzheng.modules.distribution.mapper.DistributionSellerMapper">
 
     <resultMap type="com.zhongzheng.modules.distribution.domain.DistributionSeller" id="DistributionSellerResult">
         <result property="sellerId" column="seller_id"/>
@@ -22,5 +22,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="shareCode" column="share_code"/>
     </resultMap>
 
+    <select id="getSellerListByTenant" parameterType="com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery" resultType="com.zhongzheng.modules.distribution.vo.DistributionSellerVo">
+        SELECT ds.*,sr.realname,sr.user_account,t.tenant_name,
+            (SELECT COUNT(*) FROM distribution_seller dr WHERE dr.parent_id = ds.seller_id) promotionNum
+        FROM `distribution_seller` ds
+            LEFT JOIN distribution_seller sr ON ds.parent_id = sr.seller_id
+            LEFT JOIN sys_tenant t ON ds.tenant_id = t.tenant_id
+        WHERE 1 = 1
+        <if test="tenantId != null and tenantId != ''">
+            AND ds.tenant_id = #{tenantId}
+        </if>
+        <if test="parentName != null and parentName != ''">
+            AND sr.realname = #{parentName}
+        </if>
+        <if test="realname != null and realname != ''">
+            AND ds.realname = #{realname}
+        </if>
+    </select>
+
 
 </mapper>