submit

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

@@ -6,6 +6,7 @@ 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.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -295,7 +296,15 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
 
     @Override
     public List<DistributionSellerVo> getSellerListByTenant(DistributionSellerQuery query) {
-        return baseMapper.getSellerListByTenant(query);
+        List<DistributionSellerVo> sellerListByTenant = baseMapper.getSellerListByTenant(query);
+        if (CollectionUtils.isNotEmpty(sellerListByTenant)){
+            sellerListByTenant.forEach(item ->{
+                if (ObjectUtils.isNotNull(item.getIdCard())){
+                    item.setIdCard(EncryptHandler.decrypt(item.getIdCard()));
+                }
+            });
+        }
+        return sellerListByTenant;
     }
 
     @Override

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.core.redis.RedisCache;
 import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
@@ -601,6 +602,9 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
             return new ArrayList<>();
         }
         orderVos.forEach(item -> {
+            if (ObjectUtils.isNotNull(item.getTelphone())){
+                item.setTelphone(EncryptHandler.decrypt(item.getTelphone()));
+            }
             //佣金详情
             List<DistributionRebate> list = iDistributionRebateService
                     .list(new LambdaQueryWrapper<DistributionRebate>()

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

@@ -1,6 +1,9 @@
 package com.zhongzheng.modules.distribution.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.common.type.EncryptHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -12,6 +12,7 @@ import com.github.pagehelper.Page;
 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.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.modules.activity.domain.ActivityGoodsPrice;
@@ -475,12 +476,28 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
 
     @Override
     public List<TenantOrderVo> getOrgOrder(TenantOrderQueryBo bo) {
-        return iDistributionActivityService.getOrgOrder(bo);
+        List<TenantOrderVo> orgOrder = iDistributionActivityService.getOrgOrder(bo);
+        if (CollectionUtils.isNotEmpty(orgOrder)){
+            orgOrder.forEach(item -> {
+                if (ObjectUtils.isNotNull(item.getTelphone())){
+                    item.setTelphone(EncryptHandler.decrypt(item.getTelphone()));
+                }
+            });
+        }
+        return orgOrder;
     }
 
     @Override
     public List<DistributionCashTopVo> getOrgCashList(DistributionCashTopQueryBo bo) {
-        return iDistributionActivityService.getOrgCashList(bo);
+        List<DistributionCashTopVo> orgCashList = iDistributionActivityService.getOrgCashList(bo);
+        if (CollectionUtils.isNotEmpty(orgCashList)){
+            orgCashList.forEach(item -> {
+                if (ObjectUtils.isNotNull(item.getTelphone())){
+                    item.setTelphone(EncryptHandler.decrypt(item.getTelphone()));
+                }
+            });
+        }
+        return orgCashList;
     }
 
     @Override

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

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN distribution_seller ds ON dr.seller_id = ds.seller_id
         LEFT JOIN `order` o ON dr.order_sn = o.order_sn
         LEFT JOIN `user` u ON o.user_id = u.user_id
-        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code`
+        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code` AND dr.tenant_id = d.tenant_id
         WHERE
         dr.`status` = 1
         <if test = "sellerId != null and sellerId != ''" >
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         distribution_rebate dr
         LEFT JOIN sys_tenant t ON dr.tenant_id = t.tenant_id
-        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code`
+        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code` AND dr.tenant_id = d.tenant_id
         LEFT JOIN `order` o ON dr.order_sn = o.order_sn
         WHERE
         dr.`status` = 1
@@ -118,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.goods_name,
             t.tenant_id,
             t.tenant_name,
-            ds.realname as sellerName,
             (SELECT SUM(cash) FROM distribution_rebate WHERE order_sn = og.order_sn GROUP BY order_sn) AS orderCash
         FROM
                 (SELECT DISTINCT(dre.order_goods_id) FROM distribution_rebate dre
@@ -127,11 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     </if >
                     ) dr
                     LEFT JOIN order_goods og ON dr.order_goods_id = og.order_goods_id
-                    LEFT JOIN distribution_rebate dre ON og.order_goods_id = dre.order_goods_id
-                    LEFT JOIN distribution_seller ds ON dre.seller_id = ds.seller_id
                     LEFT JOIN `order` o ON og.order_sn = o.order_sn
                     LEFT JOIN `user` u ON o.user_id = u.user_id
-                    LEFT JOIN distribution_activity d ON og.distribution_code = d.`code`
+                    LEFT JOIN distribution_activity d ON og.distribution_code = d.`code` AND og.tenant_id = d.tenant_id
                     LEFT JOIN goods g ON og.goods_id = g.goods_id
                     LEFT JOIN sys_tenant t ON og.tenant_id = t.tenant_id
         WHERE og.`status` = 1
@@ -186,9 +183,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         distribution_rebate dr
         LEFT JOIN order_goods og ON dr.order_goods_id = og.order_goods_id
         LEFT JOIN distribution_seller ds ON dr.seller_id = ds.seller_id
-        LEFT JOIN `order` o ON dr.order_sn = o.order_sn
+        LEFT JOIN `order` o ON dr.order_sn = o.order_sn AND dr.tenant_id = o.tenant_id
         LEFT JOIN `user` u ON o.user_id = u.user_id
-        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code`
+        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code` AND dr.tenant_id = d.tenant_id
         WHERE
         dr.`status` = 1
         AND dr.id = #{id}
@@ -248,7 +245,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.goods_name,
         t.tenant_id,
         t.tenant_name,
-        ds.realname as sellerName,
         (SELECT SUM(cash) FROM distribution_rebate WHERE order_sn = og.order_sn GROUP BY order_sn) AS orderCash
         FROM
         (SELECT DISTINCT(dre.order_goods_id) FROM distribution_rebate dre
@@ -257,11 +253,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if >
         ) dr
         LEFT JOIN order_goods og ON dr.order_goods_id = og.order_goods_id
-        LEFT JOIN distribution_rebate dre ON og.order_goods_id = dre.order_goods_id
-        LEFT JOIN distribution_seller ds ON dre.seller_id = ds.seller_id
         LEFT JOIN `order` o ON og.order_sn = o.order_sn
         LEFT JOIN `user` u ON o.user_id = u.user_id
-        LEFT JOIN distribution_activity d ON og.distribution_code = d.`code`
+        LEFT JOIN distribution_activity d ON og.distribution_code = d.`code` AND og.tenant_id = d.tenant_id
         LEFT JOIN goods g ON og.goods_id = g.goods_id
         LEFT JOIN sys_tenant t ON og.tenant_id = t.tenant_id
         WHERE og.`status` = 1
@@ -358,9 +352,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_tenant t ON dr.tenant_id = t.tenant_id
         LEFT JOIN order_goods og ON dr.order_goods_id = og.order_goods_id
         LEFT JOIN distribution_seller ds ON dr.seller_id = ds.seller_id
-        LEFT JOIN `order` o ON dr.order_sn = o.order_sn
+        LEFT JOIN `order` o ON dr.order_sn = o.order_sn AND dr.tenant_id = o.tenant_id
         LEFT JOIN `user` u ON o.user_id = u.user_id
-        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code`
+        LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code` AND dr.tenant_id = d.tenant_id
         WHERE
         dr.`status` = 1
         <if test = "sellerId != null and sellerId != ''" >

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

@@ -41,10 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <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 ds.*,sr.realname as parentName,sr.user_account,t.tenant_name,u.id_card,u.phonenumber,
             (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_user u ON ds.seller_id = u.seller_id
             LEFT JOIN sys_tenant t ON ds.tenant_id = t.tenant_id
         WHERE 1 = 1
         <if test="tenantId != null and tenantId != ''">