## 拨比计算部分字段注释调整；去掉供应商部分不需要接口；

bd-api/bd-api-system/src/main/java/com/hzs/system/base/ISystemConfigServiceApi.java

@@ -1,18 +1,13 @@
 package com.hzs.system.base;
 
 import com.hzs.common.core.domain.R;
-import com.hzs.common.domain.system.base.BdCubasdoc;
 import com.hzs.system.base.dto.BdCubasdocDTO;
 
 import java.util.Collection;
 import java.util.Map;
 
 /**
- * @Description: 查询系统参数
+ * 查询系统参数
- * @Author: sui q
- * @Time: 2022/11/10 11:27
- * @Classname: ISystemConfigServiceApi
- * @PackageName: com.hzs.system.base
  */
 public interface ISystemConfigServiceApi {
 
@@ -21,9 +16,6 @@ public interface ISystemConfigServiceApi {
      *
      * @param pkCountry 国家
      * @param key       键
-     * @return: BdSystemConfig
-     * @Author: sui q
-     * @Date: 2022/11/10 11:28
      */
     R<String> getBonusSystemConfig(Integer pkCountry, String key);
 
@@ -40,42 +32,22 @@ public interface ISystemConfigServiceApi {
      * 批量查询系统参数
      *
      * @param pkCountry 国家
-     * @return: R<Map < String, String>>
-     * @Author: sui q
-     * @Date: 2022/11/10 14:03
      */
     R<Map<String, String>> getBonusSystemConfig(Integer pkCountry);
 
     /**
      * 批量查询所有国家的系统参数
-     *
-     * @return: R<Map < String, String>>
-     * @Author: sui q
-     * @Date: 2022/11/10 14:04
      */
     R<Map<String, String>> getBonusSystemConfig();
 
     /**
      * 批量查询所有国家的订单参数
-     *
-     * @return: R<Map < String, String>>
-     * @Author: yh
-     * @Date: 2022/11/10 14:04
      */
     R<Map<String, String>> getSystemConfig();
 
     /*
      * @description: 根据用户查询供应商
-     * @author: sui q
-     * @date: 2024/3/23 11:56
-     * @param: null null
      **/
     R<BdCubasdocDTO> queryBdCubasdocByUser(Long pkUser);
 
-    /**
-     * 保存供应商
-     * @param cubasdocDto 参数
-     * @return
-     */
-    R<Boolean> saveCubasdoc(BdCubasdocDTO cubasdocDto);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java

@@ -5,11 +5,9 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.hzs.common.core.annotation.Log;
-import com.hzs.common.core.constant.CacheConstants;
 import com.hzs.common.core.constant.msg.ConfigMsgConstants;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
-import com.hzs.common.core.service.RedisService;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
@@ -49,17 +47,8 @@ public class CuMemberTeamController extends BaseController {
     @DubboReference
     ITransactionServiceApi iTransactionServiceApi;
 
-    private RedisService redisService;
-
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
-
     /**
      * @description: 查询会员所属团队（隶属团队）列表
-     * @author: zhang jing
-     * @date: 2022/8/30 10:20
      * @param: [cuMemberTeam]
      * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
@@ -74,8 +63,6 @@ public class CuMemberTeamController extends BaseController {
 
     /**
      * @description: 隶属团队下拉选
-     * @author: zhang jing
-     * @date: 2022/11/16 15:43
      * @param: [cuMemberTeam]
      * @return: com.hzs.common.core.web.page.TableDataInfo
      **/
@@ -116,8 +103,6 @@ public class CuMemberTeamController extends BaseController {
 
     /**
      * @description: 新增会员所属团队（隶属团队）
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
      * @param: [cuMemberTeam]
      * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
@@ -154,15 +139,12 @@ public class CuMemberTeamController extends BaseController {
         cuMemberTeam.setPkCountry(SecurityUtils.getPkCountry());
         cuMemberTeam.setPkCreator(SecurityUtils.getUserId());
         cuMemberTeam.setCreationTime(new Date());
-        redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + pkCountry);
         return toAjax(cuMemberTeamService.save(cuMemberTeam));
     }
 
 
     /**
      * @description: 修改会员所属团队（隶属团队）
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
      * @param: [cuMemberTeam]
      * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
@@ -205,15 +187,12 @@ public class CuMemberTeamController extends BaseController {
         }
         cuMemberTeam.setPkModified(SecurityUtils.getUserId());
         cuMemberTeam.setModifiedTime(new Date());
-        redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + pkCountry);
         return toAjax(cuMemberTeamService.updateById(cuMemberTeam));
     }
 
 
     /**
      * @description: 查询单条会员所属团队（隶属团队）
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
      * @param: [pkId]
      * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
@@ -230,8 +209,6 @@ public class CuMemberTeamController extends BaseController {
 
     /**
      * @description: 删除会员所属团队（隶属团队）
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
      * @param: [pkId]
      * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
@@ -248,14 +225,11 @@ public class CuMemberTeamController extends BaseController {
         List<Long> pkIdList = new ArrayList<>();
         pkIdList.add(memberTeam.getPkTransaction().longValue());
         iTransactionServiceApi.removeTransactionByPkId(pkIdList);
-        redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + SecurityUtils.getPkCountry());
         return toAjax(cuMemberTeamService.update(updateWrapper));
     }
 
     /**
      * @description: 更新所属团队（隶属团队）
-     * @author: sui  q
-     * @date: 2022/8/30 10:21
      * @param: [pkId]
      * @return: com.hzs.common.core.web.domain.AjaxResult
      **/

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java

@@ -96,8 +96,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
     IApprovalServiceApi iApprovalServiceApi;
     @DubboReference
     IAwardsServiceApi iAwardsServiceApi;
-    @DubboReference
-    ISystemConfigServiceApi iSystemConfigServiceApi;
 
     @Autowired
     private ICuMemberRegisterService iCuMemberRegisterService;
@@ -2639,7 +2637,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             censusSummaryVo.setRegisterPv(computeUSDToRMBRate(reAchieve.add(lxReachieve), chinaInExchangeRate));
             censusSummaryVo.setRegisterAmountDollar(computeUSDExchangeRate(reAmount.add(lxReamount), inExchangeRate));
             censusSummaryVo.setRegisterPvDollar(checkIsDecimalNull(reAchieve.add(lxReachieve)));
-            // 本地币
             censusSummaryVo.setRegisterAmountLocality(checkIsDecimalNull(reAmount.add(lxReamount)));
             censusSummaryVo.setRegisterPvLocality(USDToRMB(loginUserCountry, reAchieve.add(lxReachieve), inExchangeRate));
 
@@ -2647,7 +2644,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             BigDecimal lxamount = BigDecimal.ZERO;
             BigDecimal lxachieve = BigDecimal.ZERO;
             if (memberMeritsSummaryMap.get(EOrderType.SPECIAL_UPGRADE_ORDER.getValue()) != null) {
-
                 lxamount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_UPGRADE_ORDER.getValue()).getAmount();
                 if (lxamount == null) {
                     lxamount = BigDecimal.ZERO;
@@ -2668,7 +2664,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             censusSummaryVo.setUpgradePv(computeUSDToRMBRate(upAchieve.add(lxachieve), chinaInExchangeRate));
             censusSummaryVo.setUpgradeAmountDollar(computeUSDExchangeRate(upAmount.add(lxamount), inExchangeRate));
             censusSummaryVo.setUpgradePvDollar(checkIsDecimalNull(upAchieve.add(lxachieve)));
-            //本地币
             censusSummaryVo.setUpgradeAmountLocality(checkIsDecimalNull(upAmount.add(lxamount)));
             censusSummaryVo.setUpgradePvLocality(USDToRMB(loginUserCountry, upAchieve.add(lxachieve), inExchangeRate));
             //特殊升级
@@ -2679,7 +2674,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                 censusSummaryVo.setSpecialUpgradePv(computeUSDToRMBRate(achieve, chinaInExchangeRate));
                 censusSummaryVo.setSpecialUpgradeAmountDollar(computeUSDExchangeRate(amount, inExchangeRate));
                 censusSummaryVo.setSpecialUpgradePvDollar(checkIsDecimalNull(achieve));
-                //本地币
                 censusSummaryVo.setSpecialUpgradeAmountLocality(checkIsDecimalNull(amount));
                 censusSummaryVo.setSpecialUpgradePvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate));
             } else {
@@ -2687,7 +2681,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                 censusSummaryVo.setSpecialUpgradePv(BigDecimal.ZERO);
                 censusSummaryVo.setSpecialUpgradeAmountDollar(BigDecimal.ZERO);
                 censusSummaryVo.setSpecialUpgradePvDollar(BigDecimal.ZERO);
-                //本地币
                 censusSummaryVo.setSpecialUpgradeAmountLocality(BigDecimal.ZERO);
                 censusSummaryVo.setSpecialUpgradePvLocality(BigDecimal.ZERO);
             }
@@ -2696,7 +2689,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             censusSummaryVo.setFirstPurchaseAmountDollar(censusSummaryVo.getRegisterAmountDollar().add(censusSummaryVo.getUpgradeAmountDollar()));
             censusSummaryVo.setFirstPurchasePv(censusSummaryVo.getRegisterPv().add(censusSummaryVo.getUpgradePv()));
             censusSummaryVo.setFirstPurchasePvDollar(censusSummaryVo.getRegisterPvDollar().add(censusSummaryVo.getUpgradePvDollar()));
-            // 本地币
             censusSummaryVo.setFirstPurchaseAmountLocality(censusSummaryVo.getRegisterAmountLocality().add(censusSummaryVo.getUpgradeAmountLocality()));
             censusSummaryVo.setFirstPurchasePvLocality(censusSummaryVo.getRegisterPvLocality().add(censusSummaryVo.getUpgradePvLocality()));
             // 三方
@@ -2709,7 +2701,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                 censusSummaryVo.setTripartitePv(computeUSDToRMBRate(achieve, chinaInExchangeRate));
                 censusSummaryVo.setTripartiteAmountDollar(computeUSDExchangeRate(amount, inExchangeRate));
                 censusSummaryVo.setTripartitePvDollar(checkIsDecimalNull(achieve));
-                // 本地币
                 censusSummaryVo.setTripartiteAmountLocality(checkIsDecimalNull(amount));
                 censusSummaryVo.setTripartitePvLocality(USDToRMB(loginUserCountry, achieve, inExchangeRate));
             } else {
@@ -2717,7 +2708,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                 censusSummaryVo.setTripartitePv(BigDecimal.ZERO);
                 censusSummaryVo.setTripartiteAmountDollar(BigDecimal.ZERO);
                 censusSummaryVo.setTripartitePvDollar(BigDecimal.ZERO);
-                // 本地币
                 censusSummaryVo.setTripartiteAmountLocality(BigDecimal.ZERO);
                 censusSummaryVo.setTripartitePvLocality(BigDecimal.ZERO);
             }
@@ -2726,7 +2716,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             censusSummaryVo.setHiFunPv(BigDecimal.ZERO);
             censusSummaryVo.setFansAmountDollar(BigDecimal.ZERO);
             censusSummaryVo.setHiFunPvDollar(BigDecimal.ZERO);
-            // 本地币
             censusSummaryVo.setFansAmountLocality(BigDecimal.ZERO);
             censusSummaryVo.setHiFunPvLocality(BigDecimal.ZERO);
 
@@ -2742,15 +2731,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             BigDecimal haiFunUpgradeAmount = BigDecimal.ZERO;
             // 海粉升级
             BigDecimal haiFunUpgradeAchieve = BigDecimal.ZERO;
-            // 云学院订单
-            BigDecimal cloudCollegeAmount = BigDecimal.ZERO;
-            BigDecimal cloudCollegeAchieve = BigDecimal.ZERO;
             // 直播订单
             BigDecimal mallOrderAmount = BigDecimal.ZERO;
             BigDecimal mallOrderAchieve = BigDecimal.ZERO;
-            // 赋能礼包
-            BigDecimal empowermentAmount = BigDecimal.ZERO;
-            BigDecimal empowermentAchieve = BigDecimal.ZERO;
             // 合作订单
             BigDecimal cooperateAmount = BigDecimal.ZERO;
             BigDecimal cooperateAchieve = BigDecimal.ZERO;
@@ -2773,19 +2756,18 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                 specialRepurchaseAmount = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAmount();
                 specialRepurchaseAchieve = memberMeritsSummaryMap.get(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()).getAchieve();
             }
-            // 复购金额+海粉金额+海粉升级+云学院订单+直播订单+赋能礼包+合作订单+特殊复购
+            // 复购金额+海粉金额+海粉升级+直播订单+合作订单+特殊复购
-            BigDecimal amount = repurchaseAmount.add(fansAmount).add(haiFunUpgradeAmount).add(cloudCollegeAmount)
+            BigDecimal amount = repurchaseAmount.add(fansAmount).add(haiFunUpgradeAmount)
-                    .add(mallOrderAmount).add(empowermentAmount).add(cooperateAmount).add(specialRepurchaseAmount);
+                    .add(mallOrderAmount).add(cooperateAmount).add(specialRepurchaseAmount);
 
             censusSummaryVo.setRepurchaseAmount(computeChinaExchangeRate(loginUserCountry, amount, inExchangeRate, chinaInExchangeRate));
             censusSummaryVo.setRepurchaseAmountDollar(computeUSDExchangeRate(amount, inExchangeRate));
             censusSummaryVo.setRepurchaseAmountLocality(checkIsDecimalNull(amount));
-            BigDecimal repurchasePvSum = repurchaseAchieve.add(fansAchieve).add(haiFunUpgradeAchieve).add(cloudCollegeAchieve)
+            BigDecimal repurchasePvSum = repurchaseAchieve.add(fansAchieve).add(haiFunUpgradeAchieve)
-                    .add(mallOrderAchieve).add(empowermentAchieve).add(cooperateAchieve).add(specialRepurchaseAchieve);
+                    .add(mallOrderAchieve).add(cooperateAchieve).add(specialRepurchaseAchieve);
 
             censusSummaryVo.setRepurchasePv(computeUSDToRMBRate(repurchasePvSum, chinaInExchangeRate));
             censusSummaryVo.setRepurchasePvDollar(checkIsDecimalNull(repurchasePvSum));
-            // 本地币
             censusSummaryVo.setRepurchasePvLocality(USDToRMB(loginUserCountry, repurchasePvSum, inExchangeRate));
             // 金额总计
             censusSummaryVo.setAmountTotal(checkIsDecimalNull(censusSummaryVo.getFirstPurchaseAmount())
@@ -2808,14 +2790,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             censusSummaryVo.setPvTotalDollar(checkIsDecimalNull(censusSummaryVo.getFirstPurchasePvDollar())
                     .add(checkIsDecimalNull(censusSummaryVo.getRepurchasePvDollar()))
                     .add(checkIsDecimalNull(censusSummaryVo.getTripartitePvDollar())));
-
             // 业绩汇总（本地币）
             censusSummaryVo.setPvTotalLocality(checkIsDecimalNull(censusSummaryVo.getFirstPurchasePvLocality())
                     .add(checkIsDecimalNull(censusSummaryVo.getRepurchasePvLocality()))
                     .add(checkIsDecimalNull(censusSummaryVo.getTripartitePvLocality())));
             censusSummaryList.add(censusSummaryVo);
         }
-
         return censusSummaryList;
     }
 
@@ -3526,7 +3506,4 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         return baseMapper.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry);
     }
 
-    private String querySystemConfigByKey(Integer pkCountry, String key) {
-        return iSystemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData();
-    }
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java

@@ -1,108 +1,53 @@
 package com.hzs.member.base.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.core.constant.CacheConstants;
-import com.hzs.common.core.constant.SystemFieldConstants;
-import com.hzs.common.core.service.RedisService;
-import com.hzs.common.core.utils.ComputeUtil;
 import com.hzs.common.domain.member.base.CuMemberTeam;
 import com.hzs.common.domain.member.ext.CuMemberTeamExt;
 import com.hzs.member.base.mapper.CuMemberTeamMapper;
 import com.hzs.member.base.param.MemberTeamInfoParam;
-import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.service.ICuMemberTeamService;
 import com.hzs.member.base.vo.MemberTeamVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
- * <p>
  * 隶属团队列表 服务实现类
- * </p>
- *
- * @author hzs
- * @since 2022-09-01
  */
 @Service
 public class CuMemberTeamServiceImpl extends ServiceImpl<CuMemberTeamMapper, CuMemberTeam> implements ICuMemberTeamService {
 
-    private RedisService redisService;
-
-    private ICuMemberService cuMemberService;
-
-    @Autowired
-    public void setCuMemberService(ICuMemberService cuMemberService) {
-        this.cuMemberService = cuMemberService;
-    }
-
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
-
     @Override
     public CuMemberTeamExt getCuMemberTeamById(Long pkMember) {
-        CuMemberTeamExt cuMemberTeamExt  = redisService.getCacheObject(CacheConstants.CU_MEMBER_TEAM_ID + pkMember);
-        if(cuMemberTeamExt == null){
         CuMemberTeamExt cuMemberTeamExtParam = new CuMemberTeamExt();
         cuMemberTeamExtParam.setPkMember(pkMember);
         List<CuMemberTeamExt> cmtExtList = baseMapper.queryCuMemberTeam(cuMemberTeamExtParam);
-            if(null != cmtExtList && cmtExtList.size() > 0){
+
-                cuMemberTeamExt = cmtExtList.get(0);
+        if (CollectionUtil.isNotEmpty(cmtExtList)) {
-                redisService.setCacheObject(CacheConstants.CU_MEMBER_TEAM_ID + pkMember, cuMemberTeamExt, CacheConstants.MEMBER_REFRESH_TIME, TimeUnit.DAYS);
+            return cmtExtList.get(0);
         }
-        }
+        return null;
-        return cuMemberTeamExt;
     }
 
-    /**
-     * @description: 隶属团队列表
-     * @author: zhang jing
-     * @date: 2022/11/9 14:13
-     * @param: [cuMemberTeamExt]
-     * @return: java.util.List<com.hzs.common.domain.member.ext.CuMemberTeamExt>
-     **/
     @Override
     public List<CuMemberTeamExt> queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt) {
         return baseMapper.queryCuMemberTeam(cuMemberTeamExt);
     }
 
-    /**
-     * @description: 根据国家查询隶属团队配置列表
-     * @author: zhang jing
-     * @date: 2022/11/10 19:31
-     * @param: [pkCountry]
-     * @return: java.util.List<com.hzs.common.domain.member.ext.CuMemberTeamExt>
-     **/
     @Override
     public List<CuMemberTeamExt> queryCuMemberTeam(Integer pkCountry) {
-
-        List<CuMemberTeamExt> cmtExtList = redisService.getCacheList(CacheConstants.CU_MEMBER_TEAM + pkCountry);
-        if(cmtExtList == null || cmtExtList.size() == 0){
         CuMemberTeamExt cuMemberTeamExt = new CuMemberTeamExt();
         cuMemberTeamExt.setPkCountry(pkCountry);
-            cmtExtList=baseMapper.queryCuMemberTeam(cuMemberTeamExt);
+        return baseMapper.queryCuMemberTeam(cuMemberTeamExt);
-            if(null != cmtExtList && cmtExtList.size() != 0){
-                redisService.setCacheList(CacheConstants.CU_MEMBER_TEAM + pkCountry, cmtExtList);
     }
-        }
+
-        return cmtExtList;
-    }
-    /**
-     * 根据体系id 查询是否有团队占用该体系
-     * @param pkVertex
-     * @return
-     */
     @Override
     public Boolean checkVertex(Integer pkVertex) {
-        QueryWrapper<CuMemberTeam> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuMemberTeam> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("PK_BD_VERTEX",pkVertex);
+        queryWrapper.eq(CuMemberTeam::getPkBdVertex, pkVertex);
         return this.count(queryWrapper) > 0;
     }
 
@@ -128,23 +73,15 @@ public class CuMemberTeamServiceImpl extends ServiceImpl<CuMemberTeamMapper, CuM
         }
         return Boolean.TRUE;
     }
-    /**
+
-     * 查询会员团队信息
-     * @param memberTeamInfoParam
-     * @return
-     */
     @Override
     public List<MemberTeamVo> queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam) {
-
         return baseMapper.queryMemberTeamInfoList(memberTeamInfoParam);
     }
-    /**
+
-     * 查询会员安置团队信息
-     * @param memberTeamInfoParam
-     * @return
-     */
     @Override
     public List<MemberTeamVo> queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam) {
         return baseMapper.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam);
     }
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java

@@ -115,10 +115,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
     private CuBonusStatisVO addOrderAmount(CuBonusStatisVO oldSo, Integer pkCountry, Integer pkVertex, List<CuBonusStatisVO> orachList, int type) {
         for (CuBonusStatisVO newSo : orachList) {
             // 修改统计数据
-            if (
+            if ((pkCountry == null && pkVertex != null && pkVertex.equals(newSo.getPkVertex()))
-                    (pkCountry == null && pkVertex != null && pkVertex.equals(newSo.getPkVertex()))
+                    || (pkCountry != null && pkVertex == null && pkCountry.equals(newSo.getPkCountry()))
-                            ||
-                            (pkCountry != null && pkVertex == null && pkCountry.equals(newSo.getPkCountry()))
             ) {
                 // 国家国空，体系不为 并且 体系相同
                 // 国家不为空，体系为空 并且 国家相同
@@ -222,20 +220,6 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
                 // 复购直推收益
                 oldBon.setRepurPushIncome(addOrInitializeAmount(oldBon.getRepurPushIncome(), newBon.getRealIncome(), 2));
                 break;
-//            //云代
-//            case CLOUD_AGENT_DIRECT_PUSH:
-//                oldBon.setAgentIntroduceBonus(addOrInitializeAmount(oldBon.getAgentIntroduceBonus(), newBon.getRealIncome(), 2));
-//                break;
-//            case CLOUD_AGENT_FIRST_PURCHASE:
-//                oldBon.setCloudAgentFirstPurchase(addOrInitializeAmount(oldBon.getCloudAgentFirstPurchase(), newBon.getRealIncome(), 2));
-//                break;
-//            case CLOUD_AGENT_REPURCHASE:
-//                oldBon.setCloudAgentRepurchase(addOrInitializeAmount(oldBon.getCloudAgentRepurchase(), newBon.getRealIncome(), 2));
-//                break;
-//            //嗨粉直推收益
-//            case HI_PINK:
-//                oldBon.setHiFunIncome(addOrInitializeAmount(oldBon.getHiFunIncome(), newBon.getRealIncome(), 2));
-//                break;
         }
         return oldBon;
     }
@@ -427,8 +411,7 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
         // 先查中国订单
         List<CuBonusStatisVO> orachList = baseMapper.querySaOrderByLessDay(cbs);
         // 按支付时间（年月日）把订单进行分组（key:支付时间（年月日），value：订单统计数据列表）
-        Map<Date, List<CuBonusStatisVO>> orachListMap = orachList.stream()
+        Map<Date, List<CuBonusStatisVO>> orachListMap = orachList.stream().collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime));
-                .collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime));
         if (CollectionUtil.isNotEmpty(orachList)) {
             if (CollectionUtil.isNotEmpty(vertexlist)) {
                 for (Map.Entry<Date, List<CuBonusStatisVO>> entry : orachListMap.entrySet()) {
@@ -476,33 +459,21 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
         return true;
     }
 
-    /**
-     * @description: 删除奖金拨比统计表数据
-     **/
     @Override
     public Boolean delStatis(String startDate, String endDate) {
         return baseMapper.delStatis(startDate, endDate);
     }
 
-    /**
-     * @description: 查询奖金扣项配置参数
-     **/
     @Override
     public List<CuBonusStatisVO> bonusDeductlist(CuBonusStatisVO cuBonusStatisVO) {
         return baseMapper.bonusDeductlist(cuBonusStatisVO);
     }
 
-    /**
-     * @description: 查询分红比例配置
-     **/
     @Override
     public List<CuBonusStatisVO> bonusDividendRatiolist(CuBonusStatisVO cuBonusStatisVO) {
         return baseMapper.bonusDividendRatiolist(cuBonusStatisVO);
     }
 
-    /**
-     * @description: 查询有效体系
-     **/
     @Override
     public List<CuBonusStatisVO> vertexList() {
         return baseMapper.vertexList();

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -2757,25 +2757,6 @@
             </foreach>
         </if>
         group by sa.ORDER_TYPE
-
-        union all
-
-        select 99 orderType,
-        sum(sa.ORDER_AMOUNT) amount,
-        sum(sa.ORDER_ACHIEVE) achieve
-        from SA_T_ORDER sa
-        inner join cu_member cm on sa.pk_member=cm.pk_id and cm.DEL_FLAG = 0 and cm.CATEGORY=0
-        where sa.ORDER_STATUS = 1
-        and sa.del_flag = 0
-        and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
-        and sa.PK_COUNTRY = #{pkCountry}
-        <if test="pkVertex!=null and pkVertex.size> 0 ">
-            and cm.PK_VERTEX in
-            <foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        group by sa.ORDER_TYPE
     </select>
 
     <select id="selectPlaceErrorCode" resultType="com.hzs.common.domain.member.ext.CuMemberExt">

bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml

@@ -744,8 +744,7 @@
         (a.BACK_RATIO + a.PLATFORM_RATIO) / 100 backRatio
         from BD_BONUS_ITEMS b
         left JOIN BD_BONUS_DEDUCT a on a.PK_BONUS_ITEMS=b.PK_ID
-        where
+        where b.DEL_FLAG =0
-        b.DEL_FLAG =0
         and a.BACK_RATIO > 0
         and a.PLATFORM_RATIO > 0
         <if test="pkCountry != null ">

bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java

@@ -3,7 +3,6 @@ package com.hzs.system.base.provider;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.hzs.common.core.domain.R;
-import com.hzs.common.domain.system.base.BdCubasdoc;
 import com.hzs.common.domain.system.base.BdCurrency;
 import com.hzs.common.domain.system.base.BdStorehouse;
 import com.hzs.common.domain.system.base.ext.BdCubasdocExt;
@@ -24,8 +23,6 @@ import java.util.stream.Collectors;
 
 /**
  * @Description:
- * @Author: sui q
- * @Time: 2022/9/8 15:13
  * @Classname: ICurrencyServiceProvider
  * @PackageName: com.hzs.system.base.provider
  */
@@ -33,23 +30,19 @@ import java.util.stream.Collectors;
 public class CurrencyServiceProvider implements ICurrencyServiceApi {
 
     @Autowired
-    private IBdCurrencyService currencyService;
+    private IBdCurrencyService iBdCurrencyService;
-
     @Autowired
-    private IBdStorehouseAreaMiddleService storehouseAreaMiddleService;
+    private IBdStorehouseAreaMiddleService iBdStorehouseAreaMiddleService;
-
     @Autowired
-    private IBdCubasdocService bdCubasdocService;
+    private IBdCubasdocService iBdCubasdocService;
-
     @Autowired
-    private ISysCorpService sysCorpService;
+    private ISysCorpService iSysCorpService;
-
     @Autowired
-    private IBdStorehouseService storehouseService;
+    private IBdStorehouseService iBdStorehouseService;
 
     @Override
     public R<CurrencyDTO> getCurrency(Integer pkCountry) {
-        BdCurrency bdCurrency = currencyService.getCurrency(pkCountry);
+        BdCurrency bdCurrency = iBdCurrencyService.getCurrency(pkCountry);
         return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
     }
 
@@ -57,7 +50,7 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
     public R<List<CurrencyDTO>> getCurrencyByPkCountryList(Set<Integer> pkCountryList) {
         List<CurrencyDTO> currencyDTOList = new ArrayList<>();
         for (Integer pkCountry : pkCountryList) {
-            BdCurrency bdCurrency = currencyService.getCurrency(pkCountry);
+            BdCurrency bdCurrency = iBdCurrencyService.getCurrency(pkCountry);
             currencyDTOList.add(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
         }
         return R.ok(currencyDTOList);
@@ -67,21 +60,15 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
     public R<List<CurrencyDTO>> getCurrencyById(Set<Integer> currencyIdSet) {
         List<CurrencyDTO> currencyDTOList = new ArrayList<>();
         for (Integer currencyId : currencyIdSet) {
-            BdCurrency bdCurrency = currencyService.getByPkId(currencyId);
+            BdCurrency bdCurrency = iBdCurrencyService.getByPkId(currencyId);
             currencyDTOList.add(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
         }
         return R.ok(currencyDTOList);
     }
 
-    /**
-     * 根据id查询汇率
-     *
-     * @param currencyId
-     * @return
-     */
     @Override
     public R<CurrencyDTO> getCurrencyByPkId(Integer currencyId) {
-        BdCurrency bdCurrency = currencyService.getByPkId(currencyId);
+        BdCurrency bdCurrency = iBdCurrencyService.getByPkId(currencyId);
         return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
     }
 
@@ -91,27 +78,22 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
         if (type != null && type.length > 0) {
             storeType = type[0];
         }
-        return R.ok(storehouseAreaMiddleService.queryBdStorehouseByProvince(province, storeType));
+        return R.ok(iBdStorehouseAreaMiddleService.queryBdStorehouseByProvince(province, storeType));
     }
 
     @Override
     public R<BdStorehouse> queryBdStorehouseById(Integer pkId) {
-        return R.ok(storehouseService.getById(pkId));
+        return R.ok(iBdStorehouseService.getById(pkId));
     }
 
     @Override
     public R<List<BdStorehouse>> queryBdStorehouseMapByProvince(Collection<Integer> provinceList) {
-        return R.ok(storehouseAreaMiddleService.queryStorehouseListByProvince(provinceList));
+        return R.ok(iBdStorehouseAreaMiddleService.queryStorehouseListByProvince(provinceList));
     }
 
-    /**
-     * 根据id 查询所属历史币种
-     *
-     * @return
-     */
     @Override
     public R<CurrencyDTO> getByHistoryPkId(Integer currencyId) {
-        BdCurrency bdCurrency = currencyService.getByHistoryPkid(currencyId);
+        BdCurrency bdCurrency = iBdCurrencyService.getByHistoryPkid(currencyId);
         return R.ok(BeanUtil.copyProperties(bdCurrency, CurrencyDTO.class));
     }
 
@@ -120,10 +102,8 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
      */
     @Override
     public R<List<CurrencyDTO>> findAll() {
-        List<BdCurrency> currencyList = currencyService.list();
+        List<BdCurrency> currencyList = iBdCurrencyService.list();
-        List<CurrencyDTO> currencyDtoList = currencyList.stream().map(currency -> {
+        List<CurrencyDTO> currencyDtoList = currencyList.stream().map(currency -> BeanUtil.copyProperties(currency, CurrencyDTO.class)).collect(Collectors.toList());
-            return BeanUtil.copyProperties(currency, CurrencyDTO.class);
-        }).collect(Collectors.toList());
         return R.ok(currencyDtoList);
     }
 
@@ -133,7 +113,7 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
                 .pkCountry(pkCountry)
                 .pkId(pkId)
                 .build();
-        List<BdCubasdocExt> bdCubasdocList = bdCubasdocService.querySupplierByCondition(cubasdocParam);
+        List<BdCubasdocExt> bdCubasdocList = iBdCubasdocService.querySupplierByCondition(cubasdocParam);
         if (CollectionUtil.isNotEmpty(bdCubasdocList)) {
             return R.ok(bdCubasdocList.get(0));
         }
@@ -146,7 +126,7 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
                 .pkCountry(pkCountry)
                 .pkId(pkId)
                 .build();
-        List<BdCubasdocExt> bdCubasdocList = bdCubasdocService.queryCustomerByCondition(customerParam);
+        List<BdCubasdocExt> bdCubasdocList = iBdCubasdocService.queryCustomerByCondition(customerParam);
         if (CollectionUtil.isNotEmpty(bdCubasdocList)) {
             return R.ok(bdCubasdocList.get(0));
         }
@@ -155,11 +135,11 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
 
     @Override
     public R<SysCorp> querySysCorp(Integer pkId, Integer pkCountry) {
-        return R.ok(sysCorpService.getSysCorp(pkId, pkCountry));
+        return R.ok(iSysCorpService.getSysCorp(pkId, pkCountry));
     }
 
     @Override
     public R<List<BdStorehouse>> queryStorehouseByIds(Set<Integer> storehouseIdSet, Integer pkCountry, Integer pkCorp) {
-        return R.ok(storehouseService.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp));
+        return R.ok(iBdStorehouseService.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp));
     }
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/SystemConfigServiceProvider.java

@@ -21,26 +21,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @Description:
- * @Author: sui q
- * @Time: 2022/11/10 11:29
- * @Classname: SystemConfigServiceProvider
- * @PackageName: com.hzs.system.base.provider
- */
 @DubboService
 public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
 
     @Autowired
     private IBdSystemConfigService systemConfigService;
-
     @Autowired
     private IBdCountryService bdCountryService;
-
     @Autowired
     private IBdCubasdocService bdCubasdocService;
 
-
     @Override
     public R<String> getBonusSystemConfig(Integer pkCountry, String key) {
         return R.ok(systemConfigService.getSystemConfig(pkCountry, key));
@@ -83,10 +73,6 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
 
     /**
      * 批量查询所有国家的订单时间参数
-     *
-     * @return: R<Map < String, String>>
-     * @Author: yh
-     * @Date: 2022/11/10 14:04
      */
     @Override
     public R<Map<String, String>> getSystemConfig() {
@@ -101,7 +87,6 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
                 });
             }
         }
-
         return R.ok(systemConfigMap);
     }
 
@@ -116,10 +101,4 @@ public class SystemConfigServiceProvider implements ISystemConfigServiceApi {
         return R.fail();
     }
 
-    @Override
-    public R<Boolean> saveCubasdoc(BdCubasdocDTO cubasdocDto) {
-        BdCubasdocParam bdCubasdocParam = BeanUtil.copyProperties(cubasdocDto, BdCubasdocParam.class);
-        bdCubasdocService.saveCubasdoc(bdCubasdocParam, cubasdocDto.getPkUser());
-        return R.ok();
-    }
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java

@@ -235,16 +235,6 @@ public class CacheConstants {
      */
     public static final String BD_AWARDS_COACH = CACHE_PREFIX + "awards:coach:";
 
-    /**
-     * 隶属团队配置
-     */
-    public static final String CU_MEMBER_TEAM = CACHE_PREFIX + "member:team:";
-
-    /**
-     * 隶属团队配置
-     */
-    public static final String CU_MEMBER_TEAM_ID = CACHE_PREFIX + "member:team:id";
-
     /**
      * 币种配置
      */