## 充值明细调整查询、导出字段；

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

@@ -1,7 +1,6 @@
 package com.hzs.system.base;
 
 import com.hzs.common.core.domain.R;
-import com.hzs.common.domain.system.base.BdCubasdoc;
 import com.hzs.common.domain.system.base.BdStorehouse;
 import com.hzs.common.domain.system.base.ext.BdCubasdocExt;
 import com.hzs.common.domain.system.sys.SysCorp;
@@ -13,8 +12,6 @@ import java.util.Set;
 
 /**
  * @Description:
- * @Author: sui q
- * @Time: 2022/9/8 15:11
  * @Classname: ICurrencyServiceApi
  * @PackageName: com.hzs.system.base
  */
@@ -24,9 +21,6 @@ public interface ICurrencyServiceApi {
      * 根据国家获得币种
      *
      * @param pkCountry 国家
-     * @return: BdCurrency
-     * @Author: sui q
-     * @Date: 2022/9/8 15:05
      */
     R<CurrencyDTO> getCurrency(Integer pkCountry);
 
@@ -40,9 +34,6 @@ public interface ICurrencyServiceApi {
 
     /*
      * @description: 查询需要的所有汇率
-     * @author: sui q
-     * @date: 2023/5/11 14:58
-     * @param: null null
      **/
     R<List<CurrencyDTO>> getCurrencyById(Set<Integer> currencyIdSet);
 
@@ -56,17 +47,11 @@ public interface ICurrencyServiceApi {
 
     /*
      * @description: 根据省查询对应的发货仓库
-     * @author: sui q
-     * @date: 2023/5/8 14:22
-     * @param: null null
      **/
     R<BdStorehouse> queryBdStorehouseByProvince(Integer province, Integer... type);
 
     /*
      * @description: 根据省查询对应的发货仓库
-     * @author: sui q
-     * @date: 2023/5/8 14:22
-     * @param: null null
      **/
     R<BdStorehouse> queryBdStorehouseById(Integer pkId);
 
@@ -92,33 +77,21 @@ public interface ICurrencyServiceApi {
 
     /*
      * @description: 提供查询供应商的dubbo调用
-     * @author: sui q
-     * @date: 2023/11/20 16:45
-     * @param: null null
      **/
     R<BdCubasdocExt> queryBdCubasdocById(Integer pkId, Integer pkCountry);
 
     /*
      * @description: 提供查询供应商的dubbo调用
-     * @author: sui q
-     * @date: 2023/11/20 16:45
-     * @param: null null
      **/
     R<BdCubasdocExt> queryBdCustomerById(Integer pkId, Integer pkCountry);
 
     /*
      * @description: 提供查询采购组织的dubbo调用
-     * @author: sui q
-     * @date: 2023/11/20 17:47
-     * @param: null null
      **/
     R<SysCorp> querySysCorp(Integer pkId, Integer pkCountry);
 
     /*
      * @description: 根据仓库主键查询仓库
-     * @author: sui q
-     * @date: 2023/11/20 17:54
-     * @param: null null
      **/
     R<List<BdStorehouse>> queryStorehouseByIds(Set<Integer> storehouseIdSet, Integer pkCountry, Integer pkCorp);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java

@@ -1,6 +1,5 @@
 package com.hzs.member.account.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.member.account.CuMemberRechargeDetail;
 import org.apache.ibatis.annotations.Param;
@@ -8,12 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * <p>
  * 会员充值详情表 Mapper 接口
- * </p>
- *
- * @author hzs
- * @since 2022-11-05
  */
 public interface CuMemberRechargeDetailMapper extends BaseMapper<CuMemberRechargeDetail> {
 
@@ -24,4 +18,5 @@ public interface CuMemberRechargeDetailMapper extends BaseMapper<CuMemberRecharg
      * @return Integer
      */
     Integer batchSaveMemberRechargeDetail(@Param("cuMemberRechargeDetails") List<CuMemberRechargeDetail> cuMemberRechargeDetails);
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java

@@ -18,13 +18,9 @@ import java.util.List;
 
 /**
  * 会员充值表 服务类
- *
- * @author hzs
- * @since 2022-09-08
  */
 public interface ICuMemberRechargeService extends IService<CuMemberRecharge> {
 
-
     /**
      * 根据批次查询充值信息
      *
@@ -33,7 +29,6 @@ public interface ICuMemberRechargeService extends IService<CuMemberRecharge> {
      */
     List<CuMemberRecharge> selectRechargeByBatch(String batch);
 
-
     /**
      * 会员批量充值
      *
@@ -42,7 +37,6 @@ public interface ICuMemberRechargeService extends IService<CuMemberRecharge> {
      */
     Integer saveBatchMemberRecharge(CuMemberBatchRechargeParam batchRechargeParam);
 
-
     /**
      * 根据充值单号更新审核状态信息
      *
@@ -59,7 +53,6 @@ public interface ICuMemberRechargeService extends IService<CuMemberRecharge> {
      */
     Integer submitAuditMemberRecharge(MemberAccountAudit memberAccountAudit);
 
-
     /**
      * 审核通过后插入交易明细和用户余额表
      *
@@ -103,7 +96,6 @@ public interface ICuMemberRechargeService extends IService<CuMemberRecharge> {
      */
     Boolean preCharge(String rechargeAmount, Integer pkCountry, Long pkMember, String rechargeCode, Long pkCreator);
 
-
     /**
      * 会员端在线支付更新审批状态
      *
@@ -122,7 +114,6 @@ public interface ICuMemberRechargeService extends IService<CuMemberRecharge> {
      */
     CuMemberRecharge getCuMemberRechargeByRechargeCode(String rechargeCode);
 
-
     /**
      * 根据充值单号与用户ID查询充值信息
      *
@@ -139,7 +130,6 @@ public interface ICuMemberRechargeService extends IService<CuMemberRecharge> {
      */
     void saveMemberTradeDetailAndBonus(List<CuMemberAccountRechargeExt> memberAccountList, Integer rechargeMethod, String businessCode);
 
-
     /**
      * 根据会员编号查询提交审核的用户
      *

bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.json.JSONUtil;
-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.EnumsPrefixConstants;
 import com.hzs.common.core.constant.MemberFieldConstants;
@@ -27,7 +27,6 @@ import com.hzs.member.account.vo.CuMemberPetitionListVO;
 import com.hzs.member.account.vo.CuMemberPetitionVO;
 import com.hzs.member.account.vo.CuMemberRechargeDetailVO;
 import com.hzs.member.account.vo.CuMemberRechargeVO;
-import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
 import com.hzs.system.base.dto.CurrencyDTO;
 import com.hzs.system.config.IAccountServiceApi;
 import com.hzs.system.sys.IApprovalServiceApi;
@@ -41,39 +40,31 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
 /**
  * 会员充值表 服务实现类
- *
- * @author hzs
- * @since 2022-09-08
  */
 @Service
 public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMapper, CuMemberRecharge> implements ICuMemberRechargeService {
 
     @Autowired
-    ICuMemberTradeService cuMemberTradeService;
+    private ICuMemberTradeService iCuMemberTradeService;
     @Autowired
-    ICuMemberAccountService cuMemberAccountService;
+    private ICuMemberAccountService iCuMemberAccountService;
     @Autowired
-    ICuMemberBaseService cuMemberBaseService;
+    private ICuMemberBaseService iCuMemberBaseService;
-    @Autowired
+
-    ICuMemberSettlePeriodService cuMemberSettlePeriodService;
+    @Resource
-    @Autowired
+    private CuMemberRechargeDetailMapper cuMemberRechargeDetailMapper;
-    CuMemberRechargeDetailMapper cuMemberRechargeDetailMapper;
-    @Autowired
-    ICuMemberTradeDetailService cuMemberTradeDetailService;
-    @Autowired
-    ICuMemberTradeBonusService cuMemberTradeBonusService;
 
     @DubboReference
-    IApprovalServiceApi approvalServiceApi;
+    IApprovalServiceApi iApprovalServiceApi;
     @DubboReference
-    IAccountServiceApi accountServiceApi;
+    IAccountServiceApi iAccountServiceApi;
 
     @Autowired
     private ITransactionCommonService iTransactionCommonService;
@@ -82,8 +73,8 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
     @Override
     public List<CuMemberRecharge> selectRechargeByBatch(String batch) {
         //根据单号查询充值信息
-        QueryWrapper<CuMemberRecharge> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuMemberRecharge> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("BATCH", batch);
+        queryWrapper.eq(CuMemberRecharge::getBatch, batch);
         return baseMapper.selectList(queryWrapper);
     }
 
@@ -101,7 +92,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
             //会员编号集合
             List<String> memberCodes = batchRechargeParam.getMemberCodes();
             //查询账户余额
-            List<CuMemberAccountExt> cuMemberAccounts = cuMemberAccountService.queryMemberAccountByMemberCodes(new ArrayList<>(), memberCodes);
+            List<CuMemberAccountExt> cuMemberAccounts = iCuMemberAccountService.queryMemberAccountByMemberCodes(new ArrayList<>(), memberCodes);
             Map<String, CuMemberAccountExt> memberAccountExtMap = cuMemberAccounts.stream().collect(Collectors.toMap(CuMemberAccountExt::getMemberCode, o -> o));
             batchRechargeParam.setMemberAccountExtMap(memberAccountExtMap);
             //会员的累计账户余额
@@ -133,7 +124,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
     private void packageOperationLog(List<CuMemberRecharge> cuMemberRecharges, CuMemberBatchRechargeParam batchRechargeParam, String batchNum) {
         StringBuilder sb;
         List<BusinessLogDTO> businessLogDTOList = new ArrayList<>();
-        BusinessLogDTO businessLog = null;
         if (CollUtil.isNotEmpty(cuMemberRecharges)) {
             //会员信息
             List<CuMember> cuMembers = batchRechargeParam.getCuMembers();
@@ -144,12 +134,12 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
             for (CuMemberRecharge cuMemberRecharge : cuMemberRecharges) {
                 sb = new StringBuilder();
                 sb.append("会员编号：").append(memberMap.get(cuMemberRecharge.getPkMember())).append(" ")
-                        .append(accountMap.get(cuMemberBaseService.translateAccountValue(cuMemberRecharge.getPkAccount())))
+                        .append(accountMap.get(iCuMemberBaseService.translateAccountValue(cuMemberRecharge.getPkAccount())))
                         .append(" 充值金额：").append(cuMemberRecharge.getRechargeAmount())
                         .append(" 充值方式：").append(transactionMap.get(EnumsPrefixConstants.RECHARGE_METHOD + cuMemberRecharge.getRechargeMethod()))
                         .append(" 交款方式：").append(transactionMap.get(EnumsPrefixConstants.PAYMENT_TYPE + cuMemberRecharge.getRechargeType()));
 
-                businessLog = BusinessLogDTO.builder()
+                BusinessLogDTO businessLog = BusinessLogDTO.builder()
                         .businessType(EApprovalBusiness.RECHARGE.getValue())
                         .businessCode(batchNum).pkMember(cuMemberRecharge.getPkMember())
                         .content(sb.toString()).pkCreator(cuMemberRecharge.getPkCreator())
@@ -158,11 +148,10 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
 
                 businessLogDTOList.add(businessLog);
             }
-            cuMemberBaseService.operationLogMQ(businessLogDTOList);
+            iCuMemberBaseService.operationLogMQ(businessLogDTOList);
         }
     }
 
-
     /**
      * 提交审批
      *
@@ -182,7 +171,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
                 .businessCode(batchNum).businessData(JSONUtil.toJsonStr(batchRechargeParam))
                 .signType(ESignType.getEnumByValue(batchRechargeParam.getSignType())).userIdList(batchRechargeParam.getUserIdList())
                 .sendIdList(sendIdList).remark(batchRechargeParam.getRemark()).pkMemberList(pkMemberIds).build();
-        R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, batchRechargeParam.getLoginUser());
+        R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, batchRechargeParam.getLoginUser());
         if (!submit.isSuccess()) {
             throw new RuntimeException(submit.getMsg());
         }
@@ -268,7 +257,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         BigDecimal memberBalance = memberAccountBalance.get(memberCode + "_" + pkAccount);
         //账户余额
         Map<String, CuMemberAccountExt> memberAccountExtMap = batchRechargeParam.getMemberAccountExtMap();
-        BigDecimal balance = ReflectUtils.invokeGetter(memberAccountExtMap.get(memberCode), MemberFieldConstants.ACCOUNT + cuMemberBaseService.getAccountValueById(pkAccount));
+        BigDecimal balance = ReflectUtils.invokeGetter(memberAccountExtMap.get(memberCode), MemberFieldConstants.ACCOUNT + iCuMemberBaseService.getAccountValueById(pkAccount));
         //充值方式
         Integer rechargeMethod = batchRechargeParam.getRechargeMethod();
         //根据充值方式获取充值金额
@@ -339,31 +328,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         return currentAmount;
     }
 
-    /**
-     * 拼装充值信息
-     *
-     * @param cuMemberRechargeAccountParam 充值币种信息
-     * @param cuMemberRechargeParam        会员充值
-     * @param rechargeCode                 充值单号
-     * @return CuMemberRecharge
-     */
-    private CuMemberRecharge packageCuMemberRecharge(CuMemberRechargeAccountParam cuMemberRechargeAccountParam,
-                                                     CuMemberRechargeParam cuMemberRechargeParam, String rechargeCode) {
-        CuMemberRecharge memberRecharge = CuMemberRecharge.builder().pkMember(cuMemberRechargeParam.getPkMember())
-                .pkAccount(cuMemberRechargeAccountParam.getAccountType()).rechargeCode(rechargeCode)
-                .rechargeMethod(cuMemberRechargeParam.getRechargeMethod())
-                .remarks(cuMemberRechargeAccountParam.getRemarks())
-                .build();
-        //审核状态为已提交
-        memberRecharge.setApproveState(EApproveRechargeStatus.WAIT.getValue());
-        memberRecharge.setPkCountry(cuMemberRechargeParam.getPkCountry());
-        memberRecharge.setPkCreator(cuMemberRechargeParam.getLoginUser().getUserId());
-        memberRecharge.setCreationTime(new Date());
-        memberRecharge.setPkRate(cuMemberRechargeParam.getPkRate());
-        return memberRecharge;
-    }
-
-
     @Override
     public Integer updateBathRechargeByRechargeCode(MemberAccountAudit memberAccountAudit) {
         CuMemberRecharge cuMemberRecharge = new CuMemberRecharge();
@@ -378,7 +342,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         return this.updateBathRechargeByRechargeCode(memberAccountAudit);
     }
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateMemberTradeAndMemberBalance(ApprovalBusinessResultDTO approvalBusinessResultDTO, List<CuMemberRecharge> cuMemberRecharges) {
@@ -394,9 +357,9 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
             cuMemberTrades.add(memberTrade);
         }
         //批量插入流水表
-        cuMemberTradeService.batchSaveTradeByMemberCode(cuMemberTrades);
+        iCuMemberTradeService.batchSaveTradeByMemberCode(cuMemberTrades);
         //批理更新余额
-        cuMemberAccountService.updateBatchMemberAccountByPkmember(batch, userId, ETransferType.TRANSFER_IN.getValue());
+        iCuMemberAccountService.updateBatchMemberAccountByPkmember(batch, userId, ETransferType.TRANSFER_IN.getValue());
     }
 
     @Override
@@ -404,9 +367,9 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
     public void saveMemberTradeDetailAndBonus(List<CuMemberAccountRechargeExt> memberAccountList, Integer rechargeMethod, String businessCode) {
         //充值为正时插入奖金余额表
         if (rechargeMethod.equals(ERechargeMethod.BANK_TRANSFER.getValue())) {
-            cuMemberBaseService.handleRepeatMemberTradeDetailAndBonus(memberAccountList, EConsumeType.RECHARGE.getValue());
+            iCuMemberBaseService.handleRepeatMemberTradeDetailAndBonus(memberAccountList, EConsumeType.RECHARGE.getValue());
         } else {
-            cuMemberBaseService.saveMemberTradeDetail(businessCode);
+            iCuMemberBaseService.saveMemberTradeDetail(businessCode);
         }
     }
 
@@ -419,13 +382,13 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
     private CuMemberTrade getCuMemberTrade(String batch, CuMemberRecharge cuMemberRecharge, Map<String, BigDecimal> memberAccountBalance) {
         Long pkMember = cuMemberRecharge.getPkMember();
         int pkAccount = cuMemberRecharge.getPkAccount();
-        BdAccount account = cuMemberBaseService.getAccount(pkAccount);
+        BdAccount account = iCuMemberBaseService.getAccount(pkAccount);
         //会员当前余额
         BigDecimal memberBalance = memberAccountBalance.get(pkMember + "_" + pkAccount);
         //充值金额
         BigDecimal tradeAmount = cuMemberRecharge.getRechargeAmount();
         //查询余额
-        BigDecimal balance = cuMemberAccountService.selectBalanceByMemberCode(pkMember, account.getFieldValue());
+        BigDecimal balance = iCuMemberAccountService.selectBalanceByMemberCode(pkMember, account.getFieldValue());
         if (null == memberBalance) {
             memberAccountBalance.put(pkMember + "_" + pkAccount, balance.add(tradeAmount));
         } else {
@@ -448,7 +411,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         return memberTrade;
     }
 
-
     @Override
     public CuMemberRechargeDetailVO queryCuMemberRechargeDetail(Long pkId) {
         // TODO: 2022/11/9  详情功能暂无
@@ -468,14 +430,13 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
             for (CuMemberRechargeExt cuMemberRechargeExt : cuMemberRechargeExts) {
                 cuMemberRechargeVO = new CuMemberRechargeVO();
                 BeanUtils.copyProperties(cuMemberRechargeExt, cuMemberRechargeVO);
-                cuMemberRechargeVO = setPublicParam(cuMemberRechargeVO);
+                setPublicParam(cuMemberRechargeVO);
                 cuMemberRechargeVOS.add(cuMemberRechargeVO);
             }
             CuMemberRechargeExt cuMemberRechargeExt = baseMapper.selectMemberRechargeListTotal(memberRechargeVO);
             cuMemberRechargeVOS.add(BeanUtil.copyProperties(cuMemberRechargeExt, CuMemberRechargeVO.class));
         }
-        Object[] objects = new Object[]{cuMemberRechargeExts, cuMemberRechargeVOS};
+        return new Object[]{cuMemberRechargeExts, cuMemberRechargeVOS};
-        return objects;
     }
 
     /**
@@ -487,17 +448,16 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
     private CuMemberRechargeVO setPublicParam(CuMemberRechargeVO cuMemberRechargeVO) {
         //翻译值
         Integer pkAccount = cuMemberRechargeVO.getPkAccount();
-        cuMemberRechargeVO.setPkAccount(cuMemberBaseService.translateAccountValue(pkAccount));
+        cuMemberRechargeVO.setPkAccount(iCuMemberBaseService.translateAccountValue(pkAccount));
         //汇率
-        BigDecimal exchangeRate = cuMemberBaseService.getCurrencyById(cuMemberRechargeVO.getPkRate()).getInExchangeRate();
+        BigDecimal exchangeRate = iCuMemberBaseService.getCurrencyById(cuMemberRechargeVO.getPkRate()).getInExchangeRate();
-        //充值本币
+//        //充值本币
-        BigDecimal settleRechargeAmount = cuMemberRechargeVO.getPaymentAmount().divide(exchangeRate, 4, RoundingMode.HALF_UP);
+//        BigDecimal settleRechargeAmount = cuMemberRechargeVO.getPaymentAmount().divide(exchangeRate, 4, RoundingMode.HALF_UP);
         cuMemberRechargeVO.setExchangeRate(exchangeRate);
-        cuMemberRechargeVO.setSettlePaymentAmount(settleRechargeAmount);
+//        cuMemberRechargeVO.setSettlePaymentAmount(settleRechargeAmount);
         return cuMemberRechargeVO;
     }
 
-
     @Override
     public CuMemberPetitionVO showMemberPetition(CuMemberRechargeParam memberRechargeParam) {
         CuMemberPetitionListVO cuMemberPetitionListVO;
@@ -507,7 +467,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         //充值类型
         Integer rechargeMethod = memberRechargeParam.getRechargeMethod();
 
-        R<Map<Integer, ApprovalInfoDTO>> mapR = approvalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.RECHARGE.getValue()), memberRechargeParam.getPkCountry());
+        R<Map<Integer, ApprovalInfoDTO>> mapR = iApprovalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.RECHARGE.getValue()), memberRechargeParam.getPkCountry());
         //批次号
         String batchNum = CommonUtil.createSerialNumber(EOrderPrefix.RECHARGE_CODE.getValue());
         memberPetitionVo.setBusinessNo(batchNum);
@@ -529,7 +489,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
 
         //查询余额
         List<String> memberCodes = memberRechargeParam.getMemberCode();
-        List<CuMemberAccountExt> cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByMemberCodes(null, memberCodes);
+        List<CuMemberAccountExt> cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByMemberCodes(null, memberCodes);
         Map<String, CuMemberAccountExt> memberAccounMap = cuMemberAccountExts.stream().collect(Collectors.toMap(CuMemberAccountExt::getMemberCode, o -> o));
         //在线签呈的业务列表展示
         if (CollUtil.isNotEmpty(cuMemberAccountExts)) {
@@ -546,11 +506,11 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
 
                     //充值余额
                     Integer accountType = rechargeAccountParam.getAccountType();
-                    BigDecimal balance = ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + cuMemberBaseService.getAccountValueById(accountType));
+                    BigDecimal balance = ReflectUtils.invokeGetter(cuMemberAccountExt, MemberFieldConstants.ACCOUNT + iCuMemberBaseService.getAccountValueById(accountType));
                     //充值金额
                     BigDecimal amount = getRechargeAmount(rechargeAccountParam, rechargeMethod, balance);
                     cuMemberPetitionListVO.setPaymentAmount(amount);
-                    cuMemberPetitionListVO.setPkAccount(cuMemberBaseService.translateAccountValue(accountType));
+                    cuMemberPetitionListVO.setPkAccount(iCuMemberBaseService.translateAccountValue(accountType));
                     cuMemberPetitionListVO.setPaymentBalance(balance);
                     cuMemberPetitionListVO.setRemarks(rechargeAccountParam.getRemarks());
                     cuMemberPetitionListVO.setPaymentAfterBalance(balance.add(amount));
@@ -581,11 +541,10 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         return rechargeAmount;
     }
 
-
     @Override
     public Boolean preCharge(String rechargeAmount, Integer pkCountry, Long pkMember, String rechargeCode, Long pkCreator) {
-        BdAccount bdAccount = accountServiceApi.queryAccountByCondition(pkCountry).getData();
+        BdAccount bdAccount = iAccountServiceApi.queryAccountByCondition(pkCountry).getData();
-        CurrencyDTO currency = cuMemberBaseService.getCurrency(pkCountry);
+        CurrencyDTO currency = iCuMemberBaseService.getCurrency(pkCountry);
 
         CuMemberRecharge memberRecharge = CuMemberRecharge.builder().pkMember(pkMember)
                 .rechargeAmount(new BigDecimal(rechargeAmount))
@@ -601,7 +560,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         return this.save(memberRecharge);
     }
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer updateOnlineRechargeByRechargeCode(String rechargeCode, EApproveOperation eApproveOperation, Long pkMember) {
@@ -613,14 +571,13 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         cuMemberRecharge.setPkModified(pkMember);
         baseMapper.updateBathRechargeByRechargeCode(cuMemberRecharge);
         //会员端在线支付 回调插入交易流水、更新余额
-        return cuMemberTradeService.saveMemberTradeAndAccountByRechargeCode(rechargeCode);
+        return iCuMemberTradeService.saveMemberTradeAndAccountByRechargeCode(rechargeCode);
     }
 
-
     @Override
     public CuMemberRecharge getCuMemberRechargeByRechargeCode(String rechargeCode) {
-        QueryWrapper<CuMemberRecharge> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CuMemberRecharge> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq("RECHARGE_CODE", rechargeCode);
+        queryWrapper.eq(CuMemberRecharge::getRechargeCode, rechargeCode);
         return baseMapper.selectOne(queryWrapper);
     }
 
@@ -629,7 +586,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         return baseMapper.selectMemberRechargeByCodeAndPkMember(cuMemberRechargeVO);
     }
 
-
     @Override
     public List<String> selectMemberRechargeApproveByUserCode(Integer pkCountry, List<String> memberCodes) {
         return baseMapper.selectMemberRechargeApproveByUserCode(pkCountry, memberCodes);
@@ -645,5 +601,4 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl<CuMemberRechargeMap
         return baseMapper.selectRechargeTotalAmount(startDate, endDate);
     }
 
-
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberRechargeVO.java

@@ -78,12 +78,12 @@ public class CuMemberRechargeVO extends CuMemberBaseVO {
     @Excel(name = "当前余额", scale = 2)
     private BigDecimal paymentBalance;
 
-    /**
+//    /**
-     * 充值金额（本币）
+//     * 充值金额（本币）
-     */
+//     */
-    @BigDecimalFormat()
+//    @BigDecimalFormat()
-    @Excel(name = "充值金额($)", scale = 2)
+//    @Excel(name = "充值金额($)", scale = 2)
-    private BigDecimal settlePaymentAmount;
+//    private BigDecimal settlePaymentAmount;
 
     /**
      * 汇率
@@ -98,11 +98,11 @@ public class CuMemberRechargeVO extends CuMemberBaseVO {
      */
     @Excel(name = "单据编号", scale = 2)
     private String rechargeCode;
-    /**
+//    /**
-     * 充值批次
+//     * 充值批次
-     */
+//     */
-    @Excel(name = "充值批次")
+//    @Excel(name = "充值批次")
-    private String batch;
+//    private String batch;
     /**
      * 操作人
      */

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

@@ -15,8 +15,6 @@ import java.util.Map;
 
 /**
  * @Description: 会员服务需要保存不同的表
- * @Author: sui q
- * @Time: 2022/9/13 9:19
  * @Classname: ICuMemberBusinessService
  * @PackageName: com.hzs.member.base.service
  */
@@ -26,9 +24,6 @@ public interface ICuMemberBusinessService {
      * 更新用户信息信息
      *
      * @param cuMember 会员
-     * @return: void
-     * @Author: sui q
-     * @Date: 2022/9/26 11:33
      */
     void updateCuMember(CuMember cuMember);
 
@@ -38,9 +33,6 @@ public interface ICuMemberBusinessService {
      * @param cuMember           会员信息
      * @param saOrder            订单信息
      * @param cuMemberAccountExt 会员账户信息
-     * @return: Boolean
-     * @Author: sui q
-     * @Date: 2022/9/26 11:35
      */
     Boolean saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
 
@@ -51,36 +43,19 @@ public interface ICuMemberBusinessService {
      * @param saOrder            订单信息
      * @param isPay              是否支付
      * @param cuMemberAccountExt 支付账号
-     * @return: R<Integer>
-     * @Author: sui q
-     * @Date: 2022/9/9 9:39
      */
     Boolean saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt);
 
-    /*
-     * @description: 保存分享会员，直接上树，生成账户
-     * @author: sui q
-     * @date: 2023/8/15 15:07
-     * @param: null null
-     **/
-    Boolean saveShareMember(CuMember cuMember);
-
     /**
      * 保存分享新会员信息，确认支付订单
      *
      * @param cuMember 会员信息
      * @param saOrder  订单信息
-     * @return: R<Integer>
-     * @Author: sui q
-     * @Date: 2022/9/9 9:39
      */
     Boolean saveMember(CuMember cuMember, SaOrder saOrder);
 
     /*
      * @description: 在线支付修改记录
-     * @author: sui q
-     * @date: 2023/5/16 10:47
-     * @param: null null
      **/
     Boolean saveMemberOnLineTrade(CuMember cuMember, SaOrder saOrder, CuMemberAccountExt cuMemberAccountExt);
 
@@ -88,9 +63,6 @@ public interface ICuMemberBusinessService {
      * 插入充值记录
      *
      * @param saOrderExt 订单
-     * @return: CuMemberAccountExt
-     * @Author: sui q
-     * @Date: 2023/3/23 16:00
      */
     CuMemberAccountExt insertMemberRecharge(SaOrder saOrderExt);
 
@@ -107,18 +79,11 @@ public interface ICuMemberBusinessService {
      *
      * @param pkApprove 审核人
      * @param saOrder   销售订单
-     * @return: Boolean
-     * @Author: sui q
-     * @Date: 2022/10/22 16:43
      */
     Boolean singleRevokeMemberByRegisterOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO);
 
     /**
      * @description: 自助撤单-注册单撤单
-     * @author: zhang jing
-     * @date: 2023/11/23 16:17
-     * @param: [pkApprove, saOrder, businessCommissionDTO]
-     * @return: java.lang.Boolean
      **/
     Boolean singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO);
 
@@ -129,9 +94,6 @@ public interface ICuMemberBusinessService {
      * @param pkApprove  审核人
      * @param memberList 会员lieb
      * @param saOrderMap 销售订单
-     * @return: Boolean
-     * @Author: sui q
-     * @Date: 2022/10/22 16:43
      */
     Boolean mergeRevokeMemberByRegisterOrder(Long pkApprove, List<Long> memberList, Map<Long, SaOrderExt> saOrderMap, BusinessCommissionDTO businessCommissionDTO);
 
@@ -141,9 +103,6 @@ public interface ICuMemberBusinessService {
      * @param pkApprove 审核人
      * @param saOrder   订单
      * @param cuMember  升级订单
-     * @return: R<Boolean>
-     * @Author: sui q
-     * @Date: 2023/3/25 14:13
      */
     Boolean normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, List<Long> pkOrderItemList, BusinessCommissionDTO businessCommissionDTO);
 
@@ -152,9 +111,6 @@ public interface ICuMemberBusinessService {
      *
      * @param pkApprove 发起人
      * @param saOrder   订单 backOrderAmount 需要填写回退的金额
-     * @return: void
-     * @Author: sui q
-     * @Date: 2023/3/30 15:40
      */
     void cancelPartOrderBackAmount(Long pkApprove, SaOrderExt saOrder);
 
@@ -188,15 +144,6 @@ public interface ICuMemberBusinessService {
      */
     void orderReturn(SaOrder saOrder, Long userId, BigDecimal changeAmount, String changeRemark);
 
-//    /**
-//     * 订单合单退单
-//     *
-//     * @param returnDTOList 退单DTO列表
-//     * @param userId        操作用户ID
-//     * @return
-//     */
-//    void orderReturnBatch(List<OrderReturnPaymentDTO> returnDTOList, Long userId);
-
     /**
      * 订单退单注册会员
      *
@@ -217,42 +164,26 @@ public interface ICuMemberBusinessService {
      */
     String orderSelfDeliver(Long pkMember, Integer pkRate, Integer pkCountry, BigDecimal postage, Long userId);
 
-
     /**
      * @description: 自助服务(修改收货地址)-生成订单
-     * @author: zhang jing
-     * @date: 2023/4/18 17:16
-     * @param: [saOrder, cuMemberAccountExt]
-     * @return: void
      **/
     void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount);
 
     /*
      * @description: 会员编号，账户类型，抽奖金额
-     * @author: sui q
-     * @date: 2023/4/25 16:31
-     * @param: null null
      **/
     Boolean updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney);
 
-
     /*
      * @description: 会员抽奖，购买抽奖次数支付金额
-     * @author: sui q
-     * @date: 2023/4/27 15:54
-     * @param: null null
      **/
     Boolean updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney);
 
     /*
      * @description: 会员抽奖，购买抽奖次数支付金额
-     * @author: sui q
-     * @date: 2023/4/27 15:54
-     * @param: null null
      **/
     Boolean updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt);
 
-
     /**
      * 更新用户等级
      *
@@ -264,9 +195,6 @@ public interface ICuMemberBusinessService {
 
     /*
      * @description: 查询会员的安置位置
-     * @author: sui q
-     * @date: 2023/8/15 13:58
-     * @param: null null
      **/
     CuMember queryCuMemberPlaceDept(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve);
 

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

@@ -10,35 +10,21 @@ import java.util.List;
 
 /**
  * 隶属团队 服务类
- *
- * @author hzs
- * @since 2022-09-01
  */
 public interface ICuMemberTeamService extends IService<CuMemberTeam> {
 
     /**
      * @description: 隶属团队列表
-     * @author: zhang jing
-     * @date: 2022/11/9 14:13
-     * @param: [cuMemberTeamExt]
-     * @return: java.util.List<com.hzs.common.domain.member.ext.CuMemberTeamExt>
      **/
     List<CuMemberTeamExt> queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt);
 
     /*
      * @description: 根据会员主键获得所属团队
-     * @author: sui q
-     * @date: 2023/4/25 9:17
-     * @param: pkMember 会员主键
      **/
     CuMemberTeamExt getCuMemberTeamById(Long pkMember);
 
     /**
      * @description: 根据国家查询隶属团队
-     * @author: zhang jing
-     * @date: 2022/11/10 19:26
-     * @param: [pkCountry]
-     * @return: java.util.List<com.hzs.common.domain.member.ext.CuMemberTeamExt>
      **/
     List<CuMemberTeamExt> queryCuMemberTeam(Integer pkCountry);
 
@@ -52,9 +38,6 @@ public interface ICuMemberTeamService extends IService<CuMemberTeam> {
 
     /*
      * @description: 更新体系下的团队
-     * @author: sui q
-     * @date: 2023/4/24 19:18
-     * @param: null null
      **/
     Boolean updateCuMemberTeamByVertex(Long pkTeamCode);
 

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java

@@ -9,9 +9,6 @@ import java.util.List;
 
 /**
  * 奖金拨比统计 Mapper 接口
- *
- * @author zhangjing
- * @since 2023-05-31
  */
 public interface CuBonusStatisMapper extends BaseMapper<CuBonusStatis> {
 

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java

@@ -13,9 +13,6 @@ import java.util.List;
  * 奖金拨比统计
  * 每个团队，每天一条数据
  * 数据来自 订单表和 CU_MEMBER_BONUS 会员奖金-会员奖金汇总表
- *
- * @author zhangjing
- * @since 2023-05-31
  */
 @Data
 public class CuBonusStatisVO {

bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml

@@ -2,33 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.member.account.mapper.CuMemberRechargeDetailMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.member.account.CuMemberRechargeDetail">
-        <result column="CREATION_TIME" property="creationTime"/>
-        <result column="DEL_FLAG" property="delFlag"/>
-        <result column="PK_CREATOR" property="pkCreator"/>
-        <result column="PK_ID" property="pkId"/>
-        <result column="RECHARGE_CODE" property="rechargeCode"/>
-        <result column="PAYMENT_METHOD" property="paymentMethod"/>
-        <result column="PAYMENT_AMOUNT" property="paymentAmount"/>
-        <result column="PAYMENT_BALANCE" property="paymentBalance"/>
-        <result column="PAYMENT_BEFORE_BALANCE" property="paymentBeforeBalance"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        CREATION_TIME,
-        DEL_FLAG,
-        PK_CREATOR,
-        PK_ID, PK_MEMBER_RECHARGE, PAYMENT_METHOD, PAYMENT_AMOUNT
-    </sql>
-
     <insert id="batchSaveMemberRechargeDetail" parameterType="com.hzs.common.domain.member.account.CuMemberRechargeDetail">
         insert into CU_MEMBER_RECHARGE_DETAIL (PK_ID, RECHARGE_CODE, PAYMENT_METHOD, PAYMENT_AMOUNT,PK_CREATOR,PAYMENT_BALANCE,PAYMENT_BEFORE_BALANCE)
         SELECT cu_member_recharge_detail_seq.nextval,d.* FROM
         (
         <foreach collection="cuMemberRechargeDetails" item="item" separator="UNION ALL">
-            SELECT #{item.rechargeCode},#{item.paymentMethod},#{item.paymentAmount} ,#{item.pkCreator},#{item.paymentBalance},#{item.paymentBeforeBalance}
+            SELECT #{item.rechargeCode},#{item.paymentMethod},#{item.paymentAmount}
+            ,#{item.pkCreator},#{item.paymentBalance},#{item.paymentBeforeBalance}
             FROM dual
         </foreach>
         ) d