Merge remote-tracking branch 'origin/lx_dev' into lx_dev

bd-api/bd-api-system/src/main/java/com/hzs/system/config/IWithdrawalSpecialServiceApi.java

@@ -1,34 +0,0 @@
-package com.hzs.system.config;
-
-import com.hzs.common.core.domain.R;
-import com.hzs.common.domain.system.config.BdWithdrawalSpecial;
-
-import java.util.List;
-
-/**
- * @description: 提现设置特殊配置api
- * @author: zhang jing
- * @date: 2022/9/27 15:14
- * @param:
- * @return:
- **/
-public interface IWithdrawalSpecialServiceApi {
-
-     /**
-      * @description: 根据国家查询提现设置特殊配置列表
-      * @author: zhang jing
-      * @date: 2022/9/27 16:24
-      * @param: [pkCountry]
-      * @return: com.hzs.common.core.domain.R<java.util.List<com.hzs.common.domain.system.config.BdWithdrawalSpecial>>
-      **/
-     R<List<BdWithdrawalSpecial>> queryWithdrawalSpecial(Integer pkCountry);
-     /**
-      * @description: 根据国家会员编号查询提现设置特殊配置
-      * @author: zhang jing
-      * @date: 2022/9/27 16:27
-      * @param: [pkCountry, memberCode]
-      * @return: com.hzs.common.core.domain.R<com.hzs.common.domain.system.config.BdWithdrawalSpecial>
-      **/
-     R<BdWithdrawalSpecial>  getWithdrawalSpecial(Integer pkCountry,String memberCode);
-
-}

bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java

@@ -5,12 +5,6 @@ import com.hzs.third.bankcard.dto.BankCardParam;
 
 /**
  * 银行卡四要素认证
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/2/9 14:04
- * @Classname: BankCardService
- * @Package_name: com.hzs.third.bankCard
  */
 public interface IBankCardServiceApi {
 

bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java

@@ -9,12 +9,6 @@ import java.io.Serializable;
 
 /**
  * 银行卡校验参数
- *
- * @Description:
- * @Author: ljc
- * @Time: 2022/11/24 18:19
- * @Classname: BankCardVO
- * @Package_name: com.hz.bankCard.vo
  */
 @Data
 @Builder

bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml

@@ -1213,13 +1213,14 @@
         select t.*,
         nvl(cms.a_balance, 0) a_balance,
         nvl(cms.b_balance, 0) b_balance,
-        nvl(t.r_a_sum_pv, 0) + nvl(t.r_rep_a_sum_pv, 0) - nvl(cms.a_sum_pv, 0) - nvl(cms.rep_a_sum_pv, 0) a_sum_pv,
-        nvl(t.r_b_sum_pv, 0) + nvl(t.r_rep_b_sum_pv, 0) - nvl(cms.b_sum_pv, 0) - nvl(cms.rep_b_sum_pv, 0) b_sum_pv
+        nvl(t.tmp_a_sum_pv, 0) + nvl(t.rep_a_sum_pv, 0) - nvl(cms.a_sum_pv, 0) - nvl(cms.rep_a_sum_pv, 0) a_sum_pv,
+        nvl(t.tmp_b_sum_pv, 0) + nvl(t.rep_b_sum_pv, 0) - nvl(cms.b_sum_pv, 0) - nvl(cms.rep_b_sum_pv, 0) b_sum_pv
         from (
         select cms.*, ba.awards_value
         from (
         select cms.pk_member, cms.pk_awards, cms.purchase_status,
-        cms.r_a_sum_pv, cms.r_b_sum_pv, cms.r_rep_a_sum_pv, cms.r_rep_b_sum_pv
+        cms.a_sum_pv tmp_a_sum_pv, cms.b_sum_pv tmp_b_sum_pv,
+        cms.rep_a_sum_pv, cms.rep_b_sum_pv
         from ${settleTableName} cms
         where cms.pk_member in
         <foreach collection="pkMemberList" item="item" open="(" close=")" separator=",">

bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java

@@ -2,18 +2,12 @@ package com.hzs.member.account.controller.api;
 
 import cn.hutool.core.collection.CollUtil;
 import com.hzs.common.core.annotation.RepeatSubmitSimple;
-import com.hzs.common.core.constant.CountryConstants;
-import com.hzs.common.core.constant.msg.FinanceMsgConstants;
 import com.hzs.common.core.domain.R;
-import com.hzs.common.core.enums.EBusinessModule;
-import com.hzs.common.core.enums.EYesNo;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.domain.member.account.CuMemberBank;
-import com.hzs.common.domain.system.config.BdTradeWhiteConfig;
 import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.common.util.TransactionUtils;
 import com.hzs.member.account.dto.CuMemberBankParam;
 import com.hzs.member.account.service.ICuMemberBankService;
 import com.hzs.member.account.service.ICuMemberBaseService;
@@ -41,117 +35,15 @@ public class ApiCuMemberBankController extends BaseController {
     @Autowired
     private IApiAliSmsService iApiAliSmsService;
     @Autowired
-    private ICuMemberBaseService iCuMemberBaseService;
-    @Autowired
     private ICuMemberWithdrawService iCuMemberWithdrawService;
 
     @DubboReference
     IBankCardServiceApi iBankCardServiceApi;
 
-    /**
-     * 是否绑定银行卡
-     *
-     * @return AjaxResult
-     */
-    @GetMapping("/is-bind")
-    public AjaxResult isBindBank() {
-        Long pkMember = SecurityUtils.getUserId();
-        Integer pkCountry = SecurityUtils.getPkCountry();
-        CuMemberBankVO cuMemberBank = iCuMemberBankService.isBindBank(pkMember, pkCountry);
-        String flag = null == cuMemberBank.getDefaultCard() ? EYesNo.NO.getValue() : EYesNo.YES.getValue();
-        return AjaxResult.success().put("flag", flag);
-    }
 
     /**
-     * 解绑银行卡
-     *
-     * @return AjaxResult
+     * 银行卡列表
      */
-    @GetMapping("/unbind-bank")
-    public AjaxResult unbindBank(Long pkId) {
-        Assert.notNull(pkId, TransactionUtils.getContent(FinanceMsgConstants.BANK_CARD_CANNOT_EMPTY));
-        Integer pkCountry = SecurityUtils.getPkCountry();
-        Long pkMember = SecurityUtils.getUserId();
-        //查询默认银行卡
-        CuMemberBankVO cuMemberBankVO = iCuMemberBankService.selectCuMemberBankById(pkId);
-        //解绑默认银行卡需校验是否有进行的提现
-        if (null != cuMemberBankVO) {
-            List<Long> pkIds = iCuMemberWithdrawService.selectWithdrawMember(pkCountry, pkMember);
-            if (CollUtil.isNotEmpty(pkIds)) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.WITHDRAWAL_APPROVAL));
-            }
-        }
-        return AjaxResult.success(iCuMemberBankService.unbindBank(pkId, pkMember));
-    }
-
-    /**
-     * 校验开户名
-     *
-     * @param accountName 开户名
-     * @return AjaxResult
-     */
-    @GetMapping("/check-account-name")
-    public AjaxResult checkAccountName(String accountName) {
-        Assert.notNull(accountName, TransactionUtils.getContent(FinanceMsgConstants.ACCOUNT_NAME_CANNOT_EMPTY));
-        String memberCode = SecurityUtils.getMemberCode();
-        String flag = memberCode.equals(accountName) ? EYesNo.YES.getValue() : EYesNo.NO.getValue();
-        return AjaxResult.success().put("flag", flag);
-    }
-
-    /**
-     * 银行卡四要素验证
-     *
-     * @param memberBankParam 银行卡信息
-     * @return AjaxResult
-     */
-    @PostMapping("/verify-bank-card")
-    public AjaxResult verifyBankCard(@RequestBody CuMemberBankParam memberBankParam) {
-        BankCardParam bankCard = BankCardParam.builder().name(memberBankParam.getAccountName())
-                .idCard(memberBankParam.getIdCard()).mobile(memberBankParam.getPhone())
-                .bankCard(StringUtils.deleteWhitespace(memberBankParam.getCardNumber())).build();
-        R<?> result = iBankCardServiceApi.verifyBankCard(bankCard);
-        return result.isSuccess() ? AjaxResult.success() : AjaxResult.error(result.getMsg());
-    }
-
-    /**
-     * 绑定银行卡
-     *
-     * @param cuMemberBankParam 银行卡入参
-     * @return AjaxResult
-     */
-    @PostMapping("/add")
-    @RepeatSubmitSimple
-    public AjaxResult addBankInfo(@RequestBody CuMemberBankParam cuMemberBankParam) {
-        Integer pkCountry = SecurityUtils.getPkCountry();
-        Long pkMember = SecurityUtils.getUserId();
-        //是否配置提现白名单
-        String configWhite = getConfigWhite(pkCountry, pkMember);
-        // 海外不校验验证码、四要素 国内配置了提现白名单不校验
-        if (pkCountry.equals(CountryConstants.CHINA_COUNTRY) && configWhite.equals(EYesNo.NO.getValue())) {
-            String verificationCode = cuMemberBankParam.getVerificationCode();
-            if (StringUtils.isEmpty(verificationCode)) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.VERIFICATION_CODE_CANNOT_EMPTY));
-            }
-            //支行名称
-            String subBankName = cuMemberBankParam.getSubBankName();
-            if (StringUtils.isEmpty(subBankName)) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.OPENING_BRANCH_CANNOT_EMPTY));
-            }
-
-            // 校验短信验证码
-            String message = iApiAliSmsService.checkCode(null, verificationCode, null, pkMember);
-            if (null != message) {
-                return AjaxResult.error(message);
-            }
-            //银行卡号去空格
-            String cardNumber = cuMemberBankParam.getCardNumber();
-            cuMemberBankParam.setCardNumber(StringUtils.deleteWhitespace(cardNumber));
-        }
-        cuMemberBankParam.setPkCountry(pkCountry);
-        cuMemberBankParam.setPkMember(pkMember);
-        return toAjax(iCuMemberBankService.saveMemberBank(cuMemberBankParam));
-    }
-
     @GetMapping("/list")
     public AjaxResult getBankCardList() {
         Long pkMember = SecurityUtils.getUserId();
@@ -159,6 +51,120 @@ public class ApiCuMemberBankController extends BaseController {
         return AjaxResult.success(iCuMemberBankService.selectBankCardByPkMember(pkMember, pkCountry));
     }
 
+    /**
+     * 银行卡四要素验证
+     */
+    @PostMapping("/verify-bank-card")
+    public AjaxResult verifyBankCard(@RequestBody CuMemberBankParam memberBankParam) {
+        if (StringUtils.isEmpty(memberBankParam.getCardNumber())) {
+            return AjaxResult.error("银行卡号不能为空！");
+        }
+        if (StringUtils.isEmpty(memberBankParam.getIdCard())) {
+            return AjaxResult.error("身份证号码不能为空！");
+        }
+        if (StringUtils.isEmpty(memberBankParam.getAccountName())) {
+            return AjaxResult.error("开户姓名不能为空！");
+        }
+        if (StringUtils.isEmpty(memberBankParam.getPhone())) {
+            return AjaxResult.error("手机号不能为空！");
+        }
+
+        BankCardParam bankCard = BankCardParam.builder()
+                .name(memberBankParam.getAccountName())
+                .idCard(memberBankParam.getIdCard())
+                .mobile(memberBankParam.getPhone())
+                .bankCard(StringUtils.deleteWhitespace(memberBankParam.getCardNumber()))
+                .build();
+        R<?> result = iBankCardServiceApi.verifyBankCard(bankCard);
+        return result.isSuccess() ? AjaxResult.success() : AjaxResult.error(result.getMsg());
+    }
+
+    /**
+     * 绑定银行卡
+     */
+    @RepeatSubmitSimple
+    @PostMapping("/add")
+    public AjaxResult addBankInfo(@RequestBody CuMemberBankParam cuMemberBankParam) {
+        Integer pkCountry = SecurityUtils.getPkCountry();
+        Long pkMember = SecurityUtils.getUserId();
+
+        if (null == cuMemberBankParam.getPkBank()) {
+            return AjaxResult.error("银行名称不能为空");
+        }
+        if (StringUtils.isEmpty(cuMemberBankParam.getSubBankName())) {
+            return AjaxResult.error("开户支行不能为空");
+        }
+        if (StringUtils.isEmpty(cuMemberBankParam.getCardNumber())) {
+            return AjaxResult.error("银行卡号不能为空！");
+        }
+        if (StringUtils.isEmpty(cuMemberBankParam.getAccountName())) {
+            return AjaxResult.error("开户姓名不能为空！");
+        }
+        if (StringUtils.isEmpty(cuMemberBankParam.getIdCard())) {
+            return AjaxResult.error("证件号码不能为空！");
+        }
+        if (StringUtils.isEmpty(cuMemberBankParam.getPhone())) {
+            return AjaxResult.error("联系方式不能为空！");
+        }
+        String verificationCode = cuMemberBankParam.getVerificationCode();
+        if (StringUtils.isEmpty(verificationCode)) {
+            return AjaxResult.error("验证码不能为空！");
+        }
+        String message = iApiAliSmsService.checkCode(cuMemberBankParam.getPhone(), verificationCode, null, pkMember);
+        if (null != message) {
+            return AjaxResult.error(message);
+        }
+
+        // 银行卡号去空格
+        String cardNumber = cuMemberBankParam.getCardNumber();
+        cuMemberBankParam.setCardNumber(StringUtils.deleteWhitespace(cardNumber));
+        cuMemberBankParam.setPkCountry(pkCountry);
+        cuMemberBankParam.setPkMember(pkMember);
+        return toAjax(iCuMemberBankService.saveMemberBank(cuMemberBankParam));
+    }
+
+    /**
+     * 解绑银行卡
+     */
+    @GetMapping("/unbind-bank")
+    public AjaxResult unbindBank(Long pkId) {
+        Assert.notNull(pkId, "银行卡号不能为空！");
+        Integer pkCountry = SecurityUtils.getPkCountry();
+        Long pkMember = SecurityUtils.getUserId();
+        // 查询默认银行卡
+        CuMemberBankVO cuMemberBankVO = iCuMemberBankService.selectCuMemberBankById(pkId);
+        // 解绑默认银行卡需校验是否有进行的提现
+        if (null != cuMemberBankVO) {
+            List<Long> pkIds = iCuMemberWithdrawService.selectWithdrawMember(pkCountry, pkMember);
+            if (CollUtil.isNotEmpty(pkIds)) {
+                return AjaxResult.error("提现正在审批中，请稍后再试");
+            }
+        }
+        return AjaxResult.success(iCuMemberBankService.unbindBank(pkId, pkMember));
+    }
+
+    /**
+     * 修改默认银行卡
+     */
+    @GetMapping("/update-default")
+    public AjaxResult updateDefault(Long pkId) {
+        Long pkMember = SecurityUtils.getUserId();
+        Integer pkCountry = SecurityUtils.getPkCountry();
+        // 查询银行卡
+        CuMemberBank cuMemberBank = iCuMemberBankService.getById(pkId);
+        // 解绑默认银行卡需校验是否有进行的提现
+        if (null != cuMemberBank) {
+            List<Long> pkIds = iCuMemberWithdrawService.selectWithdrawMember(pkCountry, pkMember);
+            if (CollUtil.isNotEmpty(pkIds)) {
+                return AjaxResult.error("提现正在审批中，请稍后再试");
+            }
+        }
+        return toAjax(iCuMemberBankService.updateDefault(pkId, pkMember, pkCountry));
+    }
+
+    /**
+     * 默认银行卡
+     */
     @GetMapping("/default-bank")
     public AjaxResult getDefaultBankCard() {
         Long pkMember = SecurityUtils.getUserId();
@@ -166,49 +172,4 @@ public class ApiCuMemberBankController extends BaseController {
         return AjaxResult.success(iCuMemberBankService.isBindBank(pkMember, pkCountry));
     }
 
-    /**
-     * 修改默认银行卡
-     *
-     * @param pkId ID
-     * @return AjaxResult
-     */
-    @GetMapping("/update-default")
-    public AjaxResult updateDefault(Long pkId) {
-        Long pkMember = SecurityUtils.getUserId();
-        Integer pkCountry = SecurityUtils.getPkCountry();
-        //查询银行卡
-        CuMemberBank cuMemberBank = iCuMemberBankService.getById(pkId);
-        //解绑默认银行卡需校验是否有进行的提现
-        if (null != cuMemberBank) {
-            List<Long> pkIds = iCuMemberWithdrawService.selectWithdrawMember(pkCountry, pkMember);
-            if (CollUtil.isNotEmpty(pkIds)) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.WITHDRAWAL_APPROVAL));
-            }
-        }
-        return toAjax(iCuMemberBankService.updateDefault(pkId, pkMember, pkCountry));
-    }
-
-    /**
-     * 查询是否设置提现白名单
-     *
-     * @return AjaxResult
-     */
-    @GetMapping("/is-white-list")
-    public AjaxResult isWhiteList() {
-        String flag = getConfigWhite(SecurityUtils.getPkCountry(), SecurityUtils.getUserId());
-        return AjaxResult.success().put("flag", flag);
-    }
-
-    /**
-     * 查询提现白名单配置
-     *
-     * @param pkCountry 国家ID
-     * @param pkMember  会员ID
-     * @return String
-     */
-    private String getConfigWhite(Integer pkCountry, Long pkMember) {
-        BdTradeWhiteConfig bdTradeWhiteConfig = iCuMemberBaseService.selectConfigWhite(pkMember, pkCountry, EBusinessModule.WITHDRAWAL.getValue());
-        return null == bdTradeWhiteConfig ? EYesNo.NO.getValue() : EYesNo.YES.getValue();
-    }
-
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java

@@ -180,7 +180,6 @@ public class ApiCuMemberTransferController extends BaseController {
         return iCuMemberServiceLogService.selectServiceValue(log);
     }
 
-
     /**
      * 用户转账
      *
@@ -338,11 +337,17 @@ public class ApiCuMemberTransferController extends BaseController {
         //转入币种ID（从配置中获取）
         Integer toPkAccount = iAccountServiceApi.getPkAccount(pkAccount).getData();
 
-        CuMemberTransfer cuMemberTransfer = CuMemberTransfer.builder().pkMember(pkMember)
-                .pkAccount(pkAccount).transferCode(code).toPkMember(toPkMember)
-                .pkToAccount(toPkAccount).pkRate(currencyDTO.getPkId())
-                .transferMoney(transferMoney).remarks(cuMemberTransferParam.getRemarks())
-                .serviceCharge(serviceRatio).issuedAmount(issuedAmount)
+        CuMemberTransfer cuMemberTransfer = CuMemberTransfer.builder()
+                .pkMember(pkMember)
+                .pkAccount(pkAccount)
+                .transferCode(code)
+                .toPkMember(toPkMember)
+                .pkToAccount(toPkAccount)
+                .pkRate(currencyDTO.getPkId())
+                .transferMoney(transferMoney)
+                .remarks(cuMemberTransferParam.getRemarks())
+                .serviceCharge(serviceRatio)
+                .issuedAmount(issuedAmount)
                 .build();
         cuMemberTransfer.setPkCountry(pkCountry);
         cuMemberTransfer.setPkCreator(pkMember);
@@ -350,7 +355,6 @@ public class ApiCuMemberTransferController extends BaseController {
         return toAjax(iCuMemberTransferService.saveMemberTransferInfo(cuMemberTransfer, cuMemberAccount, toMemberAccount));
     }
 
-
     /**
      * 判断是否走血缘
      *

bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWithdrawController.java

@@ -25,6 +25,7 @@ import com.hzs.member.account.service.ICuMemberAccountService;
 import com.hzs.member.account.service.ICuMemberBankService;
 import com.hzs.member.account.service.ICuMemberBaseService;
 import com.hzs.member.account.service.ICuMemberWithdrawService;
+import com.hzs.member.account.vo.CuMemberBankVO;
 import com.hzs.member.account.vo.CuMemberWithdrawVO;
 import com.hzs.member.account.vo.CuMemberWithdrawalAddVO;
 import com.hzs.member.base.service.ICuMemberService;
@@ -64,23 +65,21 @@ public class ApiCuMemberWithdrawController extends BaseController {
 
     /**
      * 提现时展示信息
-     *
-     * @return AjaxResult
      */
     @GetMapping("/show/add")
     public AjaxResult showAddWithdrawInfo(Integer pkAccount, BigDecimal cashAmount) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         Long pkMember = SecurityUtils.getUserId();
         if (null == pkAccount) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_WITHDRAWAL_ACCOUNT));
+            return AjaxResult.error("请选择提现账户");
         }
         if (null == cashAmount) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.ENTER_WITHDRAWAL_AMOUNT));
+            return AjaxResult.error("请输入提现金额");
         }
         //提现配置信息
         BdWithdrawal bdWithdrawal = iWithdrawalServiceApi.queryWithdrawal(pkCountry, pkAccount).getData();
         if (null == bdWithdrawal) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.CONFIGURE_WITHDRAWAL_INFO));
+            return AjaxResult.error("请配置提现信息");
         }
         CuMemberAccount cuMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
         Integer accountValue = iCuMemberBaseService.getAccountValueById(pkAccount);
@@ -92,83 +91,89 @@ public class ApiCuMemberWithdrawController extends BaseController {
         BigDecimal serviceChargeAmount = accountValue.equals(EAccount.BONUS.getValue()) ? iCuMemberWithdrawService.computeServiceCharge(pkCountry, cashAmount) : BigDecimal.ZERO;
 
         CuMemberWithdrawalAddVO cuMemberWithdrawalAddVO = CuMemberWithdrawalAddVO.builder()
-                .minAmount(bdWithdrawal.getMinAmount()).maxAmount(bdWithdrawal.getMaxAmount())
-                .amount(availableBalance).balance(balance).srviceCharge(serviceChargeAmount).build();
+                .minAmount(bdWithdrawal.getMinAmount())
+                .maxAmount(bdWithdrawal.getMaxAmount())
+                .amount(availableBalance)
+                .balance(balance)
+                .srviceCharge(serviceChargeAmount)
+                .build();
         return AjaxResult.success(cuMemberWithdrawalAddVO);
     }
 
     /**
      * 用户提现
      * 提现时先扣账户的钱，撤销时返回账户的钱
-     *
-     * @param cuMemberWithdrawParam 提现入参
-     * @return AjaxResult
      */
-    @PostMapping("/add")
     @RepeatSubmitSimple
+    @PostMapping("/add")
     public AjaxResult addWithdrawInfo(@RequestBody CuMemberWithdrawParam cuMemberWithdrawParam) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         Long pkMember = SecurityUtils.getUserId();
         String memberCode = SecurityUtils.getMemberCode();
-
-        CuMemberExt cuMemberLoginExt = iCuMemberService.getMemberByCode(memberCode);
-        if (null == cuMemberLoginExt) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.RECHAGER_USER_NOT_EXIST));
+        // 提现金额
+        BigDecimal cashAmount = cuMemberWithdrawParam.getCashAmount();
+        if (null == cashAmount) {
+            return AjaxResult.error("请输入提现金额");
         }
-        //获取银行卡信息
-//        Long pkBank = cuMemberWithdrawParam.getPkBank();
-//        CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank);
-//        if (null == memberBank) {
-//            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.BIND_BANK_CARD));
-//        }
-        //校验支付密码
-        String payPwd = cuMemberLoginExt.getPayPwd();
-        if (StringUtils.isEmpty(payPwd) || !SecurityUtils.matchesPassword(cuMemberWithdrawParam.getPayPwd(), payPwd)) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.PAYMENT_PASSWORD_ERROR));
-        }
-
         //查询提现账户
         Integer pkAccount = cuMemberWithdrawParam.getPkAccount();
         if (null == pkAccount) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_WITHDRAWAL_ACCOUNT));
+            return AjaxResult.error("请选择提现账户");
         }
+
+        CuMemberExt cuMemberLoginExt = iCuMemberService.getMemberById(pkMember);
+        if (null == cuMemberLoginExt) {
+            return AjaxResult.error("会员不存在，请核对后再操作!");
+        }
+        //获取银行卡信息
+        Long pkBank = cuMemberWithdrawParam.getPkBank();
+        CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank);
+        if (null == memberBank) {
+            return AjaxResult.error("请绑定银行卡");
+        }
+        //校验支付密码
+        String payPwd = cuMemberLoginExt.getPayPwd();
+        if (StringUtils.isEmpty(payPwd) || !SecurityUtils.matchesPassword(cuMemberWithdrawParam.getPayPwd(), payPwd)) {
+            return AjaxResult.error("支付密码错误！");
+        }
+
         Integer accountsType = iCuMemberBaseService.getAccountValueById(pkAccount);
 
-        if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            Integer expireStatus = cuMemberLoginExt.getExpireStatus();
-            //休止期的会员奖金账户不允许提现
-            Boolean restPeriodStatus = iCuMemberBaseService.restPeriodMemberUserWallet(pkMember, expireStatus, accountsType);
-            if (restPeriodStatus) {
-                return AjaxResult.error(FinanceMsgConstants.REST_PERIOD_NOT_WITHDRAWAL);
-            }
-            //已终止会员不允许提现
-            if (expireStatus.equals(EExpireStatus.TERMINATED.getValue())) {
-                return AjaxResult.error(FinanceMsgConstants.TERMINATED_NOT_WITHDRAWAL);
-            }
-
-            //结算等级为1 (目前是会员)不允许提现
-            GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), pkCountry).getData();
-            if (cuMemberLoginExt.getPkSettleGrade().equals(gradeDTO.getPkId())) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.NOT_WITHDRAWAL_UPGRADE));
-            }
-            //校验是否实名
-            Boolean existRealName = iCuMemberBaseService.isExistRealName(pkMember, pkCountry, EBusinessModule.WITHDRAWAL.getValue());
-            if (!existRealName) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.REAL_NAME_NOT_EXIST));
-            }
-            //校验实名认证的真实姓名与营业执照的法人姓名是否一致
-/*            Boolean result = iCuMemberBaseService.verificationRealNameAndLicense(pkMember, pkCountry);
-            if (!result) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.REAL_NAME_LICENSE_NOT_SAME));
-            }*/
+        Integer expireStatus = cuMemberLoginExt.getExpireStatus();
+        //休止期的会员奖金账户不允许提现
+        Boolean restPeriodStatus = iCuMemberBaseService.restPeriodMemberUserWallet(pkMember, expireStatus, accountsType);
+        if (restPeriodStatus) {
+            return AjaxResult.error("休止期的会员奖金账户不允许提现");
         }
+        //已终止会员不允许提现
+        if (expireStatus.equals(EExpireStatus.TERMINATED.getValue())) {
+            return AjaxResult.error("已终止会员不允许提现");
+        }
+
+        // 结算等级为1 (目前是会员)不允许提现
+        GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), pkCountry).getData();
+        if (cuMemberLoginExt.getPkSettleGrade().equals(gradeDTO.getPkId())) {
+            return AjaxResult.error("暂时不请允许提现，请先升级");
+        }
+        // 校验是否实名
+        Boolean existRealName = iCuMemberBaseService.isExistRealName(pkMember, pkCountry, EBusinessModule.WITHDRAWAL.getValue());
+        if (!existRealName) {
+            return AjaxResult.error("请先实名认证");
+        }
+//        //校验实名认证的真实姓名与营业执照的法人姓名是否一致
+//        Boolean result = iCuMemberBaseService.verificationRealNameAndLicense(pkMember, pkCountry);
+//        if (!result) {
+//            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.REAL_NAME_LICENSE_NOT_SAME));
+//        }
+
+
         //查询账户信息
         CuMemberAccount cuMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
         //是否可提现
         Integer isWithdraw = cuMemberAccount.getIsWithdraw();
         //不允许提现
         if (isWithdraw.equals(EYesNo.NO.getIntValue())) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.NOT_ALLOWED_WITHDRAWAL));
+            return AjaxResult.error("不允许提现");
         }
         //提现配置信息
         BdWithdrawal bdWithdrawal = iWithdrawalServiceApi.queryWithdrawal(pkCountry, pkAccount).getData();
@@ -177,34 +182,29 @@ public class ApiCuMemberWithdrawController extends BaseController {
         // 只能发起配置项次数待审核提现 必须通过或者驳回之后才能发起下一笔
         List<CuMemberWithdraw> memberWithdraws = iCuMemberWithdrawService.getWithdrawTimes(pkMember);
         if (CollUtil.isNotEmpty(memberWithdraws) && memberWithdraws.size() >= withdrawalNumber) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.EXCEEDING_WITHDRAWALS_NUMBER));
+            return AjaxResult.error("超过提现次数");
         }
         //提现金额校验
         BigDecimal minAmount = bdWithdrawal.getMinAmount();
         BigDecimal maxAmount = bdWithdrawal.getMaxAmount();
         if (null == minAmount || null == maxAmount) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.CONFIGURE_WITHDRAWAL_AMOUNT_LIMIT));
-        }
-        // 提现金额
-        BigDecimal cashAmount = cuMemberWithdrawParam.getCashAmount();
-        if (null == cashAmount) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.ENTER_WITHDRAWAL_AMOUNT));
+            return AjaxResult.error("请配置提现金额限制");
         }
         //提现金额是否输入整数值
         Integer isRounding = bdWithdrawal.getIsRounding();
         if (isRounding.equals(EYesNo.YES.getIntValue()) && Boolean.TRUE.equals(!isIntegerValue(cashAmount))) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.ENTER_INTEGER_VALUE));
+            return AjaxResult.error("请输入整数值");
         }
 
         if (cashAmount.compareTo(minAmount) < 0) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.WITHDRAWAL_AMOUNT_GREATER_MINIMUM_AMOUNT));
+            return AjaxResult.error("提现金额必须大于最低提现金额");
         }
         if (cashAmount.compareTo(maxAmount) > 0) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.WITHDRAWAL_AMOUNT_LESS_MAXIMUM_AMOUNT));
+            return AjaxResult.error("提现金额必须小于最高提现金额");
         }
         //校验倍数
-        if (pkCountry.equals(CountryConstants.CHINA_COUNTRY) && !remainder(cashAmount)) {
-            return AjaxResult.error(FinanceMsgConstants.WITHDRAW_AMOUNT_MULTIPLE);
+        if (!remainder(cashAmount)) {
+            return AjaxResult.error("提现金额必须为100的整数倍");
         }
         //本次应缴个税
         BigDecimal payIncomeTax = BigDecimal.ZERO;
@@ -221,7 +221,7 @@ public class ApiCuMemberWithdrawController extends BaseController {
             BigDecimal balance = getAvailableBalance(accountsType, cuMemberAccount);
             //余额不足
             if (balance.compareTo(cashAmount) < 0 || accountBalance.compareTo(cashAmount) < 0) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.BALANCE_NOT_ENOUGH));
+                return AjaxResult.error("余额不足");
             }
             //奖金账户个税、手续费根据配置、其它用户暂不收取
             //本次应缴个税
@@ -229,11 +229,12 @@ public class ApiCuMemberWithdrawController extends BaseController {
             //手续费金额
             serviceChargeAmount = iCuMemberWithdrawService.computeServiceCharge(pkCountry, cashAmount);
             issuedAmount = cashAmount.subtract(payIncomeTax).subtract(serviceChargeAmount);
-        } else { //其它用户的余额
+        } else {
+            //其它用户的余额
             BigDecimal balance = getAvailableBalance(accountsType, cuMemberAccount);
             //余额不足
             if (balance.compareTo(cashAmount) < 0) {
-                return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.BALANCE_NOT_ENOUGH));
+                return AjaxResult.error("余额不足");
             }
 
         }
@@ -242,11 +243,16 @@ public class ApiCuMemberWithdrawController extends BaseController {
         CurrencyDTO currencyDTO = iCuMemberBaseService.getCurrency(pkCountry);
 
         CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder().pkMember(pkMember)
-//                .pkAccount(pkAccount).pkBank(pkBank).remarks(cuMemberWithdrawParam.getRemarks())
-                .pkAccount(pkAccount).pkBank(0L).remarks(cuMemberWithdrawParam.getRemarks())
-                .pkRate(currencyDTO.getPkId()).cashAmount(cashAmount)
-                .serviceCharge(serviceChargeAmount).incomeTax(payIncomeTax)
-                .issuedAmount(issuedAmount).withdrawCode(code).build();
+                .pkAccount(pkAccount)
+                .pkBank(pkBank)
+                .remarks(cuMemberWithdrawParam.getRemarks())
+                .pkRate(currencyDTO.getPkId())
+                .cashAmount(cashAmount)
+                .serviceCharge(serviceChargeAmount)
+                .incomeTax(payIncomeTax)
+                .issuedAmount(issuedAmount)
+                .withdrawCode(code)
+                .build();
         cuMemberWithdraw.setApproveState(EApproveStatus.WAIT_SUBMIT.getValue());
         cuMemberWithdraw.setDelFlag(EDelFlag.UN_DELETE.getValue());
         cuMemberWithdraw.setPkCountry(pkCountry);

bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberWithdrawController.java

@@ -35,30 +35,23 @@ import java.util.*;
 
 /**
  * 会员提现表 前端控制器
- *
- * @author hzs
- * @since 2022-09-06
  */
 @RestController
 @RequestMapping("/manager/withdraw")
 public class CuMemberWithdrawController extends BaseController {
 
-
     @Autowired
     private UserTokenService userTokenService;
+    @Autowired
+    private ICuMemberBaseService iCuMemberBaseService;
+    @Autowired
+    private ICuMemberWithdrawService iCuMemberWithdrawService;
 
     @Autowired
-    private ICuMemberBaseService baseService;
-
-    @Autowired
-    ICuMemberWithdrawService cuMemberWithdrawService;
-
-    @Autowired
-    ITransactionCommonService iTransactionCommonService;
+    private ITransactionCommonService iTransactionCommonService;
 
     @DubboReference
-    IMenuColumnServiceApi menuColumnServiceApi;
-
+    IMenuColumnServiceApi iMenuColumnServiceApi;
 
     /**
      * 发起签呈显示
@@ -72,11 +65,11 @@ public class CuMemberWithdrawController extends BaseController {
         if (CollUtil.isEmpty(pkIds)) {
             return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_INITIATING_SIGNATURE_RECORD));
         }
-        List<CuMemberWithdrawVO> cuMemberWithdrawList = cuMemberWithdrawService.checkWithdrawPetitionByState(pkIds, EApproveStatus.WAIT_SUBMIT.getValue());
+        List<CuMemberWithdrawVO> cuMemberWithdrawList = iCuMemberWithdrawService.checkWithdrawPetitionByState(pkIds, EApproveStatus.WAIT_SUBMIT.getValue());
         if (CollUtil.isNotEmpty(cuMemberWithdrawList)) {
             return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECTED_RECORD_DUPLICATE_SIGNATURE_RECORD));
         }
-        return AjaxResult.success(cuMemberWithdrawService.showMemberWithdrawPetition(pkIds, null));
+        return AjaxResult.success(iCuMemberWithdrawService.showMemberWithdrawPetition(pkIds, null));
     }
 
     /**
@@ -91,10 +84,9 @@ public class CuMemberWithdrawController extends BaseController {
         LoginUser loginUser = userTokenService.getLoginUser();
         cuMemberPetitionVO.setLoginUser(loginUser);
         cuMemberPetitionVO.setPkCreat(SecurityUtils.getUserId());
-        return AjaxResult.success(cuMemberWithdrawService.confirmWithdrawPetition(cuMemberPetitionVO));
+        return AjaxResult.success(iCuMemberWithdrawService.confirmWithdrawPetition(cuMemberPetitionVO));
     }
 
-
     /**
      * 查询列表
      *
@@ -116,16 +108,15 @@ public class CuMemberWithdrawController extends BaseController {
             }
         }
         startPage();
-        Object[] objects = cuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO);
+        Object[] objects = iCuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO);
         //处理分页
         TableDataInfo tableDataInfo = getDataTable((List<CuMemberWithdrawExt>) objects[0]);
         tableDataInfo.setRows((List<CuMemberWithdrawVO>) objects[1]);
         return tableDataInfo;
     }
 
-
     /**
-     * 充值明细列表导出
+     * 明细列表导出
      *
      * @param response           入参
      * @param cuMemberWithdrawVO 查询入参
@@ -135,18 +126,18 @@ public class CuMemberWithdrawController extends BaseController {
     public void export(HttpServletResponse response, CuMemberWithdrawVO cuMemberWithdrawVO) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         cuMemberWithdrawVO.setPkCountry(pkCountry);
-        List<CuMemberWithdrawVO> cuMemberWithdrawList = (List<CuMemberWithdrawVO>) cuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO)[1];
+        List<CuMemberWithdrawVO> cuMemberWithdrawList = (List<CuMemberWithdrawVO>) iCuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO)[1];
         //枚举翻译
-        Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values(), EWithdrawStatus.values());
+        Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values());
         if (CollUtil.isNotEmpty(cuMemberWithdrawList)) {
             for (CuMemberWithdrawVO memberWithdraw : cuMemberWithdrawList) {
                 Integer pkAccount = memberWithdraw.getPkAccount();
-                memberWithdraw.setPkAccountVal(baseService.getAccountTranslateFromDataBase(pkAccount));
+                memberWithdraw.setPkAccountVal(iCuMemberBaseService.getAccountTranslateFromDataBase(pkAccount));
                 memberWithdraw.setApproveStateVal(transactionMap.get(EnumsPrefixConstants.APPROVE_STATUS + memberWithdraw.getApproveState()));
-                memberWithdraw.setStatusVal(transactionMap.get(EnumsPrefixConstants.ENU_WITHDRAW_STATUS + memberWithdraw.getStatus()));
+                memberWithdraw.setStatusVal(EWithdrawStatus.getLabelByValue(memberWithdraw.getStatus()));
             }
         }
-        ExcelUtil<CuMemberWithdrawVO> util = new ExcelUtil<>(CuMemberWithdrawVO.class, menuColumnServiceApi.queryMenuColumn("CashDetails", SecurityUtils.getUserId()).getData());
+        ExcelUtil<CuMemberWithdrawVO> util = new ExcelUtil<>(CuMemberWithdrawVO.class, iMenuColumnServiceApi.queryMenuColumn("CashDetails", SecurityUtils.getUserId()).getData());
         util.exportExcel(response, cuMemberWithdrawList, TransactionUtils.getContent(FinanceMsgConstants.WITHDRAWAL_DETAILS_EXPORT));
     }
 
@@ -160,11 +151,10 @@ public class CuMemberWithdrawController extends BaseController {
     @GetMapping("/details")
     public AjaxResult findWithdrawDetails(Long pkId) {
         Assert.notNull(pkId, TransactionUtils.getContent(FinanceMsgConstants.SELECT_WITHDRAWAL_RECORD));
-        CuMemberWithdrawVO cuMemberRechargeDetailVO = cuMemberWithdrawService.queryCuMemberWithdrawDetail(pkId);
+        CuMemberWithdrawVO cuMemberRechargeDetailVO = iCuMemberWithdrawService.queryCuMemberWithdrawDetail(pkId);
         return AjaxResult.success(cuMemberRechargeDetailVO);
     }
 
-
     /**
      * 打款
      *
@@ -176,7 +166,7 @@ public class CuMemberWithdrawController extends BaseController {
     public AjaxResult withdrawPayment(@RequestBody CuMemberWithdrawVO memberWithdrawVO) {
         List<Long> pkIds = memberWithdrawVO.getPkIds();
         Assert.notNull(pkIds, TransactionUtils.getContent(FinanceMsgConstants.SELECT_PAID_RECORD));
-        List<CuMemberWithdraw> withdrawApproveStateByIds = cuMemberWithdrawService.getWithdrawApproveStateByIds(pkIds, EApproveStatus.FINISH.getValue());
+        List<CuMemberWithdraw> withdrawApproveStateByIds = iCuMemberWithdrawService.getWithdrawApproveStateByIds(pkIds, EApproveStatus.FINISH.getValue());
         if (CollUtil.isNotEmpty(withdrawApproveStateByIds)) {
             return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.DATA_UNAPPROVED_DATA));
         }
@@ -186,10 +176,9 @@ public class CuMemberWithdrawController extends BaseController {
         memberWithdrawVO.setPayer(pkMember);
         memberWithdrawVO.setPaymentTime(new Date());
         memberWithdrawVO.setPkModified(pkMember);
-        return toAjax(cuMemberWithdrawService.withdrawPaymentByPkId(memberWithdrawVO));
+        return toAjax(iCuMemberWithdrawService.withdrawPaymentByPkId(memberWithdrawVO));
     }
 
-
     /**
      * 打款充正
      *
@@ -205,13 +194,13 @@ public class CuMemberWithdrawController extends BaseController {
         memberWithdrawVO.setPayer(SecurityUtils.getUserId());
         memberWithdrawVO.setPayerRemarks(memberWithdrawVO.getPayerRemarks());
         memberWithdrawVO.setPaymentTime(new Date());
-        return toAjax(cuMemberWithdrawService.withdrawPaymentPositiveByPkId(memberWithdrawVO));
+        return toAjax(iCuMemberWithdrawService.withdrawPaymentPositiveByPkId(memberWithdrawVO));
     }
 
     @Log(module = EOperationModule.WITHDRAWAL_DETAIL, business = EOperationBusiness.WITHDRAWAL_DETAIL, method = EOperationMethod.REJECT)
     @PostMapping("/reject")
     public AjaxResult reject(@RequestBody CuMemberWithdrawRejectParam param) {
-        cuMemberWithdrawService.withdrawReject(param);
+        iCuMemberWithdrawService.withdrawReject(param);
         return AjaxResult.success();
     }
 

bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberWithdrawParam.java

@@ -8,13 +8,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * @Description: 提现参数类
- * @Author: ljc
- * @Time: 2022/9/27 15:32
- * @Classname: CuMemberWithdrawParam
- * @Package_name: com.hzs.member.account.param
+ * 提现参数类
  */
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

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

@@ -14,6 +14,7 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -268,4 +269,5 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
      */
     CuMemberAccountExt queryAccountSummaryByVertex(@Param("pkVertex") Long pkVertex, @Param("pkCountry") Integer pkCountry);
 
+    void deleteCuMemberAccountByMemberCode(@Param("userId") Long userId, @Param("date")Date date, @Param("memberCode")String memberCode);
 }

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

@@ -9,9 +9,6 @@ import java.util.List;
 
 /**
  * 会员信息-银行卡信息 Mapper 接口
- *
- * @author hzs
- * @since 2022-08-31
  */
 public interface CuMemberBankMapper extends BaseMapper<CuMemberBank> {
 

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

@@ -26,8 +26,6 @@ public interface CuMemberWithdrawMapper extends BaseMapper<CuMemberWithdraw> {
     List<CuMemberWithdraw> getWithdrawTimes(@Param("pkMember") Long pkMember);
 
 
-    List<CuMemberWithdrawExt> getWithdrawTimesByPkCountry(@Param("pkCountry") Integer pkCountry);
-
     /**
      * 按周期查询个税
      *

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

@@ -331,4 +331,5 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
      */
     CuMemberAccountExt queryAccountSummaryByVertex(Long pkVertex, Integer pkCountry);
 
+    void deleteCuMemberAccountByMemberCode(Long userId, Date date, String memberCode);
 }

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

@@ -72,7 +72,6 @@ public interface ICuMemberTransferService extends IService<CuMemberTransfer> {
      */
     BdTransfer getBdTransfer(Integer pkCountry);
 
-
     /**
      * 保存转账
      *

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

@@ -110,15 +110,6 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
      */
     BigDecimal computeServiceCharge(Integer pkCountry, BigDecimal cashAmount);
 
-    /**
-     * 获取取整后的金额
-     *
-     * @param bdWithdrawal 提现配置信息
-     * @param cashAmount   提现金额
-     * @return BigDecimal
-     */
-    BigDecimal computeRounding(BdWithdrawal bdWithdrawal, BigDecimal cashAmount);
-
     /**
      * 获取账户余额
      *

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

@@ -841,5 +841,10 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
         return baseMapper.queryAccountSummaryByVertex(pkVertex, pkCountry);
     }
 
+    @Override
+    public void deleteCuMemberAccountByMemberCode(Long userId, Date date, String memberCode) {
+        baseMapper.deleteCuMemberAccountByMemberCode(userId,date,memberCode);
+    }
+
 }
 

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

@@ -72,29 +72,20 @@ public class CuMemberBankServiceImpl extends ServiceImpl<CuMemberBankMapper, CuM
         return BeanUtil.copyToList(baseMapper.selectBankCardByPkMember(pkMember, pkCountry), CuMemberBankVO.class);
     }
 
-    @Override
     @Transactional(rollbackFor = Exception.class)
+    @Override
     public Boolean updateDefault(Long pkId, Long pkMember, Integer pkCountry) {
-        updateMemberBankCardToDefault(pkMember, pkCountry);
-        LambdaUpdateWrapper<CuMemberBank> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set(CuMemberBank::getDefaultCard, EBankCardStatus.YES.getValue()).eq(CuMemberBank::getPkId, pkId);
-        return update(updateWrapper);
-    }
-
-    /**
-     * 绑定的银行卡更新为非默认
-     *
-     * @param pkMember  会员ID
-     * @param pkCountry 国家ID
-     * @return Boolean
-     */
-    public Boolean updateMemberBankCardToDefault(Long pkMember, Integer pkCountry) {
         LambdaUpdateWrapper<CuMemberBank> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(CuMemberBank::getDefaultCard, EBankCardStatus.NO.getValue())
                 .eq(CuMemberBank::getDefaultCard, EBankCardStatus.YES.getValue())
                 .eq(CuMemberBank::getPkMember, pkMember)
                 .eq(CuMemberBank::getPkCountry, pkCountry);
-        return update(updateWrapper);
+        update(updateWrapper);
+
+        LambdaUpdateWrapper<CuMemberBank> newUpdateWrapper = new LambdaUpdateWrapper<>();
+        newUpdateWrapper.set(CuMemberBank::getDefaultCard, EBankCardStatus.YES.getValue())
+                .eq(CuMemberBank::getPkId, pkId);
+        return update(newUpdateWrapper);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.constant.msg.FinanceMsgConstants;
 import com.hzs.common.core.enums.*;
+import com.hzs.common.core.exception.ServiceException;
 import com.hzs.common.core.utils.CommonUtil;
 import com.hzs.common.domain.member.account.CuMemberAccount;
 import com.hzs.common.domain.member.account.CuMemberTrade;
@@ -65,7 +66,6 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return iTransferServiceApi.queryTransfer(pkCountry).getData();
     }
 
-
     @Override
     public Boolean isBloodKinshipOnUmbrella(Long pkMember, Long toPkMember) {
         //查找血缘伞上，推荐人
@@ -108,9 +108,16 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Integer saveMemberTransferInfo(CuMemberTransfer cuMemberTransfer, CuMemberAccount cuMemberAccount, CuMemberAccount toMemberAccount) {
-        Integer row = baseMapper.insert(cuMemberTransfer);
-        this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_OUT.getValue());
-        this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_IN.getValue());
+        int row = baseMapper.insert(cuMemberTransfer);
+        if (row == 0) {
+            throw new ServiceException("转账失败，请确认后重试");
+        }
+        if (this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_OUT.getValue()) == 0) {
+            throw new ServiceException("转账失败，请确认后重试");
+        }
+        if (this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_IN.getValue()) == 0) {
+            throw new ServiceException("转账失败，请确认后重试");
+        }
         ChargingBonusDetail(cuMemberTransfer, cuMemberAccount, toMemberAccount);
         return row;
     }
@@ -160,7 +167,6 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         }
     }
 
-
     /**
      * 更新交易流水和余额
      *
@@ -185,9 +191,13 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         BigDecimal amount = type == (ETransferType.TRANSFER_OUT.getValue()) ? transferMoney.negate() : transferMoney;
         Integer pkAccountValue = iCuMemberBaseService.getAccountValueById(pkAccount);
 
-        CuMemberAccountParam param = CuMemberAccountParam.builder().pkMember(memberId)
-                .accountType(pkAccountValue).amount(amount).pkModified(cuMemberTransfer.getPkCreator())
-                .accountClassify(ETradeClassify.TRANSFER.getValue()).pkCountry(cuMemberTransfer.getPkCountry())
+        CuMemberAccountParam param = CuMemberAccountParam.builder()
+                .pkMember(memberId)
+                .accountType(pkAccountValue)
+                .amount(amount)
+                .pkModified(cuMemberTransfer.getPkCreator())
+                .accountClassify(ETradeClassify.TRANSFER.getValue())
+                .pkCountry(cuMemberTransfer.getPkCountry())
                 .transferType(type).build();
 
         return iCuMemberAccountService.updateMemberAccountByMemberCode(param);
@@ -229,7 +239,6 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return memberTrade;
     }
 
-
     /**
      * 构造转入方交易明细
      *
@@ -294,7 +303,6 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return remarks.toString();
     }
 
-
     @Override
     public Object[] selectMemberTransferList(CuMemberTransferVO cuMemberTransferVO) {
         CuMemberTransferVO memberTransferVO;
@@ -311,7 +319,6 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return new Object[]{cuMemberTransferExts, cuMemberTransferVOS};
     }
 
-
     /**
      * 页面显示公用参数
      *
@@ -347,4 +354,3 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
     }
 
 }
-

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

@@ -60,8 +60,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
     private ICuMemberAccountService iCuMemberAccountService;
     @Autowired
     private ICuMemberBaseService iCuMemberBaseService;
-    @Autowired
-    private ICuMemberTradeService cuMemberTradeService;
 
     @DubboReference
     IWithdrawalTaxServiceApi iWithdrawalTaxServiceApi;
@@ -110,8 +108,12 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Integer saveMemberWithdrawInfo(CuMemberWithdraw cuMemberWithdraw) {
-        Integer row = baseMapper.insert(cuMemberWithdraw);
-        this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT);
+        int row = baseMapper.insert(cuMemberWithdraw);
+        if (row != 0) {
+            if (this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT) == 0) {
+                throw new ServiceException("提现失败，请确认后重试");
+            }
+        }
         return row;
     }
 
@@ -130,10 +132,15 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
         //提现金额
         BigDecimal cashAmount = cuMemberWithdraw.getCashAmount();
         BigDecimal amount = eMethodType.equals(EOperationMethod.INSERT) ? cashAmount.negate() : cashAmount;
-        CuMemberAccountParam param = CuMemberAccountParam.builder().pkMember(cuMemberWithdraw.getPkMember())
-                .accountType(accountType).amount(amount).pkModified(cuMemberWithdraw.getPkCreator())
-                .accountClassify(ETradeClassify.WITHDRAWAL.getValue()).pkCountry(cuMemberWithdraw.getPkCountry())
-                .transferType(ETransferType.TRANSFER_IN.getValue()).build();
+        CuMemberAccountParam param = CuMemberAccountParam.builder()
+                .pkMember(cuMemberWithdraw.getPkMember())
+                .accountType(accountType)
+                .amount(amount)
+                .pkModified(cuMemberWithdraw.getPkCreator())
+                .accountClassify(ETradeClassify.WITHDRAWAL.getValue())
+                .pkCountry(cuMemberWithdraw.getPkCountry())
+                .transferType(ETransferType.TRANSFER_IN.getValue())
+                .build();
         return iCuMemberAccountService.updateMemberAccountByMemberCode(param);
     }
 
@@ -195,6 +202,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
                 cuMemberWithdrawVO = new CuMemberWithdrawVO();
                 BeanUtils.copyProperties(cuMemberWithdrawExt, cuMemberWithdrawVO);
                 this.setPublicParam(cuMemberWithdrawVO, cuMemberWithdrawExt);
+                cuMemberWithdrawVO.setStatusVal(EWithdrawStatus.getLabelByValue(cuMemberWithdrawVO.getStatus()));
                 cuMemberWithdrawVoS.add(cuMemberWithdrawVO);
             }
             //总计
@@ -204,6 +212,15 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
         return new Object[]{cuMemberWithdrawExts, cuMemberWithdrawVoS};
     }
 
+    @Override
+    public CuMemberWithdrawVO queryCuMemberWithdrawDetail(Long pkId) {
+        CuMemberWithdrawVO memberRechargeDetailVo = new CuMemberWithdrawVO();
+        CuMemberWithdrawExt memberWithdrawExt = baseMapper.queryCuMemberWithdrawDetail(pkId);
+        BeanUtils.copyProperties(memberWithdrawExt, memberRechargeDetailVo);
+        setPublicParam(memberRechargeDetailVo, memberWithdrawExt);
+        return memberRechargeDetailVo;
+    }
+
     /**
      * 页面显示公用参数
      *
@@ -261,15 +278,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
         cuMemberWithdrawVO.setPkAccount(iCuMemberBaseService.translateAccountValue(pkAccount));
     }
 
-    @Override
-    public CuMemberWithdrawVO queryCuMemberWithdrawDetail(Long pkId) {
-        CuMemberWithdrawVO memberRechargeDetailVo = new CuMemberWithdrawVO();
-        CuMemberWithdrawExt memberWithdrawExt = baseMapper.queryCuMemberWithdrawDetail(pkId);
-        BeanUtils.copyProperties(memberWithdrawExt, memberRechargeDetailVo);
-        setPublicParam(memberRechargeDetailVo, memberWithdrawExt);
-        return memberRechargeDetailVo;
-    }
-
     @Override
     public Integer withdrawPaymentByPkId(CuMemberWithdrawVO memberWithdrawVO) {
         CuMemberWithdrawExt cuMemberWithdraw = new CuMemberWithdrawExt();
@@ -386,17 +394,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
         }
     }
 
-    @Override
-    public BigDecimal computeRounding(BdWithdrawal bdWithdrawal, BigDecimal cashAmount) {
-        BigDecimal roundIngAmount = cashAmount;
-        Integer isRounding = bdWithdrawal.getIsRounding();
-        if (isRounding.equals(EYesNo.YES.getIntValue())) {
-            //向下取整
-            roundIngAmount = cashAmount.setScale(0, BigDecimal.ROUND_DOWN);
-        }
-        return roundIngAmount;
-    }
-
     @Override
     public List<CuMemberWithdraw> getWithdrawApproveStateByIds(List<Long> pkIds, Integer approveState) {
         return baseMapper.getWithdrawApproveStateByIds(pkIds, approveState);
@@ -609,7 +606,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
                         .tradeCode(cuMemberWithdraw.getWithdrawCode()).pkCountry(pkCountry)
                         .tradeType(EApprovalBusiness.WITHDRAWAL.getValue())
                         .pkCreator(SecurityUtils.getUserId()).build();
-                cuMemberTradeService.businessCommissionReject(businessCommissionDTO);
+                iCuMemberTradeService.businessCommissionReject(businessCommissionDTO);
             }
         }
     }

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

@@ -13,15 +13,8 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 会员提现表
- * </p>
- *
- * @author hzs
- * @since 2022-09-06
  */
-
-
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Builder
@@ -203,7 +196,6 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
     /**
      * 状态（0=未打款，1=已打款，2=已充正，3=撤消）
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.ENU_WITHDRAW_STATUS)
     private Integer status;
 
     @Excel(name = "打款状态")
@@ -293,7 +285,7 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
     /**
      * 查询状态
      */
-    private  Integer queryStatus;
+    private Integer queryStatus;
 
     /**
      * 会员编号集合

bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java

@@ -168,12 +168,12 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
      *
      * @param settleTable
      * @param pkMember
-     * @param monthTable
+     * @param lastMonthTable
      * @return
      */
     CuMemberAwardsUnderVO queryMemberPv(@Param("settleTable") String settleTable,
                                         @Param("pkMember") Long pkMember,
-                                        @Param("monthTable") String monthTable);
+                                        @Param("lastMonthTable") String lastMonthTable);
 
     /**
      * 查询会员当天业绩

bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java

@@ -147,10 +147,10 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
      *
      * @param settleTable
      * @param pkMember
-     * @param monthTable
+     * @param lastMonthTable
      * @return
      */
-    CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable);
+    CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String lastMonthTable);
 
     /**
      * 查询会员当天业绩

bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java

@@ -369,18 +369,27 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
         if (hasSettle) {
             // 昨日业绩 -- 昨日结算表
             // 历史业绩 -- 昨日结算表
-            // 当月业绩 -- 月业绩表
-            String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
-            // 当月业绩表
-            String monthTable = TableNameConstants.CU_MEMBER_MONTH + month;
-            Integer number = iCuMemberTreeService.queryExistOracleTable(monthTable);
+//            // 当月业绩 -- 月业绩表
+//            String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
+//            // 当月业绩表
+//            String monthTable = TableNameConstants.CU_MEMBER_MONTH + month;
+//            Integer number = iCuMemberTreeService.queryExistOracleTable(monthTable);
+//            if (null == number || number == 0) {
+//                // 月业绩表不存在
+//                monthTable = null;
+//            }
+
+            // 之前月份的最后一期
+            Integer monthLastPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.beforeMonthLastDateStr(new Date())).getPkId();
+            String lastMonthTable = TableNameConstants.CU_MEMBER_SETTLE + monthLastPeriod;
+            Integer number = iCuMemberTreeService.queryExistOracleTable(lastMonthTable);
             if (null == number || number == 0) {
                 // 月业绩表不存在
-                monthTable = null;
+                lastMonthTable = null;
             }
 
             // 查询会员首页业绩显示
-            CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, monthTable);
+            CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, lastMonthTable);
             if (null != awardsUnderVO) {
                 resultVO.setANewPv(null != awardsUnderVO.getANewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getANewPv()) : BigDecimal.ZERO);
                 resultVO.setBNewPv(null != awardsUnderVO.getBNewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getBNewPv()) : BigDecimal.ZERO);

bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java

@@ -147,8 +147,8 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
     }
 
     @Override
-    public CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable) {
-        return baseMapper.queryMemberPv(settleTable, pkMember, monthTable);
+    public CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String lastMonthTable) {
+        return baseMapper.queryMemberPv(settleTable, pkMember, lastMonthTable);
     }
 
     @Override

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

@@ -0,0 +1,50 @@
+package com.hzs.member.base.controller.manage;
+
+
+import com.hzs.common.core.annotation.Log;
+import com.hzs.common.core.enums.EOperationMethod;
+import com.hzs.common.core.enums.EOperationModule;
+import com.hzs.common.core.web.controller.BaseController;
+import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.common.core.web.page.TableDataInfo;
+import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.member.base.param.DeleteDeadLockParam;
+import com.hzs.member.base.service.DeleteDeadLockService;
+import com.hzs.member.base.vo.DeleteDeadLockVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RequestMapping("/manager/deleteDeadLock")
+@RestController
+public class DeleteDeadLockController extends BaseController {
+
+    @Autowired
+    private DeleteDeadLockService deleteDeadLockService;
+
+    /**
+     * 删除死点列表
+     */
+    @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.SELECT)
+    @GetMapping("list")
+    public TableDataInfo list(DeleteDeadLockParam deleteDeadLockParam) {
+        startPage();
+        deleteDeadLockParam.setPkCountry(SecurityUtils.getPkCountry());
+        List<DeleteDeadLockVO> DeleteDeadLockList = deleteDeadLockService.queryDeleteDeadLockList(deleteDeadLockParam.getMemberCode());
+        return getDataTable(DeleteDeadLockList);
+    }
+
+    /**
+     * 删除死点
+     */
+    @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.DELETE)
+    @PostMapping("delete")
+    public AjaxResult delete(@RequestBody DeleteDeadLockParam deleteDeadLockParam) {
+        String check = deleteDeadLockService.deleteDeadLockMember(deleteDeadLockParam);
+        if (check == null) {
+            return AjaxResult.success();
+        }
+        return AjaxResult.error(check);
+    }
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java

@@ -2,6 +2,7 @@ package com.hzs.member.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.member.base.CuMember;
+import com.hzs.common.domain.member.base.CuMemberSplit;
 import com.hzs.common.domain.member.ext.CuMemberExt;
 import com.hzs.member.base.dto.MemberCountDTO;
 import com.hzs.member.base.param.*;
@@ -791,4 +792,15 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
                               @Param("pkGrade") Integer pkGrade,
                               @Param("pkCountry") Integer pkCountry);
 
+    List<DeleteDeadLockVO> queryDeleteDeadLockList(@Param("memberCode") String memberCode);
+
+    Integer queryIsDeadMember(@Param("memberCode") String memberCode);
+
+    /**
+     * 系统会员拆分列表
+     *
+     * @return
+     */
+    List<CuMemberSplit> listMemberSplit();
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java

@@ -0,0 +1,25 @@
+package com.hzs.member.base.param;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeleteDeadLockParam {
+
+    /**
+     * 会员编号
+     */
+    private String memberCode;
+
+    /**
+     * 所属国家
+     */
+    private Integer PkCountry;
+
+}

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

@@ -0,0 +1,13 @@
+package com.hzs.member.base.service;
+
+import com.hzs.member.base.param.DeleteDeadLockParam;
+import com.hzs.member.base.vo.DeleteDeadLockVO;
+
+import java.util.List;
+
+public interface DeleteDeadLockService {
+    List<DeleteDeadLockVO> queryDeleteDeadLockList(String memberCode);
+
+    String deleteDeadLockMember(DeleteDeadLockParam deleteDeadLockParam);
+
+}

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

@@ -3,6 +3,7 @@ package com.hzs.member.base.service;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.member.base.CuMember;
+import com.hzs.common.domain.member.base.CuMemberSplit;
 import com.hzs.common.domain.member.ext.CuMemberExt;
 import com.hzs.common.domain.member.ext.CuMemberSettleExt;
 import com.hzs.member.base.param.UpdatePlaceParentPetitionParam;
@@ -37,7 +38,7 @@ public interface ICuMemberService extends IService<CuMember> {
     Boolean saveMember(CuMember cuMember);
 
     /*
-     * @description: 查询网体是否存在推荐人
+     *  查询网体是否存在推荐人
      **/
     Integer queryCuMemberByPkMember(Long pkReference);
 
@@ -65,7 +66,7 @@ public interface ICuMemberService extends IService<CuMember> {
     List<CuMemberExt> getMemberInfoByCondition(CuMember cuMember);
 
     /*
-     * @description: 根据条件查询会员信息，查询单表
+     *  根据条件查询会员信息，查询单表
      **/
     List<CuMemberExt> queryMemberByCondition(CuMember cuMember);
 
@@ -86,12 +87,12 @@ public interface ICuMemberService extends IService<CuMember> {
     CuMember getMember(Long pkId);
 
     /*
-     * @description: 查询会员
+     *  查询会员
      **/
     CuMember queryMember(String memberCode);
 
     /*
-     * @description: 查询会员
+     *  查询会员
      **/
     CuMember queryMember(Long pkMember);
 
@@ -194,14 +195,14 @@ public interface ICuMemberService extends IService<CuMember> {
     List<CuMemberVO> queryCuMemberByCondition(CuMemberVO memberParam);
 
     /*
-     * @description: 查询会员信息，根据条件
+     *  查询会员信息，根据条件
      **/
     List<CuMemberVO> queryCuMemberByMemberList(List<CuMemberVO> cuMemberVOList, CuMemberVO memberParam);
 
     List<CuMemberVO> queryCuMemberByMemberListExcel(CuMemberVO memberParam);
 
     /**
-     * @description: 查询真实信息
+     * 查询真实信息
      **/
     List<CuMemberVO> realCuMemberByCondition(CuMemberVO memberParam);
 
@@ -262,27 +263,27 @@ public interface ICuMemberService extends IService<CuMember> {
     CuMember createEmptyOrderMember(CuMemberExt member);
 
     /**
-     * @description: 特殊业务-修改会员编号列表
+     * 特殊业务-修改会员编号列表
      **/
     List<UpdateCodeVO> puCodeList(UpdateCodeVO updateCodeVO);
 
     /**
-     * @description: 查询会员有效期休止期
+     * 查询会员有效期休止期
      **/
     List<UpdateExpireStopVO> getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO);
 
     /**
-     * @description: 零元撤单列表
+     * 零元撤单列表
      **/
     List<ZeroElementRevokeVO> zeroList(ZeroElementRevokeVO zeroElementRevokeVO);
 
     /**
-     * @description: 零元撤单签呈列表
+     * 零元撤单签呈列表
      **/
     List<ZeroElementRevokeDTO> zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam);
 
     /**
-     * @description: 查询会员变更前信息
+     * 查询会员变更前信息
      **/
     UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO);
 
@@ -301,47 +302,47 @@ public interface ICuMemberService extends IService<CuMember> {
     String updateParent(ParentParam parentParam);
 
     /**
-     * @description: 批量修改会员编号
+     * 批量修改会员编号
      **/
     UpdateCodeVO updateCode(UpdateCodeVO updateCodeVO);
 
     /**
-     * @description: 修改会员续约发起签呈
+     * 修改会员续约发起签呈
      **/
     UpdateExpireStopVO upExpireStop(UpdateExpireStopVO upESVO);
 
     /**
-     * @description: 修改会员续约-审核通过驳回
+     * 修改会员续约-审核通过驳回
      **/
     boolean upExpireStopProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /**
-     * @description: 发起签呈-修改会员编号
+     * 发起签呈-修改会员编号
      **/
     UpdateCodeVO petition(UpdateCodeVO updateCodeVO);
 
     /**
-     * @description: 审核通过根据业务单号，业务类型批量修改业务数据
+     * 审核通过根据业务单号，业务类型批量修改业务数据
      **/
     boolean updateCodeByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /**
-     * @description: 政策币签呈审核
+     * 政策币签呈审核
      **/
     boolean upPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /**
-     * @description:删除政策币业务审核
+     * 删除政策币业务审核
      **/
     boolean delPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /**
-     * @description: 审核驳回 根据业务单号，业务类型批量修改业务数据
+     * 审核驳回 根据业务单号，业务类型批量修改业务数据
      **/
     boolean updateCodeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /**
-     * @description: 真实奖衔控制-通过或驳回
+     * 真实奖衔控制-通过或驳回
      **/
     boolean awardsControlPetition(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
@@ -372,47 +373,47 @@ public interface ICuMemberService extends IService<CuMember> {
     Integer batchUpdateMemberByBusinessType(HandleBusinessVO handleBusinessVO);
 
     /**
-     * @description: 招商列表
+     * 招商列表
      **/
     List<UserInvestmentVo> selectBiddingList(MarketNewsParam marketNewsParam);
 
     /**
-     * @description:
+     *
      **/
     List<UpdateSettleCountryVO> upsettleCountryList(UpdateSettleCountryVO upseCountryVO);
 
     /**
-     * @description:查询修改政策币列表
+     * 查询修改政策币列表
      **/
     List<UpPolicyCurrencyVO> upPolicyCurrencyList(UpPolicyCurrencyVO upVO);
 
     /**
-     * @description: 特殊业务-修改结算国
+     * 特殊业务-修改结算国
      **/
     UpdateSettleCountryVO updateSettleCountry(UpdateSettleCountryVO upseCountryVO);
 
     /**
-     * @description: 特殊业务-修改政策币
+     * 特殊业务-修改政策币
      **/
     UpPolicyCurrencyVO upPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO);
 
     /**
-     * @description: 特殊业务-删除政策币业务
+     * 特殊业务-删除政策币业务
      **/
     UpPolicyCurrencyVO delPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO);
 
     /**
-     * @description: 发起签呈-修改结算国
+     * 发起签呈-修改结算国
      **/
     UpdateSettleCountryVO petition(UpdateSettleCountryVO upseCountryVO);
 
     /**
-     * @description: 发起签呈-修改政策币发起签呈
+     * 发起签呈-修改政策币发起签呈
      **/
     UpPolicyCurrencyVO petition(UpPolicyCurrencyVO policyCurrencyVO);
 
     /**
-     * @description: 零元撤单审核-审核通过、驳回
+     * 零元撤单审核-审核通过、驳回
      **/
     boolean zeroByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
@@ -428,37 +429,37 @@ public interface ICuMemberService extends IService<CuMember> {
     List<Tree<String>> systemTjSetListTree(List<CuMemberSettleExt> memberSettleExtList, CuMemberSettleExt memberSettleExt, String settleTableName, Boolean isMemberSecord);
 
     /**
-     * @description: 特殊业务-修改结算国-审核通过
+     * 特殊业务-修改结算国-审核通过
      **/
     boolean updateSettleCountryAdopt(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /**
-     * @description: 特殊业务-修改结算国-审核驳回
+     * 特殊业务-修改结算国-审核驳回
      **/
     boolean updateSettleCountryReject(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /**
-     * @description: 校验会员是否有充值审核
+     * 校验会员是否有充值审核
      **/
     Integer checkCecharge(Long pkMember);
 
     /**
-     * @description: 校验会员是否有提现审核
+     * 校验会员是否有提现审核
      **/
     Integer checkWithdraw(Long pkMember);
 
     /**
-     * @description: 校验会员所有账户是否有余额
+     * 校验会员所有账户是否有余额
      **/
     Integer checkAccount(Long pkMember);
 
     /**
-     * @description: 查询会员是否存在未完成基础业务办理
+     * 查询会员是否存在未完成基础业务办理
      **/
     Integer checkmsLogCount(Long pkMember, Integer editType);
 
     /**
-     * @description: 查询会员是否存在未完成注水业绩业务
+     * 查询会员是否存在未完成注水业绩业务
      **/
     Integer checkMemberAchieveCount(Long pkMember);
 
@@ -489,12 +490,12 @@ public interface ICuMemberService extends IService<CuMember> {
     List<Tree<String>> systemAzSetListTreeFive(List<CuMemberSettleExt> list, CuMemberSettleExt memberSettleExt);
 
     /**
-     * @description: 获取等级的翻译KEY值
+     * 获取等级的翻译KEY值
      **/
     Integer getGradeTranslateValue(Integer pkId);
 
     /**
-     * @description: 获取奖衔的翻译KEY值
+     * 获取奖衔的翻译KEY值
      **/
     Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId);
 
@@ -720,7 +721,7 @@ public interface ICuMemberService extends IService<CuMember> {
     void updateParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO);
 
     /*
-     * @description: 查询会员左右区人数
+     *  查询会员左右区人数
      **/
     List<CuMember> queryMemberLeftRightCount(Long pkMember);
 
@@ -773,7 +774,7 @@ public interface ICuMemberService extends IService<CuMember> {
     List<CuMemberExt> selectPlaceErrorCode();
 
     /*
-     * @description: 查询伞下会员
+     *  查询伞下会员
      **/
     Boolean queryCuMemberUnderUmbrella(Long pkMember);
 
@@ -858,7 +859,7 @@ public interface ICuMemberService extends IService<CuMember> {
     List<MemberConsumptionStatVo> getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam);
 
     /**
-     * @description: 查询表是否存在
+     * 查询表是否存在
      **/
     Integer selectExistTable(String tableName);
 
@@ -1007,4 +1008,11 @@ public interface ICuMemberService extends IService<CuMember> {
      */
     int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry);
 
+    /**
+     * 系统会员拆分列表
+     *
+     * @return
+     */
+    List<CuMemberSplit> listMemberSplit();
+
 }

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

@@ -2462,6 +2462,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         for (String day : days) {
             censusSummaryParam.setTime(day);
             censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
+            // 将体系转换成集合类型
+            if (censusSummaryParam.getPkBdVertexStr() != null) {
+                censusSummaryParam.setPkBdVertexStrList(Arrays.stream(censusSummaryParam.getPkBdVertexStr().split(","))
+                        .map(Integer::valueOf)
+                        .collect(Collectors.toList()));
+            }
             List<MemberMeritsSummaryVo> memberMeritsSummaryVoList = baseMapper.queryDateBySummary(censusSummaryParam);
             Map<Integer, MemberMeritsSummaryVo> memberMeritsSummaryMap = memberMeritsSummaryVoList.stream().collect(Collectors.toMap(MemberMeritsSummaryVo::getOrderType, Function.identity()));
 
@@ -3369,4 +3375,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         return baseMapper.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry);
     }
 
+    @Override
+    public List<CuMemberSplit> listMemberSplit() {
+        return baseMapper.listMemberSplit();
+    }
 }

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

@@ -0,0 +1,64 @@
+package com.hzs.member.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hzs.common.core.constant.msg.MemberMsgConstants;
+import com.hzs.common.core.enums.EDelFlag;
+import com.hzs.common.core.enums.EPlaceDept;
+import com.hzs.common.domain.member.base.CuMember;
+import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.member.account.service.ICuMemberAccountService;
+import com.hzs.member.base.mapper.CuMemberMapper;
+import com.hzs.member.base.param.DeleteDeadLockParam;
+import com.hzs.member.base.service.DeleteDeadLockService;
+import com.hzs.member.base.vo.DeleteDeadLockVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> implements DeleteDeadLockService {
+    @Autowired
+    private ICuMemberAccountService iCuMemberAccountService;
+
+    @Override
+    public List<DeleteDeadLockVO> queryDeleteDeadLockList(String memberCode) {
+        List<DeleteDeadLockVO> deleteDeadLockVOList = baseMapper.queryDeleteDeadLockList(memberCode);
+        deleteDeadLockVOList.forEach(deleteDeadLockVO -> {
+            deleteDeadLockVO.setPlaceDept(EPlaceDept.getEPlaceDept(Integer.parseInt(deleteDeadLockVO.getPlaceDept())));
+        });
+        return deleteDeadLockVOList;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String deleteDeadLockMember(DeleteDeadLockParam deleteDeadLockParam) {
+        if (deleteDeadLockParam.getMemberCode() == null) {
+            return MemberMsgConstants.REQUIRED_NOT_EMPTY;
+        }
+        // 查询安置伞下和推荐伞下未删除会员数量,如果未删除会员数量为0返回true
+        Integer isNoDeadNum = baseMapper.queryIsDeadMember(deleteDeadLockParam.getMemberCode());
+        log.info("安置伞下和推荐伞下未删除会员数量:{}",isNoDeadNum);
+        if(isNoDeadNum == 0){
+            // 删除操作
+            Long userId = SecurityUtils.getUserId();
+            Date date=new Date();//此时date为当前的时间
+            // 删除会员
+            baseMapper.update(null,new LambdaUpdateWrapper<CuMember>()
+                    .eq(CuMember::getMemberCode,deleteDeadLockParam.getMemberCode())
+                    .set(CuMember::getPkModified,userId)
+                    .set(CuMember::getModifiedTime,date)
+                    .set(CuMember::getDelFlag, EDelFlag.DELETE.getValue()));
+            // 删除会员账户
+            iCuMemberAccountService.deleteCuMemberAccountByMemberCode(userId,date,deleteDeadLockParam.getMemberCode());
+        } else {
+            return MemberMsgConstants.NOT_DEAD_MEMBER;
+        }
+        return null;
+    }
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java

@@ -0,0 +1,48 @@
+package com.hzs.member.base.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeleteDeadLockVO {
+
+    /**
+     * 会员编号
+     */
+    private String memberCode;
+
+    /**
+     * 会员姓名
+     */
+    private String memberName;
+    /**
+     * 结算等级
+     */
+    private String pkSettleGrade;
+    /**
+     * 推荐人编号
+     */
+    private String parMemberCode;
+    /**
+     * 安置人编号
+     */
+    private String placeMemberCode;
+    /**
+     * 安置位置
+     */
+    private String placeDept;
+    /**
+     * 注册时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java

@@ -58,4 +58,8 @@ public class CensusSummaryParam {
      * 体系
      */
     private String pkBdVertexStr;
+    /**
+     * 体系集合
+     */
+    private List<Integer> pkBdVertexStrList;
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hzs.member.login.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.hzs.common.core.constant.msg.SystemMsgConstants;
 import com.hzs.common.core.domain.R;
@@ -10,6 +11,7 @@ import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.ip.IpUtils;
 import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.member.base.CuMemberShare;
+import com.hzs.common.domain.member.base.CuMemberSplit;
 import com.hzs.common.domain.member.detail.CuMemberLogin;
 import com.hzs.common.domain.member.ext.CuMemberExt;
 import com.hzs.common.security.utils.SecurityUtils;
@@ -25,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 登录/登出服务
@@ -86,6 +89,19 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
             throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username));
         }
 
+        // 判断会员拆分系统
+        List<CuMemberSplit> memberSplitList = iCuMemberService.listMemberSplit();
+        if (CollectionUtil.isNotEmpty(memberSplitList)) {
+            long nowTime = System.currentTimeMillis();
+            for (CuMemberSplit cuMemberSplit : memberSplitList) {
+                if (null != member.getPkVertex()
+                        && cuMemberSplit.getPkVertex().equals(member.getPkVertex())
+                        && nowTime > cuMemberSplit.getSplitTime()) {
+                    throw new ServiceException(cuMemberSplit.getContent());
+                }
+            }
+        }
+
         try {
             // 是否更新会员
             boolean updateFlag = false;

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

@@ -69,6 +69,14 @@
         <result column="ACCOUNT_STATUS" property="accountStatus"/>
         <result column="PK_COUNTRY" property="pkCountry"/>
     </resultMap>
+    <update id="deleteCuMemberAccountByMemberCode">
+        update cu_member_account cma
+        set cma.del_flag = 1,cma.PK_MODIFIED = #{userId},cma.MODIFIED_TIME = #{date}
+        where cma.pk_member in
+              (select cm.pk_id
+               from cu_member cm
+               where cm.member_code = #{memberCode})
+    </update>
 
     <select id="queryMemberAccountByCondition" resultMap="AccountExResultMap">
         select cm.pay_pwd,
@@ -233,6 +241,9 @@
         <if test="account2 != null">
             and account2 + #{account2} >= 0
         </if>
+        <if test="account4 != null">
+            and account4 + #{account4} >= 0
+        </if>
     </update>
 
     <select id="queryMemberAccountByPkCountry" resultType="com.hzs.common.domain.member.ext.CuMemberAccountExt">

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

@@ -34,33 +34,20 @@
         <result column="BATCH" property="batch"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG
-        ,
-        PK_COUNTRY,
-        PK_CREATOR,
-        CREATION_TIME,
-        PK_MODIFIED,
-        MODIFIED_TIME,
-        PK_ID, PK_MEMBER, WITHDRAW_CODE, PK_ACCOUNT, PK_BANK, PK_RATE, CASH_AMOUNT, SERVICE_CHARGE, INCOME_TAX,
-        ISSUED_AMOUNT,APPROVE_STATE, PAYMENT_TIME, PAYER, REMARKS, APPROVER, APPROVE_TIME, PK_ROLE, ROLE_NAME,STATUS,PAYER_REMARKS,APPROVE_REMARKS
-    </sql>
-
     <sql id="select_base">
         SELECT r.*,
-               m.member_code   memberCode,
-               m.member_name   memberName,
-               bb.bank_name    bankName,
-               b.sub_bank_name subBankName,
-               b.card_number   cardNumber,
-               b.account_name  accountName,
-               b.id_card       idCard,
+               m.member_code             memberCode,
+               m.member_name             memberName,
+               bb.bank_name              bankName,
+               b.sub_bank_name           subBankName,
+               b.card_number             cardNumber,
+               b.account_name            accountName,
+               nvl(m.id_card, b.id_card) idCard,
                b.phone,
-               b.pk_id         pkBdBank,
-               u.user_name     paymentName,
-               su.user_name    approveName,
-               ver.VERTEX_NAME vertexName
+               b.pk_id                   pkBdBank,
+               u.user_name               paymentName,
+               su.user_name              approveName,
+               ver.VERTEX_NAME           vertexName
         FROM cu_member_withdraw r
                  LEFT JOIN cu_member_bank b
                            ON r.pk_Bank = b.pk_id
@@ -146,7 +133,6 @@
             <if test="withdrawCode != null and withdrawCode != ''">
                 and r.WITHDRAW_CODE = #{withdrawCode}
             </if>
-
             <if test="status != null">
                 and r.status = #{status}
             </if>
@@ -197,17 +183,6 @@
           AND STATUS = 0
     </select>
 
-
-    <select id="getWithdrawTimesByPkCountry" resultType="com.hzs.common.domain.member.account.CuMemberWithdrawExt">
-        select w.pk_member, count(1) times
-        from cu_member_withdraw w
-        where w.del_flag = 0
-          and w.pk_country = #{pkCountry}
-          AND (APPROVE_STATE = 1 OR APPROVE_STATE = 2 OR APPROVE_STATE = 3)
-          and w.status != 3
-        group by w.pk_member
-    </select>
-
     <update id="updateWithdrawByCode" parameterType="com.hzs.common.domain.member.account.CuMemberWithdraw">
         update cu_member_withdraw
         <set>
@@ -375,9 +350,7 @@
           AND cmw.status != 3
           AND cmw.pk_country = #{pkCountry}
           AND cmw.pk_member = #{pkMember}
-          AND cmw.approve_state IN (1
-            , 2
-            , 3)
+          AND cmw.approve_state IN (1, 2, 3)
     </select>
 
 </mapper>

bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml

@@ -612,8 +612,8 @@
     <!-- 查询会员显示业绩 -->
     <select id="queryMemberPv" resultType="com.hzs.member.achieve.vo.CuMemberAwardsUnderVO">
         select a.*
-        <if test="monthTable != null and monthTable != ''">
-            , b.a_sum_pv aMonthPv, b.b_sum_pv bMonthPv
+        <if test="lastMonthTable != null and lastMonthTable != ''">
+            , a.a_sum_pv - nvl(b.a_sum_pv, 0) aMonthPv, a.b_sum_pv - nvl(b.b_sum_pv, 0) bMonthPv
         </if>
         from (select
         cms.pk_member,
@@ -625,9 +625,9 @@
         cms.b_new_pv + cms.rep_b_new_pv b_new_pv
         from ${settleTable} cms
         where cms.pk_member = #{pkMember}) a
-        <if test="monthTable != null and monthTable != ''">
+        <if test="lastMonthTable != null and lastMonthTable != ''">
             left join (select cmm.pk_member, cmm.a_sum_pv, cmm.b_sum_pv
-            from ${monthTable} cmm
+            from ${lastMonthTable} cmm
             where cmm.pk_member = #{pkMember}) b
             on a.pk_member = b.pk_member
         </if>

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

@@ -2637,9 +2637,9 @@
         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 ">
+        <if test="pkBdVertexStrList!=null and pkBdVertexStrList.size> 0 ">
             and cm.PK_VERTEX in
-            <foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
+            <foreach collection="pkBdVertexStrList" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -3191,6 +3191,49 @@
         </foreach>)
         order by num desc
     </select>
+    <select id="queryDeleteDeadLockList" resultType="com.hzs.member.base.vo.DeleteDeadLockVO">
+        SELECT
+        cu.MEMBER_CODE,
+        cu.MEMBER_NAME，bdg.GRADE_NAME as pkSettleGrade,
+        cus.MEMBER_CODE AS parMemberCode,
+        cuss.MEMBER_CODE AS placeMemberCode，cu.PLACE_DEPT,
+        cu.CREATION_TIME
+        FROM
+        CU_MEMBER cu
+        LEFT JOIN CU_MEMBER cus ON cu.PK_PARENT = cus.PK_ID
+        LEFT JOIN CU_MEMBER cuss ON cu.PK_PLACE_PARENT = cuss.PK_ID
+        LEFT JOIN BD_GRADE bdg ON cu.PK_SETTLE_GRADE = bdg.PK_ID
+        WHERE
+        cu.DEL_FLAG = 0
+        AND cu.CATEGORY = 2
+        <if test="memberCode != null and memberCode != ''">
+            AND cu.MEMBER_CODE = #{memberCode}
+        </if>
+    </select>
+    <select id="queryIsDeadMember" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM (
+                 SELECT MEMBER_CODE
+                 FROM CU_MEMBER
+                 WHERE DEL_FLAG = 0 START
+                 WITH MEMBER_CODE = #{memberCode}
+                 CONNECT BY PRIOR PK_ID = PK_PARENT
+                 UNION ALL
+                 SELECT
+                     MEMBER_CODE
+                 FROM
+                     CU_MEMBER
+                 WHERE
+                     DEL_FLAG = 0
+                 START WITH MEMBER_CODE = #{memberCode}
+                 CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT
+             ) t
+        WHERE t.MEMBER_CODE != #{memberCode}
+    </select>
 
+    <!-- 系统会员拆分列表 -->
+    <select id="listMemberSplit" resultType="com.hzs.common.domain.member.base.CuMemberSplit">
+        select * from CU_MEMBER_SPLIT cms
+    </select>
 
 </mapper>

bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java

@@ -109,7 +109,7 @@ public interface IActivityService {
      * @param recommendParam
      * @return
      */
-    Boolean onLinePetition(AcRecommendParam recommendParam);
+    String onLinePetition(AcRecommendParam recommendParam);
 
     /**
      * 活动签呈审核通过

bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java

@@ -631,7 +631,8 @@ public class ActivityServiceImpl implements IActivityService {
      * @return
      */
     @Override
-    public Boolean onLinePetition(AcRecommendParam recommendParam) {
+    public String onLinePetition(AcRecommendParam recommendParam) {
+        log.info("旅游活动新增参数{}",JSONUtil.toJsonStr(recommendParam));
         //业务单号
         String code = CommonUtil.createSerialNumber(EOrderPrefix.ACTIVITY_CODE.getValue());
         EApprovalBusiness approvalBusiness = null;
@@ -643,7 +644,40 @@ public class ActivityServiceImpl implements IActivityService {
             approvalBusiness = EApprovalBusiness.TOURISM_DELETE;
         }
         recommendParam.getActivityParam().setBusinessCode(code);
-        Boolean b = submitApproval(recommendParam, approvalBusiness);
+        Integer controlType = recommendParam.getControlType();
+        if (controlType.equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(recommendParam.getPkCountry());
+            activityParam.setPkCreator(recommendParam.getPkMember());
+            activityParam.setActType(EActType.TOURISM.getValue());
+
+            // 增加基础配置
+            AcBaseConfig baseConfig = saveBaseConfig(activityParam);
+            // 目标群体配置
+            saveGoalMemberConfig(activityParam, baseConfig);
+        } else if (controlType.equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setActType(EActType.TOURISM.getValue());
+            activityParam.setPkCountry(recommendParam.getPkCountry());
+            activityParam.setPkCreator(recommendParam.getPkMember());
+            //目标用户群删除
+            LambdaQueryWrapper<AcGoalMemberConfig> qe = new LambdaQueryWrapper<>();
+            qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId());
+            goalMemberConfigService.remove(qe);
+            // 增加基础配置
+            AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class);
+            baseConfigService.updateById(baseConfig);
+            // 目标群体配置
+            saveGoalMemberConfig(activityParam, baseConfig);
+        } else if (controlType.equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            //目标用户群删除
+            LambdaQueryWrapper<AcGoalMemberConfig> qe = new LambdaQueryWrapper<>();
+            qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId());
+            goalMemberConfigService.remove(qe);
+            baseConfigService.removeById(activityParam.getPkId());
+            drawGiftConfigService.removeDrawGiftConfig(activityParam.getPkId().intValue());
+        }
         //日志
         ActivityParam activityParam = recommendParam.getActivityParam();
         activityParam.setPkCountry(SecurityUtils.getPkCountry());
@@ -651,7 +685,7 @@ public class ActivityServiceImpl implements IActivityService {
         activityParam.setActType(EActType.TOURISM.getValue());
         activityParam.setBusinessCode(recommendParam.getActivityParam().getBusinessCode());
         this.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return b;
+        return null;
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java

@@ -172,13 +172,16 @@ public class AcConsumeRuleConfigController extends BaseController {
      * @param recommendParam 消费赠送参数
      * @return AjaxResult
      */
-    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "消费赠送")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
         recommendParam.setPkMember(SecurityUtils.getUserId());
         recommendParam.setLoginUser(userTokenService.getLoginUser());
-        consumeRuleConfigService.onLinePetition(recommendParam);
+        String str = consumeRuleConfigService.onLinePetition(recommendParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
         return AjaxResult.success();
     }
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java

@@ -111,11 +111,14 @@ public class AcMemberConsumeRuleController extends BaseController {
      * @param memberConsumeRuleVo 会员消费赠送参数
      * @return AjaxResult
      */
-    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "会员消费赠送")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) {
         memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser());
-        iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo);
+        String str = iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
         return AjaxResult.success();
     }
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java

@@ -38,7 +38,7 @@ public interface IAcConsumeRuleConfigService extends IService<AcConsumeRuleConfi
      * @param recommendParam
      */
 
-    Boolean onLinePetition(AcRecommendParam recommendParam);
+    String onLinePetition(AcRecommendParam recommendParam);
 
     /**
      * 消费赠送审批/修改/删除

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcMemberConsumeRuleService.java

@@ -28,7 +28,7 @@ public interface IAcMemberConsumeRuleService extends IService<AcMemberConsumeRul
      * @param: [memberConsumeRuleVo]
      * @return: java.lang.Boolean
      **/
-    Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);
+    String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo);
 
     /**
      * @description: 会员消费赠审批

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java

@@ -33,6 +33,7 @@ import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
 import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,7 @@ import java.util.List;
  * @since 2023-04-20
  */
 @Service
+@Slf4j
 public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleConfigMapper, AcConsumeRuleConfig> implements IAcConsumeRuleConfigService {
 
     @Autowired
@@ -106,7 +108,9 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
      * @param recommendParam
      */
     @Override
-    public Boolean onLinePetition(AcRecommendParam recommendParam) {
+    @Transactional(rollbackFor = Exception.class)
+    public String onLinePetition(AcRecommendParam recommendParam) {
+        log.info("消费赠送入参{}", recommendParam);
         EApprovalBusiness approvalBusiness = null;
         if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
             approvalBusiness = EApprovalBusiness.CONSUME_GIFT_ADD;
@@ -115,7 +119,29 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
         } else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
             approvalBusiness = EApprovalBusiness.CONSUME_GIFT_REMOVE;
         }
-        Boolean b = submitApproval(recommendParam, approvalBusiness);
+        LoginUser loginUser = recommendParam.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
+            iActivityService.saveConsumptionGift(activityParam);
+        } else if (recommendParam.getControlType().equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
+            iActivityService.updateConsumptionGift(activityParam);
+        } else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            Long pkId = activityParam.getPkId();
+            this.removeActivity(pkId.intValue());
+        }
+//        Boolean b = submitApproval(recommendParam, approvalBusiness);
         ActivityParam activityParam = recommendParam.getActivityParam();
         activityParam.setPkCountry(SecurityUtils.getPkCountry());
         activityParam.setPkCreator(SecurityUtils.getUserId());
@@ -123,7 +149,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
 
         //日志
         iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return b;
+        return null;
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java

@@ -37,6 +37,7 @@ import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
 import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,6 +57,7 @@ import java.util.List;
  * @return:
  **/
 @Service
+@Slf4j
 public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeRuleMapper, AcMemberConsumeRule> implements IAcMemberConsumeRuleService {
 
     @Autowired
@@ -80,7 +82,9 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
      * @return: java.lang.Boolean
      **/
     @Override
-    public Boolean onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
+    @Transactional(rollbackFor = Exception.class)
+    public String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
+        log.info("商品赠送入参{}",JSONUtil.toJsonStr(memberConsumeRuleVo));
         EApprovalBusiness approvalBusiness = null;
         if (memberConsumeRuleVo.getControlType() == EControlType.SAVE.getValue()) {
             approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_ADD;
@@ -89,14 +93,39 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
         } else if (memberConsumeRuleVo.getControlType() == EControlType.DELETE.getValue()) {
             approvalBusiness = EApprovalBusiness.MEMBER_CONSUME_GIFT_REMOVE;
         }
-        Boolean b = submitApproval(memberConsumeRuleVo, approvalBusiness);
+
+        LoginUser loginUser = memberConsumeRuleVo.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        if (memberConsumeRuleVo.getControlType().equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
+            memberConsumeRuleVo.setActivityParam(activityParam);
+            saveMemberConsumeRule(memberConsumeRuleVo);
+        } else if (memberConsumeRuleVo.getControlType().equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
+            memberConsumeRuleVo.setActivityParam(activityParam);
+            updateConsumptionGift(memberConsumeRuleVo);
+        }else if (memberConsumeRuleVo.getControlType().equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
+            Long pkId = activityParam.getPkId();
+            removeActivity(pkId.intValue());
+        }
+//        Boolean b = submitApproval(memberConsumeRuleVo, approvalBusiness);
         ActivityParam activityParam = memberConsumeRuleVo.getActivityParam();
         activityParam.setPkCountry(SecurityUtils.getPkCountry());
         activityParam.setPkCreator(SecurityUtils.getUserId());
         activityParam.setActType(EActType.MEMBER_CONSUMPTION.getValue());
         //日志
         iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return b;
+        return null;
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java

@@ -86,7 +86,7 @@ public class AcDrawGiftRuleConfigController extends BaseController {
      * @return AjaxResult
      */
     @Log(module = EOperationModule.AC_RECOMMEEND_CONFIG, method = EOperationMethod.INSERT, remark = "抽奖在线配置")
-    @PostMapping("/online-petition")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         if (recommendParam.getActivityParam().getDrawGiftConfigList() != null) {
             for (AcDrawGiftRuleConfigVo acDrawGiftRuleConfigVo : recommendParam.getActivityParam().getDrawGiftConfigList()) {
@@ -99,7 +99,11 @@ public class AcDrawGiftRuleConfigController extends BaseController {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
         recommendParam.setPkMember(SecurityUtils.getUserId());
         recommendParam.setLoginUser(userTokenService.getLoginUser());
-        return toAjax(drawGiftConfigService.onLinePetition(recommendParam));
+        String str = drawGiftConfigService.onLinePetition(recommendParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
+        return AjaxResult.success();
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java

@@ -118,6 +118,7 @@ public class AcDrawRewardRecordController extends BaseController {
      * 充值已购买次数按钮 (审批)
      */
     @PostMapping("/purchased-times")
+    @Log(module = EOperationModule.DRAW_PURCHASED,business = EOperationBusiness.DRAW_PURCHASED,method = EOperationMethod.INSERT,remark = "充值已购买次数")
     public AjaxResult purchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {
@@ -145,6 +146,7 @@ public class AcDrawRewardRecordController extends BaseController {
      * 充值未购买次数 (走审批)
      */
     @PostMapping("/unpurchased-times")
+    @Log(module = EOperationModule.DRAW_UNPURCHASED,business = EOperationBusiness.DRAW_UNPURCHASED,method = EOperationMethod.INSERT,remark = "充值未购买次数")
     public AjaxResult unpurchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {

bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java

@@ -62,5 +62,5 @@ public interface IAcDrawGiftRuleConfigService extends IService<AcDrawGiftRuleCon
      * @param recommendParam
      * @return
      */
-    Boolean onLinePetition(AcRecommendParam recommendParam);
+    String onLinePetition(AcRecommendParam recommendParam);
 }

bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawGiftRuleConfigServiceImpl.java

@@ -29,10 +29,12 @@ import com.hzs.common.domain.activity.base.AcPickUpConfig;
 import com.hzs.common.domain.activity.draw.AcDrawGiftRuleConfig;
 import com.hzs.common.domain.activity.draw.AcDrawRuleConfig;
 import com.hzs.common.domain.activity.draw.ext.AcDrawGiftRuleConfigExt;
+import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
 import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +49,7 @@ import java.util.List;
  * @since 2023-04-21
  */
 @Service
+@Slf4j
 public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl<AcDrawGiftRuleConfigMapper, AcDrawGiftRuleConfig> implements IAcDrawGiftRuleConfigService {
 
     @Autowired
@@ -181,7 +184,9 @@ public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl<AcDrawGiftRuleC
     }
 
     @Override
-    public Boolean onLinePetition(AcRecommendParam recommendParam) {
+    @Transactional(rollbackFor = Exception.class)
+    public String onLinePetition(AcRecommendParam recommendParam) {
+        log.info("抽奖配置入参{}",JSONUtil.toJsonStr(recommendParam));
         EApprovalBusiness approvalBusiness = null;
         if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
             approvalBusiness = EApprovalBusiness.LOTTERY_DRAW_ADD;
@@ -190,8 +195,31 @@ public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl<AcDrawGiftRuleC
         } else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
             approvalBusiness = EApprovalBusiness.LOTTERY_DRAW_REMOVE;
         }
+        Integer controlType = recommendParam.getControlType();
+        if (controlType.equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(recommendParam.getPkCountry());
+            activityParam.setPkCreator(recommendParam.getPkMember());
+            activityParam.setActType(EActType.LOTTERY_DRAW.getValue());
+            iActivityService.saveRaffleActivity(activityParam);
+        } else if (controlType.equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setActType(EActType.LOTTERY_DRAW.getValue());
+            activityParam.setPkCountry(recommendParam.getPkCountry());
+            activityParam.setPkCreator(recommendParam.getPkMember());
+            drawGiftConfigService.updateDrawGiftConfig(activityParam);
+        } else if (controlType.equals(EControlType.DELETE.getValue())) {
+            drawGiftConfigService.removeDrawGiftConfig(recommendParam.getActivityParam().getPkBaseId().intValue());
+        }
+        // 日志
+        ActivityParam activityParam = recommendParam.getActivityParam();
+        activityParam.setPkCountry(SecurityUtils.getPkCountry());
+        activityParam.setPkCreator(SecurityUtils.getUserId());
+        activityParam.setActType(EActType.CONSUMPTION_GIFT.getValue());
 
-        return submitApproval(recommendParam, approvalBusiness);
+        //日志
+        iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
+        return null;
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/impl/AcDrawRewardNumServiceImpl.java

@@ -39,6 +39,7 @@ import com.hzs.member.detail.ICuMemberServiceLogServiceApi;
 import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@ import java.util.concurrent.TimeUnit;
  * @since 2023-04-21
  */
 @Service
+@Slf4j
 public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMapper, AcDrawRewardNum> implements IAcDrawRewardNumService {
 
     @Autowired
@@ -239,10 +241,32 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void purchasedTimes(PurchasedTimesParam purchasedTimesParam) {
-        purchasedTimesParam.setControlType(EControlType.MODIFY.getValue());
-        //业务单号
-        EApprovalBusiness approvalBusiness = EApprovalBusiness.PUR_CHASED_TIMES;
-        submitApproval(purchasedTimesParam, approvalBusiness);
+        log.info("修改已购买次数入参{}",JSONUtil.toJsonStr(purchasedTimesParam));
+        String memberCode = purchasedTimesParam.getMemberCode();
+        Integer num = purchasedTimesParam.getNum();
+        Long pkBaseId = purchasedTimesParam.getPkBaseId();
+        R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
+        Long pkMember = memberDto.getData().getPkId();
+
+        LambdaQueryWrapper<AcDrawRewardNum> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId);
+        queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember);
+        AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper);
+        if (drawRewardNum != null) {
+            baseMapper.updatePurchasedTimesByBaseId(pkMember, num, pkBaseId);
+        } else {
+            drawRewardNum = new AcDrawRewardNum();
+            drawRewardNum.setPkBaseId(pkBaseId);
+            drawRewardNum.setPkMember(pkMember);
+            drawRewardNum.setTotalUsedNum(num);
+            drawRewardNum.setAvailableNum(num);
+            drawRewardNum.setTotalNum(num);
+            drawRewardNum.setAvailableSurplusNum(num);
+            drawRewardNum.setCreationTime(DateUtils.currentDateTime());
+            drawRewardNum.setPkCreator(memberDto.getData().getPkCreator());
+            drawRewardNum.setPkCountry(memberDto.getData().getPkCountry());
+            this.save(drawRewardNum);
+        }
     }
 
     /**
@@ -364,10 +388,30 @@ public class AcDrawRewardNumServiceImpl extends ServiceImpl<AcDrawRewardNumMappe
      */
     @Override
     public void unpurchasedTimes(PurchasedTimesParam purchasedTimesParam) {
-        purchasedTimesParam.setControlType(EControlType.MODIFY.getValue());
-        //业务单号
-        EApprovalBusiness approvalBusiness = EApprovalBusiness.UN_PUR_CHASED_TIMES;
-        submitApproval(purchasedTimesParam, approvalBusiness);
+        log.info("修改未购买次数入参{}",JSONUtil.toJsonStr(purchasedTimesParam));
+        String memberCode = purchasedTimesParam.getMemberCode();
+        Integer num = purchasedTimesParam.getNum();
+        Long pkBaseId = purchasedTimesParam.getPkBaseId();
+        R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
+        Long pkMember = memberDto.getData().getPkId();
+
+        LambdaQueryWrapper<AcDrawRewardNum> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AcDrawRewardNum::getPkBaseId, pkBaseId);
+        queryWrapper.eq(AcDrawRewardNum::getPkMember, pkMember);
+        AcDrawRewardNum drawRewardNum = this.getOne(queryWrapper);
+        if (drawRewardNum != null) {
+            baseMapper.updateUnpurchasedTimesByPkbaseId(pkMember, num, pkBaseId);
+        } else {
+            drawRewardNum = new AcDrawRewardNum();
+            drawRewardNum.setPkBaseId(pkBaseId);
+            drawRewardNum.setPkMember(pkMember);
+            drawRewardNum.setTotalNum(num);
+            drawRewardNum.setTotalSurplusNum(num);
+            drawRewardNum.setCreationTime(DateUtils.currentDateTime());
+            drawRewardNum.setPkCreator(memberDto.getData().getPkCreator());
+            drawRewardNum.setPkCountry(memberDto.getData().getPkCountry());
+            this.save(drawRewardNum);
+        }
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java

@@ -44,12 +44,16 @@ public class AcRecommendConfigController extends BaseController {
      * @return AjaxResult
      */
     @Log(module = EOperationModule.AC_RECOMMEEND_CONFIG, business = EOperationBusiness.AC_RECOMMEEND_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
         recommendParam.setPkMember(SecurityUtils.getUserId());
         recommendParam.setLoginUser(userTokenService.getLoginUser());
-        return toAjax(acRepurCouponsRuleConfigService.onLinePetition(recommendParam));
+        String str = acRepurCouponsRuleConfigService.onLinePetition(recommendParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
+        return AjaxResult.success();
     }
 
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRepurCouponsRuleConfigService.java

@@ -21,7 +21,7 @@ public interface IAcRepurCouponsRuleConfigService extends IService<AcRepurCoupon
      * @param recommendParam
      * @return
      */
-    Boolean onLinePetition(AcRecommendParam recommendParam);
+    String onLinePetition(AcRecommendParam recommendParam);
 
     /**
      * 查看详情

bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java

@@ -96,7 +96,8 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean onLinePetition(AcRecommendParam recommendParam) {
+    public String onLinePetition(AcRecommendParam recommendParam) {
+        log.info("直推参数{}",JSONUtil.toJsonStr(recommendParam));
         EApprovalBusiness approvalBusiness = EApprovalBusiness.DIRECT_PUSH_GIFT;
         //根据产品ID查询产品名称
         List<AcRecommendUpgradeVO> recommendUpgradeList = recommendParam.getRecommendUpgradeList();
@@ -113,12 +114,20 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl<AcRepurCoup
                 }
             }
         }
+        Integer controlType = recommendParam.getControlType();
+        if (controlType.equals(EControlType.SAVE.getValue())) {
+            return saveRecommendData(recommendParam);
+        } else if (controlType.equals(EControlType.MODIFY.getValue())) {
+            deleteRecommendData(recommendParam);
+            return saveRecommendData(recommendParam);
+        } else {
+            deleteRecommendData(recommendParam);
+        }
         //业务单号
         String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.ACTIVITY_CODE.getValue());
-        //提交审批
-        Boolean result = submitApproval(recommendParam, approvalBusiness, businessCode);
+        //日志
         packageRecommendOperationLog(recommendParam, approvalBusiness, businessCode);
-        return result;
+        return null;
     }
 
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/controller/manage/AcTourismController.java

@@ -60,12 +60,16 @@ public class AcTourismController extends BaseController {
      * @return AjaxResult
      */
     @Log(module = EOperationModule.AC_TOURISM_CONFIG, business = EOperationBusiness.AC_TOURISM_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
         recommendParam.setPkMember(SecurityUtils.getUserId());
         recommendParam.setLoginUser(userTokenService.getLoginUser());
-        return toAjax(activityService.onLinePetition(recommendParam));
+        String str = activityService.onLinePetition(recommendParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
+        return AjaxResult.success();
     }
 
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java

@@ -163,13 +163,16 @@ public class WaresRuleConfigController extends BaseController {
      * @param recommendParam 商品赠送参数
      * @return AjaxResult
      */
-    @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
-    @PostMapping("/online-petition")
+    @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "商品赠送")
+    @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
         recommendParam.setPkMember(SecurityUtils.getUserId());
         recommendParam.setLoginUser(userTokenService.getLoginUser());
-        waresRuleConfigService.onLinePetition(recommendParam);
+        String str = waresRuleConfigService.onLinePetition(recommendParam);
+        if (str != null) {
+            return AjaxResult.error(str);
+        }
         return AjaxResult.success();
     }
 

bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/IAcWaresRuleConfigService.java

@@ -54,7 +54,7 @@ public interface IAcWaresRuleConfigService extends IService<AcWaresRuleConfig> {
      *
      * @param recommendParam
      */
-    Boolean onLinePetition(AcRecommendParam recommendParam);
+    String onLinePetition(AcRecommendParam recommendParam);
 
     /**
      * 商品赠送 审核规则

bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java

@@ -30,9 +30,11 @@ import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
 import com.hzs.system.sys.dto.LoginUser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -43,6 +45,7 @@ import java.util.List;
  * @since 2023-04-20
  */
 @Service
+@Slf4j
 public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigMapper, AcWaresRuleConfig> implements IAcWaresRuleConfigService {
 
     @Autowired
@@ -108,7 +111,9 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
      * @param recommendParam
      */
     @Override
-    public Boolean onLinePetition(AcRecommendParam recommendParam) {
+    @Transactional(rollbackFor = Exception.class)
+    public String onLinePetition(AcRecommendParam recommendParam) {
+        log.info("商品赠送入参{}",recommendParam);
         EApprovalBusiness approvalBusiness = null;
         if (recommendParam.getControlType() == EControlType.SAVE.getValue()) {
             approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_ADD;
@@ -117,7 +122,30 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
         } else if (recommendParam.getControlType() == EControlType.DELETE.getValue()) {
             approvalBusiness = EApprovalBusiness.PRODUCT_GIFT_REMOVE;
         }
-        Boolean b = submitApproval(recommendParam, approvalBusiness);
+//        Boolean b = submitApproval(recommendParam, approvalBusiness);
+
+        LoginUser loginUser = recommendParam.getLoginUser();
+        if (loginUser == null) {
+            log.error("登录用户信息为空");
+            return "登录用户信息为空";
+        }
+        if (recommendParam.getControlType().equals(EControlType.SAVE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
+            iActivityService.saveActivity(activityParam);
+        } else if (recommendParam.getControlType().equals(EControlType.MODIFY.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            activityParam.setPkCountry(loginUser.getDataCountry());
+            activityParam.setPkCreator(loginUser.getUserId());
+            activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
+            waresRuleConfigService.updateWaresRuleConfig(activityParam);
+        } else if (recommendParam.getControlType().equals(EControlType.DELETE.getValue())) {
+            ActivityParam activityParam = recommendParam.getActivityParam();
+            Long pkId = activityParam.getPkId();
+            waresRuleConfigService.removeWaresRuleConfig(pkId);
+        }
         //日志
         ActivityParam activityParam = recommendParam.getActivityParam();
         activityParam.setPkCountry(SecurityUtils.getPkCountry());
@@ -125,7 +153,7 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
         activityParam.setActType(EActType.PRODUCT_GIFT.getValue());
         activityParam.setBusinessCode(recommendParam.getActivityParam().getBusinessCode());
         iActivityService.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false);
-        return b;
+        return null;
     }
 
     /**

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java

@@ -106,6 +106,10 @@ public class SaDeliverUnhandledController extends BaseController {
         param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
         param.setVertexIdList(userAuthorityDTO.getVertexIdList());
         param.setTeamList(userAuthorityDTO.getUserTeamList());
+        // 兼容调换货产品
+        if (CollectionUtil.isEmpty(param.getPkWaresList())) {
+            param.setPkWaresList(Collections.singletonList(0));
+        }
 
         startPage();
         List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
@@ -148,6 +152,10 @@ public class SaDeliverUnhandledController extends BaseController {
         param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
         param.setVertexIdList(userAuthorityDTO.getVertexIdList());
         param.setTeamList(userAuthorityDTO.getUserTeamList());
+        // 兼容调换货产品
+        if (CollectionUtil.isEmpty(param.getPkWaresList())) {
+            param.setPkWaresList(Collections.singletonList(0));
+        }
 
         List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
 

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRevokeService.java

@@ -4,21 +4,16 @@ import com.hzs.common.domain.sale.order.SaOrder;
 import com.hzs.system.sys.dto.LoginUser;
 
 /**
- * @Description: 撤单的service
- * @Author: sui q
- * @Time: 2022/10/27 10:49
- * @Classname: ISaOrderRevokeService
- * @PackageName: com.hzs.sale.order.service
+ * 撤单的service
  */
 public interface ISaOrderRevokeService {
 
     /**
      * 撤销订单
-     * @param saOrder 需要销售的订单信息
+     *
+     * @param saOrder   需要销售的订单信息
      * @param loginUser 登录用户
-    * @return: void
-    * @Author: sui q
-    * @Date: 2022/10/27 10:51
-    */
+     */
     void revokeSaOrder(SaOrder saOrder, LoginUser loginUser);
+
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java

@@ -575,12 +575,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
         // 查询订单信息
         SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
         if (null == saOrder) {
-            return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
+            return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
         }
         // 订单支付日期 < 当前日期-7天
         Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
         if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
-            return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED);
+            return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
         }
 
         // 操作日志内容
@@ -646,16 +646,13 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
             return "订单已经发货，不能进行调换货物";
         }
 
-        // 是否扣款
-        boolean orderCostFlag = false;
         // 修改前的订单金额 + 邮费
         BigDecimal beforeAmount = saOrder.getOrderAmount().add(saOrder.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
         // 修改后的订单金额 + 邮费
         BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
-        // 对比修改前后订单价格处理是否补差价
+        // 校验订单原订单价格和调换完货之后的价格不相同不进行换货
         if (beforeAmount.compareTo(afterAmount) != 0) {
-            // 修改前后金额不相同则进行处理
-            orderCostFlag = true;
+            return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
         }
 
         if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@@ -664,13 +661,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
                     changeIdList, noChangeIdList,
                     userId, pkCountry, nowDate);
 
-            if (orderCostFlag) {
-                // 订单调换货物扣费处理
-                R<?> resultR = iMemberAccountServiceApi.orderChangeProduct(saOrder, updateOrder, userId, dto);
-                if (!resultR.isSuccess()) {
-                    throw new BaseException(resultR.getMsg());
-                }
-            } else if (null != dto) {
+            if (null != dto) {
                 // 订单总价未变化，但是需要手续费
                 R<?> resultR = iMemberAccountServiceApi.orderChangeProduct(null, null, userId, dto);
                 if (!resultR.isSuccess()) {
@@ -703,12 +694,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
         // 查询订单收货地址信息
         SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
         if (null == saOrder) {
-            return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
+            return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
         }
         // 订单支付日期 < 当前日期-7天
         Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
         if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
-            return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED);
+            return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
         }
 
         // 涉及会员ID列表
@@ -754,25 +745,9 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
         ;
         // 修改后的订单金额 + 邮费
         BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
-        ;
-        // 对比修改前后订单价格处理是否补差价
-        if (beforeAmount.compareTo(afterAmount) < 0) {
-            // 存在差额
-            // 封装订单数据
-            SaOrder updateOrder = BeanUtil.copyProperties(saOrder, SaOrder.class);
-            updateOrder.setPkId(saOrder.getPkId());
-            updateOrder.setOrderAmount(afterData.getOrderAmount());
-            updateOrder.setOrderAchieve(afterData.getOrderAchieve());
-            updateOrder.setOrderAssAchieve(afterData.getOrderAssAchieve());
-            updateOrder.setPostage(param.getPostage());
-            updateOrder.setPkModified(userId);
-            updateOrder.setModifiedTime(nowDate);
-
-            // 校验订单支付金额是否足够
-            R<?> resultR = iMemberAccountServiceApi.orderChangeProductPre(saOrder, updateOrder);
-            if (!resultR.isSuccess()) {
-                return resultR.getMsg();
-            }
+        // 校验订单原订单价格和调换完货之后的价格不相同不进行换货
+        if (beforeAmount.compareTo(afterAmount) != 0) {
+            return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
         }
 
         if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@@ -786,7 +761,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
             }
             return submitStr;
         }
-        return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED);
+        return CommonMsgConstants.OPERATION_FAILED;
     }
 
     @Transactional(rollbackFor = Exception.class)

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRevokeServiceImpl.java

@@ -1,10 +1,8 @@
 package com.hzs.sale.order.service.impl;
 
 import cn.hutool.json.JSONUtil;
-import com.google.gson.JsonObject;
 import com.hzs.common.core.enums.EApprovalBusiness;
 import com.hzs.common.domain.sale.order.SaOrder;
-import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.sale.order.service.ISaOrderRevokeService;
 import com.hzs.system.sys.IApprovalServiceApi;
 import com.hzs.system.sys.dto.ApprovalSubmitDTO;
@@ -13,17 +11,13 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 /**
- * @Description: 撤单逻辑类
- * @Author: sui q
- * @Time: 2022/10/27 10:50
- * @Classname: SaOrderRevokeServiceImpl
- * @PackageName: com.hzs.sale.order.service.impl
+ * 撤单逻辑类
  */
 @Service
 public class SaOrderRevokeServiceImpl implements ISaOrderRevokeService {
 
     @DubboReference
-    private IApprovalServiceApi approvalServiceApi;
+    IApprovalServiceApi iApprovalServiceApi;
 
     @Override
     public void revokeSaOrder(SaOrder saOrder, LoginUser loginUser) {
@@ -32,6 +26,6 @@ public class SaOrderRevokeServiceImpl implements ISaOrderRevokeService {
                 .businessCode(saOrder.getOrderCode())
                 .businessData(JSONUtil.toJsonStr(saOrder))
                 .build();
-        approvalServiceApi.submit(approvalSubmitDTO, loginUser);
+        iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
     }
 }

bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverItemsMapper.xml

@@ -226,7 +226,8 @@
                     </if>
                 </if>
             </foreach>
-            order by sdi.creation_time desc, deliver_code desc, order_code desc
+            order by sdi.creation_time desc, deliver_code desc, order_code desc,
+            bp.wms_code, sdi.specs_name
         </if>
 
         <if test="param.pkDeliverList == null or param.pkDeliverList.size == 0">
@@ -409,7 +410,8 @@
                     #{item}
                 </foreach>
             </if>
-            order by sdi.creation_time desc, sd.deliver_code desc, so.order_code desc
+            order by sdi.creation_time desc, sd.deliver_code desc, so.order_code desc,
+            bp.wms_code, sdi.specs_name
         </if>
     </select>
 

bd-business/bd-business-system/src/main/java/com/hzs/system/base/mapper/BdCurrencyMapper.java

@@ -1,16 +1,10 @@
 package com.hzs.system.base.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.system.base.BdCurrency;
 
 /**
- * <p>
  * 币种表 Mapper 接口
- * </p>
- *
- * @author hzs
- * @since 2022-08-04
  */
 public interface BdCurrencyMapper extends BaseMapper<BdCurrency> {
 

bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCurrencyService.java

@@ -6,22 +6,12 @@ import com.hzs.common.domain.system.base.BdCurrency;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2022/8/29 10:59
- * @Classname: IBdCurrencyService
- * @PackageName: com.hzs.system.base.service
- */
 public interface IBdCurrencyService extends IService<BdCurrency> {
 
     /**
      * 根据国家获得币种
      *
      * @param pkCountry 国家
-     * @return: BdCurrency
-     * @Author: sui q
-     * @Date: 2022/9/8 15:05
      */
     BdCurrency getCurrency(Integer pkCountry);
 
@@ -50,10 +40,6 @@ public interface IBdCurrencyService extends IService<BdCurrency> {
 
     /**
      * 查询所有的币种汇率
-     *
-     * @return: List<BdCurrency>
-     * @Author: sui q
-     * @Date: 2023/3/4 16:06
      */
     List<BdCurrency> queryAllBdCurrency();
 
@@ -61,9 +47,6 @@ public interface IBdCurrencyService extends IService<BdCurrency> {
      * 更新汇率根据id
      *
      * @param pkId 主键
-     * @return: void
-     * @Author: sui q
-     * @Date: 2023/3/10 15:37
      */
     void updateCurrencyById(Integer pkId);
 

bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdCurrencyServiceImpl.java

@@ -17,21 +17,11 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
 
-/**
- * Created with IntelliJ IDEA.
- *
- * @Author: yuhui
- * @Description: 币种服务类
- */
 @Service
 public class BdCurrencyServiceImpl extends ServiceImpl<BdCurrencyMapper, BdCurrency> implements IBdCurrencyService {
 
-    private RedisService redisService;
-
     @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
+    private RedisService redisService;
 
     @Override
     public BdCurrency getCurrency(Integer pkCountry) {
@@ -69,11 +59,6 @@ public class BdCurrencyServiceImpl extends ServiceImpl<BdCurrencyMapper, BdCurre
         return bdCurrency;
     }
 
-    /**
-     * 根据id 查询所属历史币种
-     *
-     * @return
-     */
     @Override
     public BdCurrency getByHistoryPkid(Integer pkId) {
         BdCurrency bdCurrency = redisService.getCacheObject(CacheConstants.BD_HISTORY_CURRENCY_PK + pkId);
@@ -88,13 +73,6 @@ public class BdCurrencyServiceImpl extends ServiceImpl<BdCurrencyMapper, BdCurre
         return bdCurrency;
     }
 
-    /**
-     * 本地币转换为美金
-     *
-     * @param localCurrency 本地币
-     * @param pkCountry     结算国
-     * @return
-     */
     @Override
     public BigDecimal getDollar(BigDecimal localCurrency, Integer pkCountry) {
         BdCurrency bdCurrency = getCurrency(pkCountry);

bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdWithdrawalAutoController.java

@@ -1,11 +1,8 @@
 package com.hzs.system.config.controller.manage;
 
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.hzs.common.core.constant.CacheConstants;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.hzs.common.core.enums.EDelFlag;
-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;
@@ -21,12 +18,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 自动提现明细表 前端控制器
- * </p>
- *
- * @author zhangjing
- * @since 2022-08-31
  */
 @Slf4j
 @RestController
@@ -34,98 +26,66 @@ import java.util.List;
 public class BdWithdrawalAutoController extends BaseController {
 
     @Autowired
-    private IBdWithdrawalAutoService withdrawalAutoService;
-    private RedisService redisService;
-
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
+    private IBdWithdrawalAutoService iBdWithdrawalAutoService;
 
     /**
-     * @description: 查询自动提现设置列表
-     * @author: zhang jing
-     * @date: 2022/8/30 10:20
-     * @param: [bdWithdrawal]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
+     * 查询自动提现设置列表
      **/
     @GetMapping("/list")
     public TableDataInfo list(BdWithdrawalAuto withdrawalAuto) {
         startPage();
         withdrawalAuto.setPkCountry(SecurityUtils.getPkCountry());
-        QueryWrapper<BdWithdrawalAuto> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("PK_COUNTRY",SecurityUtils.getPkCountry());
-        if(StringUtils.isNotNull(withdrawalAuto.getPkWithdrawal())){
-            queryWrapper.eq("PK_WITHDRAWAL",withdrawalAuto.getPkWithdrawal());
+        LambdaQueryWrapper<BdWithdrawalAuto> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawalAuto::getPkCountry, SecurityUtils.getPkCountry());
+        if (StringUtils.isNotNull(withdrawalAuto.getPkWithdrawal())) {
+            queryWrapper.eq(BdWithdrawalAuto::getPkWithdrawal, withdrawalAuto.getPkWithdrawal());
         }
-        queryWrapper.orderByDesc("CREATION_TIME");
-        List<BdWithdrawalAuto> list = withdrawalAutoService.list(queryWrapper);
+        queryWrapper.orderByDesc(BdWithdrawalAuto::getCreationTime);
+        List<BdWithdrawalAuto> list = iBdWithdrawalAutoService.list(queryWrapper);
         return getDataTable(list);
     }
 
-
     /**
-     * @description: 新增自动提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [bdWithdrawal]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 新增自动提现设置
      **/
     @PostMapping("/save")
     public AjaxResult save(@RequestBody BdWithdrawalAuto withdrawalAuto) {
         withdrawalAuto.setPkCountry(SecurityUtils.getPkCountry());
         withdrawalAuto.setPkCreator(SecurityUtils.getUserId());
         withdrawalAuto.setCreationTime(new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_AUTO + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalAutoService.save(withdrawalAuto));
+        return toAjax(iBdWithdrawalAutoService.save(withdrawalAuto));
     }
 
-
     /**
-     * @description: 修改自动提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [bdWithdrawal]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 修改自动提现设置
      **/
     @PostMapping("/update")
     public AjaxResult update(@RequestBody BdWithdrawalAuto withdrawalAuto) {
         withdrawalAuto.setPkModified(SecurityUtils.getUserId());
         withdrawalAuto.setModifiedTime(new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_AUTO + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalAutoService.updateById(withdrawalAuto));
+        return toAjax(iBdWithdrawalAutoService.updateById(withdrawalAuto));
     }
 
-
     /**
-     * @description: 查询单条自动提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 查询单条自动提现设置
      **/
     @GetMapping("/getOne/{pkId}")
     public AjaxResult getOne(@PathVariable Long pkId) {
-        BdWithdrawalAuto withdrawalAuto = withdrawalAutoService.getById(pkId);
+        BdWithdrawalAuto withdrawalAuto = iBdWithdrawalAutoService.getById(pkId);
         return AjaxResult.success(withdrawalAuto);
     }
 
-
     /**
-     * @description: 删除自动提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 删除自动提现设置
      **/
     @DeleteMapping("/{pkId}")
     public AjaxResult delete(@PathVariable Long pkId) {
-        UpdateWrapper<BdWithdrawalAuto> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("PK_ID", pkId);
-        updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
-        updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId());
-        updateWrapper.set("MODIFIED_TIME", new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_AUTO + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalAutoService.update(updateWrapper));
+        LambdaUpdateWrapper<BdWithdrawalAuto> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(BdWithdrawalAuto::getPkId, pkId);
+        updateWrapper.set(BdWithdrawalAuto::getDelFlag, EDelFlag.DELETE.getValue());
+        updateWrapper.set(BdWithdrawalAuto::getPkModified, SecurityUtils.getUserId());
+        updateWrapper.set(BdWithdrawalAuto::getModifiedTime, new Date());
+        return toAjax(iBdWithdrawalAutoService.update(updateWrapper));
     }
+
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdWithdrawalController.java

@@ -1,15 +1,12 @@
 package com.hzs.system.config.controller.manage;
 
-
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.enums.*;
-import com.hzs.common.core.service.RedisService;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.poi.ExcelUtil;
 import com.hzs.common.core.web.controller.BaseController;
@@ -21,13 +18,10 @@ import com.hzs.common.domain.system.config.ext.BdWithdrawalAutoExt;
 import com.hzs.common.domain.system.config.ext.BdWithdrawalExt;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.util.TransactionUtils;
-import com.hzs.system.base.ITransactionServiceApi;
 import com.hzs.system.base.service.IBdCurrencyService;
-import com.hzs.system.config.IWithdrawalServiceApi;
 import com.hzs.system.config.service.IBdWithdrawalAutoService;
 import com.hzs.system.config.service.IBdWithdrawalService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,12 +32,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 提现设置主表 前端控制器
- * </p>
- *
- * @author zhangjing
- * @since 2022-08-29
  */
 @Slf4j
 @RestController
@@ -51,58 +40,42 @@ import java.util.List;
 public class BdWithdrawalController extends BaseController {
 
     @Autowired
-    private IBdWithdrawalService withdrawalService;
-    @DubboReference
-    private ITransactionServiceApi iTransactionServiceApi;
-    private RedisService redisService;
-    @DubboReference
-    private IWithdrawalServiceApi withdrawalServiceApi;
+    private IBdWithdrawalService iBdWithdrawalService;
     @Autowired
-    private IBdWithdrawalAutoService withdrawalAutoService;
+    private IBdWithdrawalAutoService iBdWithdrawalAutoService;
     @Autowired
-    IBdCurrencyService currencyService;
-
-
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
-
+    private IBdCurrencyService iBdCurrencyService;
 
     /**
-     * @description: 查询提现设置列表 理论每个国家只有一个提现配置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:20
-     * @param: [withdrawalParam]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
+     * 查询提现设置列表 理论每个国家只有一个提现配置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_CONFIG,method = EOperationMethod.SELECT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_CONFIG, method = EOperationMethod.SELECT)
     @GetMapping("/list")
     public TableDataInfo list(BdWithdrawalExt withdrawalExt) {
         startPage();
         withdrawalExt.setPkCountry(SecurityUtils.getPkCountry());
-        List<BdWithdrawalExt> listExt = withdrawalService.listExt(withdrawalExt);
-        for(BdWithdrawalExt bwd: listExt){
-             //暂时使用中国
-            if(StringUtils.isNotNull(bwd.getMinAmount())){
-                bwd.setMinAmountUsa(currencyService.getDollar(bwd.getMinAmount(),SecurityUtils.getPkCountry()));
+        List<BdWithdrawalExt> listExt = iBdWithdrawalService.listExt(withdrawalExt);
+        for (BdWithdrawalExt bwd : listExt) {
+            //暂时使用中国
+            if (StringUtils.isNotNull(bwd.getMinAmount())) {
+                bwd.setMinAmountUsa(iBdCurrencyService.getDollar(bwd.getMinAmount(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getMaxAmount())){
-                bwd.setMaxAmountUsa(currencyService.getDollar(bwd.getMaxAmount(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getMaxAmount())) {
+                bwd.setMaxAmountUsa(iBdCurrencyService.getDollar(bwd.getMaxAmount(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getLowerBound())){
-                bwd.setLowerBoundUsa(currencyService.getDollar(bwd.getLowerBound(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getLowerBound())) {
+                bwd.setLowerBoundUsa(iBdCurrencyService.getDollar(bwd.getLowerBound(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getUpperBound())){
-                bwd.setUpperBoundUsa(currencyService.getDollar(bwd.getUpperBound(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getUpperBound())) {
+                bwd.setUpperBoundUsa(iBdCurrencyService.getDollar(bwd.getUpperBound(), SecurityUtils.getPkCountry()));
             }
 
-            QueryWrapper<BdWithdrawalAuto> queryWrapperAuto = new QueryWrapper();
-            queryWrapperAuto.eq("PK_COUNTRY",SecurityUtils.getPkCountry());
-            if(StringUtils.isNotNull(bwd.getPkId())){
-                queryWrapperAuto.eq("PK_WITHDRAWAL",bwd.getPkId());
+            LambdaQueryWrapper<BdWithdrawalAuto> queryWrapperAuto = new LambdaQueryWrapper<>();
+            queryWrapperAuto.eq(BdWithdrawalAuto::getPkCountry, SecurityUtils.getPkCountry());
+            if (StringUtils.isNotNull(bwd.getPkId())) {
+                queryWrapperAuto.eq(BdWithdrawalAuto::getPkWithdrawal, bwd.getPkId());
             }
-            List<BdWithdrawalAuto> listAuto = withdrawalAutoService.list(queryWrapperAuto);
+            List<BdWithdrawalAuto> listAuto = iBdWithdrawalAutoService.list(queryWrapperAuto);
             List<BdWithdrawalAutoExt> watExtList = new ArrayList<>();
             listAuto.forEach(item -> watExtList.add(BeanUtil.copyProperties(item, BdWithdrawalAutoExt.class)));
             bwd.setWithdrawalAutoList(watExtList);
@@ -111,42 +84,38 @@ public class BdWithdrawalController extends BaseController {
     }
 
     /**
-     * @description: 导出提现配置
-     * @author: zhang jing
-     * @date: 2023/3/3 16:19
-     * @param: [response, withdrawalExt]
-     * @return: void
+     * 导出提现配置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_CONFIG,method = EOperationMethod.EXPORT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_CONFIG, method = EOperationMethod.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BdWithdrawalExt withdrawalExt) {
-        QueryWrapper<BdWithdrawal> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("PK_COUNTRY",SecurityUtils.getPkCountry());
-        queryWrapper.orderByDesc("CREATION_TIME");
-        List<BdWithdrawal> list = withdrawalService.list(queryWrapper);
-        List<BdWithdrawalExt> listExt=new ArrayList<>();
-        for(BdWithdrawal bwd: list){
-            BdWithdrawalExt withdrawalExtNew= BeanUtil.copyProperties(bwd, BdWithdrawalExt.class);
+    public void export(HttpServletResponse response) {
+        LambdaQueryWrapper<BdWithdrawal> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawal::getPkCountry, SecurityUtils.getPkCountry());
+        queryWrapper.orderByDesc(BdWithdrawal::getCreationTime);
+        List<BdWithdrawal> list = iBdWithdrawalService.list(queryWrapper);
+        List<BdWithdrawalExt> listExt = new ArrayList<>();
+        for (BdWithdrawal bwd : list) {
+            BdWithdrawalExt withdrawalExtNew = BeanUtil.copyProperties(bwd, BdWithdrawalExt.class);
             //暂时使用中国
-            if(StringUtils.isNotNull(bwd.getMinAmount())){
-                withdrawalExtNew.setMinAmountUsa(currencyService.getDollar(bwd.getMinAmount(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getMinAmount())) {
+                withdrawalExtNew.setMinAmountUsa(iBdCurrencyService.getDollar(bwd.getMinAmount(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getMaxAmount())){
-                withdrawalExtNew.setMaxAmountUsa(currencyService.getDollar(bwd.getMaxAmount(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getMaxAmount())) {
+                withdrawalExtNew.setMaxAmountUsa(iBdCurrencyService.getDollar(bwd.getMaxAmount(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getLowerBound())){
-                withdrawalExtNew.setLowerBoundUsa(currencyService.getDollar(bwd.getLowerBound(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getLowerBound())) {
+                withdrawalExtNew.setLowerBoundUsa(iBdCurrencyService.getDollar(bwd.getLowerBound(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getUpperBound())){
-                withdrawalExtNew.setUpperBoundUsa(currencyService.getDollar(bwd.getUpperBound(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getUpperBound())) {
+                withdrawalExtNew.setUpperBoundUsa(iBdCurrencyService.getDollar(bwd.getUpperBound(), SecurityUtils.getPkCountry()));
             }
 
-            QueryWrapper<BdWithdrawalAuto> queryWrapperAuto = new QueryWrapper();
-            queryWrapperAuto.eq("PK_COUNTRY",SecurityUtils.getPkCountry());
-            if(StringUtils.isNotNull(bwd.getPkId())){
-                queryWrapperAuto.eq("PK_WITHDRAWAL",bwd.getPkId());
+            LambdaQueryWrapper<BdWithdrawalAuto> queryWrapperAuto = new LambdaQueryWrapper<>();
+            queryWrapperAuto.eq(BdWithdrawalAuto::getPkCountry, SecurityUtils.getPkCountry());
+            if (StringUtils.isNotNull(bwd.getPkId())) {
+                queryWrapperAuto.eq(BdWithdrawalAuto::getPkWithdrawal, bwd.getPkId());
             }
-            List<BdWithdrawalAuto> listAuto = withdrawalAutoService.list(queryWrapperAuto);
+            List<BdWithdrawalAuto> listAuto = iBdWithdrawalAutoService.list(queryWrapperAuto);
             List<BdWithdrawalAutoExt> watExtList = new ArrayList<>();
             listAuto.forEach(item -> watExtList.add(BeanUtil.copyProperties(item, BdWithdrawalAutoExt.class)));
             withdrawalExtNew.setWithdrawalAutoList(watExtList);
@@ -157,43 +126,39 @@ public class BdWithdrawalController extends BaseController {
     }
 
     /**
-     * @description: 提现手续费配置，理论每个国家只有一个提现配置
-     * @author: zhang jing
-     * @date: 2022/11/2 11:38
-     * @param: [withdrawalExt]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
+     * 提现手续费配置，理论每个国家只有一个提现配置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_CONFIG,method = EOperationMethod.SELECT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_CONFIG, method = EOperationMethod.SELECT)
     @GetMapping("/serviceChargelist")
-    public TableDataInfo serviceChargelist(BdWithdrawalExt withdrawalExt) {
+    public TableDataInfo serviceChargelist() {
         startPage();
-        QueryWrapper<BdWithdrawal> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("PK_COUNTRY",SecurityUtils.getPkCountry());
-        queryWrapper.orderByDesc("CREATION_TIME");
-        List<BdWithdrawal> list = withdrawalService.list(queryWrapper);
-        List<BdWithdrawalExt> listExt=new ArrayList<>();
-        for(BdWithdrawal bwd: list){
-            BdWithdrawalExt withdrawalExtNew= BeanUtil.copyProperties(bwd, BdWithdrawalExt.class);
+        LambdaQueryWrapper<BdWithdrawal> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawal::getPkCountry, SecurityUtils.getPkCountry());
+        queryWrapper.orderByDesc(BdWithdrawal::getCreationTime);
+        List<BdWithdrawal> list = iBdWithdrawalService.list(queryWrapper);
+        List<BdWithdrawalExt> listExt = new ArrayList<>();
+        for (BdWithdrawal bwd : list) {
+            BdWithdrawalExt withdrawalExtNew = BeanUtil.copyProperties(bwd, BdWithdrawalExt.class);
             //暂时使用中国
-            if(StringUtils.isNotNull(bwd.getMinAmount())){
-                withdrawalExtNew.setMinAmountUsa(currencyService.getDollar(bwd.getMinAmount(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getMinAmount())) {
+                withdrawalExtNew.setMinAmountUsa(iBdCurrencyService.getDollar(bwd.getMinAmount(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getMaxAmount())){
-                withdrawalExtNew.setMaxAmountUsa(currencyService.getDollar(bwd.getMaxAmount(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getMaxAmount())) {
+                withdrawalExtNew.setMaxAmountUsa(iBdCurrencyService.getDollar(bwd.getMaxAmount(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getLowerBound())){
-                withdrawalExtNew.setLowerBoundUsa(currencyService.getDollar(bwd.getLowerBound(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getLowerBound())) {
+                withdrawalExtNew.setLowerBoundUsa(iBdCurrencyService.getDollar(bwd.getLowerBound(), SecurityUtils.getPkCountry()));
             }
-            if(StringUtils.isNotNull(bwd.getUpperBound())){
-                withdrawalExtNew.setUpperBoundUsa(currencyService.getDollar(bwd.getUpperBound(),SecurityUtils.getPkCountry()));
+            if (StringUtils.isNotNull(bwd.getUpperBound())) {
+                withdrawalExtNew.setUpperBoundUsa(iBdCurrencyService.getDollar(bwd.getUpperBound(), SecurityUtils.getPkCountry()));
             }
 
-            QueryWrapper<BdWithdrawalAuto> queryWrapperAuto = new QueryWrapper();
-            queryWrapperAuto.eq("PK_COUNTRY",SecurityUtils.getPkCountry());
-            if(StringUtils.isNotNull(bwd.getPkId())){
-                queryWrapperAuto.eq("PK_WITHDRAWAL",bwd.getPkId());
+            LambdaQueryWrapper<BdWithdrawalAuto> queryWrapperAuto = new LambdaQueryWrapper<>();
+            queryWrapperAuto.eq(BdWithdrawalAuto::getPkCountry, SecurityUtils.getPkCountry());
+            if (StringUtils.isNotNull(bwd.getPkId())) {
+                queryWrapperAuto.eq(BdWithdrawalAuto::getPkWithdrawal, bwd.getPkId());
             }
-            List<BdWithdrawalAuto> listAuto = withdrawalAutoService.list(queryWrapperAuto);
+            List<BdWithdrawalAuto> listAuto = iBdWithdrawalAutoService.list(queryWrapperAuto);
             List<BdWithdrawalAutoExt> watExtList = new ArrayList<>();
             listAuto.forEach(item -> watExtList.add(BeanUtil.copyProperties(item, BdWithdrawalAutoExt.class)));
             withdrawalExtNew.setWithdrawalAutoList(watExtList);
@@ -202,157 +167,134 @@ public class BdWithdrawalController extends BaseController {
         return getDataTable(listExt);
     }
 
-
     /**
-     * @description: 新增提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [withdrawalParam]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 新增提现设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_CONFIG,method = EOperationMethod.INSERT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_CONFIG, method = EOperationMethod.INSERT)
     @PostMapping("/save")
     public AjaxResult save(@RequestBody @Valid BdWithdrawalExt withdrawalExt) {
-        if(StringUtils.isNull(withdrawalExt.getMinAmount())){
+        if (StringUtils.isNull(withdrawalExt.getMinAmount())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MIN_AMOUNT_NOT_NULL));
         }
-        if(StringUtils.isNull(withdrawalExt.getMaxAmount())){
+        if (StringUtils.isNull(withdrawalExt.getMaxAmount())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MAX_AMOUNT_NOT_NULL));
         }
-        if (withdrawalExt.getMaxAmount().compareTo(withdrawalExt.getMinAmount()) <0) {
+        if (withdrawalExt.getMaxAmount().compareTo(withdrawalExt.getMinAmount()) < 0) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMPARISON_OF_SIZE));
         }
-        if(StringUtils.isNull(withdrawalExt.getIsAuto())){
+        if (StringUtils.isNull(withdrawalExt.getIsAuto())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.IS_AUTO_NOT_NULL));
         }
-        if(StringUtils.isNull(withdrawalExt.getIsRounding())){
+        if (StringUtils.isNull(withdrawalExt.getIsRounding())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.IS_ROUNDING_NOT_NULL));
         }
-        if(StringUtils.isNull(withdrawalExt.getWithdrawalNumber())){
+        if (StringUtils.isNull(withdrawalExt.getWithdrawalNumber())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.WITHDRAWAL_NUMBER_NOT_NULL));
         }
-        if(EYesNo.YES.getIntValue()==withdrawalExt.getIsAuto()){
-            if(StringUtils.isNull(withdrawalExt.getLowerBound())){
+        if (EYesNo.YES.getIntValue() == withdrawalExt.getIsAuto()) {
+            if (StringUtils.isNull(withdrawalExt.getLowerBound())) {
                 return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LOWER_BOUND_NOT_NULL));
             }
-            if(StringUtils.isNull(withdrawalExt.getUpperBound())){
+            if (StringUtils.isNull(withdrawalExt.getUpperBound())) {
                 return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.UPPER_BOUND_NOT_NULL));
             }
-            if(CollectionUtil.isEmpty(withdrawalExt.getWithdrawalAutoList())){
+            if (CollectionUtil.isEmpty(withdrawalExt.getWithdrawalAutoList())) {
                 return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.WITHDRAWAL_CYCLE_NOT_NULL));
             }
         }
-        if(StringUtils.isNull(withdrawalExt.getEffectiveDate())){
+        if (StringUtils.isNull(withdrawalExt.getEffectiveDate())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL));
         }
         withdrawalExt.setPkCountry(SecurityUtils.getPkCountry());
         withdrawalExt.setPkCreator(SecurityUtils.getUserId());
         withdrawalExt.setCreationTime(new Date());
-        return toAjax(withdrawalService.saveWithdrawal(withdrawalExt));
+        return toAjax(iBdWithdrawalService.saveWithdrawal(withdrawalExt));
     }
 
-
     /**
-     * @description: 修改提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [withdrawalParam]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 修改提现设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_CONFIG,method = EOperationMethod.UPDATE)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_CONFIG, method = EOperationMethod.UPDATE)
     @PostMapping("/update")
     public AjaxResult update(@RequestBody BdWithdrawalExt withdrawalExt) {
-        if(StringUtils.isNull(withdrawalExt.getMinAmount())){
+        if (StringUtils.isNull(withdrawalExt.getMinAmount())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MIN_AMOUNT_NOT_NULL));
         }
-        if(StringUtils.isNull(withdrawalExt.getMaxAmount())){
+        if (StringUtils.isNull(withdrawalExt.getMaxAmount())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MAX_AMOUNT_NOT_NULL));
         }
-        if (withdrawalExt.getMaxAmount().compareTo(withdrawalExt.getMinAmount()) <0) {
+        if (withdrawalExt.getMaxAmount().compareTo(withdrawalExt.getMinAmount()) < 0) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.COMPARISON_OF_SIZE));
         }
-        if(StringUtils.isNull(withdrawalExt.getIsAuto())){
+        if (StringUtils.isNull(withdrawalExt.getIsAuto())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.IS_AUTO_NOT_NULL));
         }
-        if(StringUtils.isNull(withdrawalExt.getIsRounding())){
+        if (StringUtils.isNull(withdrawalExt.getIsRounding())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.IS_ROUNDING_NOT_NULL));
         }
-        if(StringUtils.isNull(withdrawalExt.getWithdrawalNumber())){
+        if (StringUtils.isNull(withdrawalExt.getWithdrawalNumber())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.WITHDRAWAL_NUMBER_NOT_NULL));
         }
 
-        if(StringUtils.isNull(withdrawalExt.getEffectiveDate())){
+        if (StringUtils.isNull(withdrawalExt.getEffectiveDate())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL));
         }
-        if(EYesNo.YES.getIntValue()==withdrawalExt.getIsAuto()){
-            if(StringUtils.isNull(withdrawalExt.getLowerBound())){
+        if (EYesNo.YES.getIntValue() == withdrawalExt.getIsAuto()) {
+            if (StringUtils.isNull(withdrawalExt.getLowerBound())) {
                 return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LOWER_BOUND_NOT_NULL));
             }
-            if(StringUtils.isNull(withdrawalExt.getUpperBound())){
+            if (StringUtils.isNull(withdrawalExt.getUpperBound())) {
                 return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.UPPER_BOUND_NOT_NULL));
             }
-            if(CollectionUtil.isEmpty(withdrawalExt.getWithdrawalAutoList())){
+            if (CollectionUtil.isEmpty(withdrawalExt.getWithdrawalAutoList())) {
                 return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.WITHDRAWAL_CYCLE_NOT_NULL));
             }
         }
-        if(StringUtils.isNull(withdrawalExt.getEffectiveDate())){
+        if (StringUtils.isNull(withdrawalExt.getEffectiveDate())) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL));
         }
         withdrawalExt.setPkModified(SecurityUtils.getUserId());
         withdrawalExt.setModifiedTime(new Date());
-        return toAjax(withdrawalService.updateWithdrawal(withdrawalExt));
+        return toAjax(iBdWithdrawalService.updateWithdrawal(withdrawalExt));
     }
 
-
     /**
-     * @description: 查询单条提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 查询单条提现设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_CONFIG,method = EOperationMethod.SELECT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_CONFIG, method = EOperationMethod.SELECT)
     @GetMapping("/getOne/{pkId}")
     public AjaxResult getOne(@PathVariable Integer pkId) {
-        BdWithdrawal withdrawalParam = withdrawalService.getById(pkId);
+        BdWithdrawal withdrawalParam = iBdWithdrawalService.getById(pkId);
         BdWithdrawalExt withdrawalExt = BeanUtil.copyProperties(withdrawalParam, BdWithdrawalExt.class);
-        BdWithdrawalAutoExt withdrawalAutoExt=new BdWithdrawalAutoExt();
+        BdWithdrawalAutoExt withdrawalAutoExt = new BdWithdrawalAutoExt();
         withdrawalAutoExt.setPkWithdrawal(pkId);
-        List<BdWithdrawalAutoExt> withdrawalAutoList =withdrawalService.getWithdrawalAutoList(withdrawalAutoExt);
-        if(CollectionUtil.isNotEmpty(withdrawalAutoList)){
+        List<BdWithdrawalAutoExt> withdrawalAutoList = iBdWithdrawalService.getWithdrawalAutoList(withdrawalAutoExt);
+        if (CollectionUtil.isNotEmpty(withdrawalAutoList)) {
             withdrawalExt.setWithdrawalAutoList(withdrawalAutoList);
-        }else{
-            List<BdWithdrawalAutoExt> withdrawalAutoListNew=new ArrayList<>();
+        } else {
+            List<BdWithdrawalAutoExt> withdrawalAutoListNew = new ArrayList<>();
             withdrawalExt.setWithdrawalAutoList(withdrawalAutoListNew);
         }
         return AjaxResult.success(withdrawalExt);
     }
 
-
     /**
-     * @description: 删除提现设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 删除提现设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_CONFIG,method = EOperationMethod.DELETE)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_CONFIG, method = EOperationMethod.DELETE)
     @DeleteMapping("/{pkId}")
     public AjaxResult delete(@PathVariable Long pkId) {
-        BdWithdrawalAutoExt withdrawalAutoExt =new BdWithdrawalAutoExt();
+        BdWithdrawalAutoExt withdrawalAutoExt = new BdWithdrawalAutoExt();
         withdrawalAutoExt.setPkCountry(SecurityUtils.getPkCountry());
-        Integer count= withdrawalService.checkWithdraw(withdrawalAutoExt);
-        if(count>0){
+        Integer count = iBdWithdrawalService.checkWithdraw(withdrawalAutoExt);
+        if (count > 0) {
             return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE));
         }
-        UpdateWrapper<BdWithdrawal> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("PK_ID", pkId);
-        updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
-        updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId());
-        updateWrapper.set("MODIFIED_TIME", new Date());
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL + SecurityUtils.getPkCountry());
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL_IS_AUTO + SecurityUtils.getPkCountry());
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL_AUTO + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalService.update(updateWrapper));
+        LambdaUpdateWrapper<BdWithdrawal> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(BdWithdrawal::getPkId, pkId);
+        updateWrapper.set(BdWithdrawal::getDelFlag, EDelFlag.DELETE.getValue());
+        updateWrapper.set(BdWithdrawal::getPkModified, SecurityUtils.getUserId());
+        updateWrapper.set(BdWithdrawal::getModifiedTime, new Date());
+        return toAjax(iBdWithdrawalService.update(updateWrapper));
     }
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdWithdrawalProcessController.java

@@ -1,17 +1,14 @@
 package com.hzs.system.config.controller.manage;
 
-
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.enums.EDelFlag;
 import com.hzs.common.core.enums.EOperationBusiness;
 import com.hzs.common.core.enums.EOperationMethod;
 import com.hzs.common.core.enums.EOperationModule;
-import com.hzs.common.core.service.RedisService;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.poi.ExcelUtil;
 import com.hzs.common.core.web.controller.BaseController;
@@ -21,12 +18,8 @@ import com.hzs.common.domain.system.config.BdWithdrawalProcess;
 import com.hzs.common.domain.system.config.ext.BdWithdrawalAutoExt;
 import com.hzs.common.domain.system.config.ext.BdWithdrawalProcessExt;
 import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.system.base.ITransactionServiceApi;
-import com.hzs.system.base.service.IBdCurrencyService;
-import com.hzs.system.config.IWithdrawalServiceApi;
 import com.hzs.system.config.service.IBdWithdrawalProcessService;
 import com.hzs.system.config.service.IBdWithdrawalService;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,175 +30,127 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 提现手续费手续费配置 前端控制器
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-02
  */
 @RestController
 @RequestMapping("/manage/bd-withdrawal-process")
 public class BdWithdrawalProcessController extends BaseController {
 
     @Autowired
-    private IBdWithdrawalProcessService withdrawalProcessService;
-    @DubboReference
-    private ITransactionServiceApi iTransactionServiceApi;
-    private RedisService redisService;
-    @DubboReference
-    private IWithdrawalServiceApi withdrawalProcessServiceApi;
+    private IBdWithdrawalProcessService iBdWithdrawalProcessService;
     @Autowired
-    private IBdWithdrawalService withdrawalService;
-    @Autowired
-    IBdCurrencyService currencyService;
-
-
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
+    private IBdWithdrawalService iBdWithdrawalService;
 
 
     /**
-     * @description: 查询提现手续费设置列表 理论每个国家只有一个提现手续费配置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:20
-     * @param: [withdrawalParam]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
+     * 查询提现手续费设置列表 理论每个国家只有一个提现手续费配置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE,method = EOperationMethod.SELECT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE, method = EOperationMethod.SELECT)
     @GetMapping("/list")
-    public TableDataInfo list(BdWithdrawalProcess withdrawalProcess) {
+    public TableDataInfo list() {
         startPage();
-        QueryWrapper<BdWithdrawalProcess> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry());
-        queryWrapper.orderByDesc("CREATION_TIME");
-        List<BdWithdrawalProcess> list = withdrawalProcessService.list(queryWrapper);
-        List<BdWithdrawalProcessExt> listExt=new ArrayList<>();
+        LambdaQueryWrapper<BdWithdrawalProcess> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawalProcess::getPkCountry, SecurityUtils.getPkCountry());
+        queryWrapper.orderByDesc(BdWithdrawalProcess::getCreationTime);
+        List<BdWithdrawalProcess> list = iBdWithdrawalProcessService.list(queryWrapper);
+        List<BdWithdrawalProcessExt> listExt = new ArrayList<>();
         list.forEach(item -> listExt.add(BeanUtil.copyProperties(item, BdWithdrawalProcessExt.class)));
         return getDataTable(listExt);
     }
 
     /**
-     * @description: 导出提现手续费配置
-     * @author: zhang jing
-     * @date: 2023/3/3 17:07
-     * @param: [response, withdrawalProcess]
-     * @return: void
+     * 导出提现手续费配置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE,method = EOperationMethod.EXPORT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE, method = EOperationMethod.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BdWithdrawalProcess withdrawalProcess) {
-        QueryWrapper<BdWithdrawalProcess> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry());
-        queryWrapper.orderByDesc("CREATION_TIME");
-        List<BdWithdrawalProcess> list = withdrawalProcessService.list(queryWrapper);
-        List<BdWithdrawalProcessExt> listExt=new ArrayList<>();
+    public void export(HttpServletResponse response) {
+        LambdaQueryWrapper<BdWithdrawalProcess> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawalProcess::getPkCountry, SecurityUtils.getPkCountry());
+        queryWrapper.orderByDesc(BdWithdrawalProcess::getCreationTime);
+        List<BdWithdrawalProcess> list = iBdWithdrawalProcessService.list(queryWrapper);
+        List<BdWithdrawalProcessExt> listExt = new ArrayList<>();
         list.forEach(item -> listExt.add(BeanUtil.copyProperties(item, BdWithdrawalProcessExt.class)));
         ExcelUtil<BdWithdrawalProcessExt> util = new ExcelUtil<>(BdWithdrawalProcessExt.class);
         util.exportExcel(response, listExt, "提现手续费配置");
     }
 
     /**
-     * @description: 新增提现手续费设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [withdrawalParam]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 新增提现手续费设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE,method = EOperationMethod.INSERT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE, method = EOperationMethod.INSERT)
     @PostMapping("/save")
     public AjaxResult save(@RequestBody @Valid BdWithdrawalProcess withdrawalProcess) {
-        if(StringUtils.isNull(withdrawalProcess.getServiceType())){
+        if (StringUtils.isNull(withdrawalProcess.getServiceType())) {
             return AjaxResult.error(ConfigMsgConstants.SERVICE_TYPE_NOT_NULL);
         }
-        if(StringUtils.isNull(withdrawalProcess.getServiceRatio())){
+        if (StringUtils.isNull(withdrawalProcess.getServiceRatio())) {
             return AjaxResult.error(ConfigMsgConstants.SERVICE_RATIO_NOT_NULL);
         }
-        if(StringUtils.isNull(withdrawalProcess.getEffectiveDate())){
+        if (StringUtils.isNull(withdrawalProcess.getEffectiveDate())) {
             return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL);
         }
-        QueryWrapper<BdWithdrawalProcess> queryWrapper=new QueryWrapper();
-        queryWrapper.eq("PK_COUNTRY",SecurityUtils.getPkCountry());
-        BdWithdrawalProcess withdrawalProcessCheck=withdrawalProcessService.getOne(queryWrapper);
-        if(StringUtils.isNotNull(withdrawalProcessCheck)){
+        LambdaQueryWrapper<BdWithdrawalProcess> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawalProcess::getPkCountry, SecurityUtils.getPkCountry());
+        BdWithdrawalProcess withdrawalProcessCheck = iBdWithdrawalProcessService.getOne(queryWrapper);
+        if (StringUtils.isNotNull(withdrawalProcessCheck)) {
             return AjaxResult.error(ConfigMsgConstants.SERVICE_TYPE_REPEAT);
         }
         withdrawalProcess.setPkCountry(SecurityUtils.getPkCountry());
         withdrawalProcess.setPkCreator(SecurityUtils.getUserId());
         withdrawalProcess.setCreationTime(new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_PROCESS + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalProcessService.save(withdrawalProcess));
+        return toAjax(iBdWithdrawalProcessService.save(withdrawalProcess));
     }
 
-
     /**
-     * @description: 修改提现手续费设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [withdrawalParam]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 修改提现手续费设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE,method = EOperationMethod.UPDATE)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE, method = EOperationMethod.UPDATE)
     @PostMapping("/update")
     public AjaxResult update(@RequestBody BdWithdrawalProcess withdrawalProcess) {
-        if(StringUtils.isNull(withdrawalProcess.getServiceType())){
+        if (StringUtils.isNull(withdrawalProcess.getServiceType())) {
             return AjaxResult.error(ConfigMsgConstants.SERVICE_TYPE_NOT_NULL);
         }
-        if(StringUtils.isNull(withdrawalProcess.getServiceRatio())){
+        if (StringUtils.isNull(withdrawalProcess.getServiceRatio())) {
             return AjaxResult.error(ConfigMsgConstants.SERVICE_RATIO_NOT_NULL);
         }
-        if(StringUtils.isNull(withdrawalProcess.getEffectiveDate())){
+        if (StringUtils.isNull(withdrawalProcess.getEffectiveDate())) {
             return AjaxResult.error(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL);
         }
         withdrawalProcess.setPkCountry(SecurityUtils.getPkCountry());
         withdrawalProcess.setPkModified(SecurityUtils.getUserId());
         withdrawalProcess.setModifiedTime(new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_PROCESS + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalProcessService.updateById(withdrawalProcess));
+        return toAjax(iBdWithdrawalProcessService.updateById(withdrawalProcess));
     }
 
-
     /**
-     * @description: 查询单条提现手续费设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 查询单条提现手续费设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE,method = EOperationMethod.SELECT)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE, method = EOperationMethod.SELECT)
     @GetMapping("/getOne/{pkId}")
     public AjaxResult getOne(@PathVariable Integer pkId) {
-        BdWithdrawalProcess withdrawalProcess = withdrawalProcessService.getById(pkId);
+        BdWithdrawalProcess withdrawalProcess = iBdWithdrawalProcessService.getById(pkId);
         BdWithdrawalProcessExt withdrawalProcessExt = BeanUtil.copyProperties(withdrawalProcess, BdWithdrawalProcessExt.class);
         return AjaxResult.success(withdrawalProcessExt);
     }
 
-
     /**
-     * @description: 删除提现手续费设置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 删除提现手续费设置
      **/
-    @Log(module = EOperationModule.WALLET_CONFIG,business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE,method = EOperationMethod.DELETE)
+    @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.WITHDRAWAL_SERVICE_CHARGE, method = EOperationMethod.DELETE)
     @DeleteMapping("/{pkId}")
     public AjaxResult delete(@PathVariable Long pkId) {
-        BdWithdrawalAutoExt withdrawalAutoExt =new BdWithdrawalAutoExt();
+        BdWithdrawalAutoExt withdrawalAutoExt = new BdWithdrawalAutoExt();
         withdrawalAutoExt.setPkCountry(SecurityUtils.getPkCountry());
-        Integer count= withdrawalService.checkWithdraw(withdrawalAutoExt);
-        if(count>0){
+        Integer count = iBdWithdrawalService.checkWithdraw(withdrawalAutoExt);
+        if (count > 0) {
             return AjaxResult.error(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE);
         }
-        UpdateWrapper<BdWithdrawalProcess> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("PK_ID", pkId);
-        updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
-        updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId());
-        updateWrapper.set("MODIFIED_TIME", new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalProcessService.update(updateWrapper));
+        LambdaUpdateWrapper<BdWithdrawalProcess> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(BdWithdrawalProcess::getPkId, pkId);
+        updateWrapper.set(BdWithdrawalProcess::getDelFlag, EDelFlag.DELETE.getValue());
+        updateWrapper.set(BdWithdrawalProcess::getPkModified, SecurityUtils.getUserId());
+        updateWrapper.set(BdWithdrawalProcess::getModifiedTime, new Date());
+        return toAjax(iBdWithdrawalProcessService.update(updateWrapper));
     }
 
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdWithdrawalSpecialController.java

@@ -1,13 +1,10 @@
 package com.hzs.system.config.controller.manage;
 
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.hzs.common.core.constant.CacheConstants;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.hzs.common.core.constant.msg.ConfigMsgConstants;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.EDelFlag;
-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;
@@ -27,12 +24,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 提现设置特殊配置 前端控制器
- * </p>
- *
- * @author zhangjing
- * @since 2022-09-06
  */
 @Slf4j
 @RestController
@@ -40,44 +32,29 @@ import java.util.List;
 public class BdWithdrawalSpecialController extends BaseController {
 
     @Autowired
-    private IBdWithdrawalSpecialService withdrawalSpecialService;
+    private IBdWithdrawalSpecialService iBdWithdrawalSpecialService;
+
     @DubboReference
     IMemberServiceApi iMemberServiceApi;
 
-    private RedisService redisService;
-
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
-
     /**
-     * @description: 查询提现设置特殊配置列表
-     * @author: zhang jing
-     * @date: 2022/8/30 10:20
-     * @param: [bdWithdrawal]
-     * @return: com.hzs.common.core.web.page.TableDataInfo
+     * 查询提现设置特殊配置列表
      **/
     @GetMapping("/list")
     public TableDataInfo list(BdWithdrawalSpecial withdrawalSpecial) {
         startPage();
-        QueryWrapper<BdWithdrawalSpecial> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry());
+        LambdaQueryWrapper<BdWithdrawalSpecial> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawalSpecial::getPkCountry, SecurityUtils.getPkCountry());
         if (StringUtils.isNotNull(withdrawalSpecial.getPkWithdrawal())) {
-            queryWrapper.eq("PK_WITHDRAWAL", withdrawalSpecial.getPkWithdrawal());
+            queryWrapper.eq(BdWithdrawalSpecial::getPkWithdrawal, withdrawalSpecial.getPkWithdrawal());
         }
-        queryWrapper.orderByDesc("CREATION_TIME");
-        List<BdWithdrawalSpecial> list = withdrawalSpecialService.list(queryWrapper);
+        queryWrapper.orderByDesc(BdWithdrawalSpecial::getCreationTime);
+        List<BdWithdrawalSpecial> list = iBdWithdrawalSpecialService.list(queryWrapper);
         return getDataTable(list);
     }
 
-
     /**
-     * @description: 新增提现设置特殊配置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [bdWithdrawal]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 新增提现设置特殊配置
      **/
     @PostMapping("/save")
     public AjaxResult save(@RequestBody BdWithdrawalSpecial withdrawalSpecial) {
@@ -92,17 +69,11 @@ public class BdWithdrawalSpecialController extends BaseController {
         withdrawalSpecial.setPkCountry(SecurityUtils.getPkCountry());
         withdrawalSpecial.setPkCreator(SecurityUtils.getUserId());
         withdrawalSpecial.setCreationTime(new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_SPECIAL + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalSpecialService.save(withdrawalSpecial));
+        return toAjax(iBdWithdrawalSpecialService.save(withdrawalSpecial));
     }
 
-
     /**
-     * @description: 修改提现设置特殊配置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [bdWithdrawal]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 修改提现设置特殊配置
      **/
     @PostMapping("/update")
     public AjaxResult update(@RequestBody BdWithdrawalSpecial withdrawalSpecial) {
@@ -116,40 +87,28 @@ public class BdWithdrawalSpecialController extends BaseController {
         }
         withdrawalSpecial.setPkModified(SecurityUtils.getUserId());
         withdrawalSpecial.setModifiedTime(new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_SPECIAL + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalSpecialService.updateById(withdrawalSpecial));
+        return toAjax(iBdWithdrawalSpecialService.updateById(withdrawalSpecial));
     }
 
-
     /**
-     * @description: 查询单条提现设置特殊配置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 查询单条提现设置特殊配置
      **/
     @GetMapping("/getOne/{pkId}")
     public AjaxResult getOne(@PathVariable Long pkId) {
-        BdWithdrawalSpecial withdrawalSpecial = withdrawalSpecialService.getById(pkId);
+        BdWithdrawalSpecial withdrawalSpecial = iBdWithdrawalSpecialService.getById(pkId);
         return AjaxResult.success(withdrawalSpecial);
     }
 
-
     /**
-     * @description: 删除提现设置特殊配置
-     * @author: zhang jing
-     * @date: 2022/8/30 10:21
-     * @param: [pkId]
-     * @return: com.hzs.common.core.web.domain.AjaxResult
+     * 删除提现设置特殊配置
      **/
     @DeleteMapping("/{pkId}")
     public AjaxResult delete(@PathVariable Long pkId) {
-        UpdateWrapper<BdWithdrawalSpecial> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("PK_ID", pkId);
-        updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
-        updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId());
-        updateWrapper.set("MODIFIED_TIME", new Date());
-        redisService.deleteObject(CacheConstants.BD_WITHDRAWAL_SPECIAL + SecurityUtils.getPkCountry());
-        return toAjax(withdrawalSpecialService.update(updateWrapper));
+        LambdaUpdateWrapper<BdWithdrawalSpecial> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(BdWithdrawalSpecial::getPkId, pkId);
+        updateWrapper.set(BdWithdrawalSpecial::getDelFlag, EDelFlag.DELETE.getValue());
+        updateWrapper.set(BdWithdrawalSpecial::getPkModified, SecurityUtils.getUserId());
+        updateWrapper.set(BdWithdrawalSpecial::getModifiedTime, new Date());
+        return toAjax(iBdWithdrawalSpecialService.update(updateWrapper));
     }
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdWithdrawalProcessMapper.java

@@ -1,16 +1,10 @@
 package com.hzs.system.config.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.system.config.BdWithdrawalProcess;
 
 /**
- * <p>
  * 提现手续费配置 Mapper 接口
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-02
  */
 public interface BdWithdrawalProcessMapper extends BaseMapper<BdWithdrawalProcess> {
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdWithdrawalSpecialMapper.java

@@ -1,16 +1,10 @@
 package com.hzs.system.config.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.system.config.BdWithdrawalSpecial;
 
 /**
- * <p>
  * 提现设置特殊配置 Mapper 接口
- * </p>
- *
- * @author zhangjing
- * @since 2022-09-06
  */
 public interface BdWithdrawalSpecialMapper extends BaseMapper<BdWithdrawalSpecial> {
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/WithdrawalSpecialServiceProvider.java

@@ -1,44 +0,0 @@
-package com.hzs.system.config.provider;
-
-import com.hzs.common.core.domain.R;
-import com.hzs.common.domain.system.config.BdWithdrawalSpecial;
-import com.hzs.system.config.IWithdrawalSpecialServiceApi;
-import com.hzs.system.config.service.IBdWithdrawalSpecialService;
-import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-
-@DubboService
-public class WithdrawalSpecialServiceProvider implements IWithdrawalSpecialServiceApi {
-
-    @Autowired
-    private IBdWithdrawalSpecialService withdrawalSpecialService;
-
-    /**
-     * @description: 根据国家查询提现设置特殊配置
-     * @author: zhang jing
-     * @date: 2022/9/27 16:24
-     * @param: [pkCountry]
-     * @return: com.hzs.common.core.domain.R<java.util.List<com.hzs.common.domain.system.config.BdWithdrawalSpecial>>
-     **/
-    @Override
-    public R<List<BdWithdrawalSpecial>> queryWithdrawalSpecial(Integer pkCountry) {
-        return R.ok(withdrawalSpecialService.queryWithdrawalSpecial(pkCountry));
-    }
-
-    /**
-     * @description: 根据会员编号查询提现特殊配置
-     * @author: zhang jing
-     * @date: 2022/9/27 16:34
-     * @param: [pkCountry, memberCode]
-     * @return: com.hzs.common.core.domain.R<com.hzs.common.domain.system.config.BdWithdrawalSpecial>
-     **/
-    @Override
-    public R<BdWithdrawalSpecial> getWithdrawalSpecial(Integer pkCountry, String memberCode) {
-        return R.ok(withdrawalSpecialService.getWithdrawalSpecial(pkCountry,memberCode));
-    }
-
-
-}

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalProcessService.java

@@ -1,27 +1,16 @@
 package com.hzs.system.config.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.system.config.BdWithdrawalProcess;
 
-import java.util.List;
-
 /**
- * <p>
  * 提现手续费配置 服务类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-02
  */
 public interface IBdWithdrawalProcessService extends IService<BdWithdrawalProcess> {
 
     /**
-     * @description: 根据国家查询提现手续费配置
-     * @author: zhang jing
-     * @date: 2022/11/2 17:14
-     * @param: [pkCountry]
-     * @return: java.util.List<com.hzs.common.domain.system.config.BdWithdrawalProcess>
+     * 根据国家查询提现手续费配置
      **/
     BdWithdrawalProcess queryBdWithdrawalProcess(Integer pkCountry);
+
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdWithdrawalSpecialService.java

@@ -1,35 +1,11 @@
 package com.hzs.system.config.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.system.config.BdWithdrawalSpecial;
 
-import java.util.List;
-
 /**
- * <p>
  * 提现设置特殊配置 服务类
- * </p>
- *
- * @author zhangjing
- * @since 2022-09-06
  */
 public interface IBdWithdrawalSpecialService extends IService<BdWithdrawalSpecial> {
 
-    /**
-     * @description: 根据国家查询提现设置特殊配置
-     * @author: zhang jing
-     * @date: 2022/9/27 16:24
-     * @param: [pkCountry]
-     * @return: java.util.List<com.hzs.common.domain.system.config.BdWithdrawalSpecial>
-     **/
-   List<BdWithdrawalSpecial> queryWithdrawalSpecial(Integer pkCountry);
-   /**
-    * @description: 根据会员编号查询提现特殊配置
-    * @author: zhang jing
-    * @date: 2022/9/27 16:34
-    * @param: [pkCountry, memberCode]
-    * @return: com.hzs.common.domain.system.config.BdWithdrawalSpecial
-    **/
-    BdWithdrawalSpecial getWithdrawalSpecial(Integer pkCountry, String memberCode);
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java

@@ -46,7 +46,9 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
         if(ObjectUtil.isEmpty(cuMember)){
             queryWrapper.isNull(BdAdvertBanner::getPkVertex);
         }else{
-            queryWrapper.and(qw ->  qw.isNull(BdAdvertBanner::getPkVertex).or().eq(BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
+            queryWrapper.and(qw ->  qw.isNull(BdAdvertBanner::getPkVertex)
+                    .or()
+                    .eq(ObjectUtil.isNotEmpty(cuMember.getPkVertex()), BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
         }
         queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY);
         queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date());

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalProcessServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hzs.system.config.service.impl;
 
-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.utils.DateUtils;
 import com.hzs.common.domain.system.config.BdWithdrawalProcess;
@@ -8,31 +8,17 @@ import com.hzs.system.config.mapper.BdWithdrawalProcessMapper;
 import com.hzs.system.config.service.IBdWithdrawalProcessService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
- * <p>
  * 提现手续费配置 服务实现类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-02
  */
 @Service
 public class BdWithdrawalProcessServiceImpl extends ServiceImpl<BdWithdrawalProcessMapper, BdWithdrawalProcess> implements IBdWithdrawalProcessService {
 
-    /**
-     * @description: 根据国家查询提现手续费配置
-     * @author: zhang jing
-     * @date: 2022/11/2 17:16
-     * @param: [pkCountry]
-     * @return: java.util.List<com.hzs.common.domain.system.config.BdWithdrawalProcess>
-     **/
     @Override
     public BdWithdrawalProcess queryBdWithdrawalProcess(Integer pkCountry) {
-        QueryWrapper<BdWithdrawalProcess> queryWrapper=new QueryWrapper();
-        queryWrapper.eq("PK_COUNTRY",pkCountry);
-        queryWrapper.le("EFFECTIVE_DATE", DateUtils.currentDateTime());
+        LambdaQueryWrapper<BdWithdrawalProcess> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BdWithdrawalProcess::getPkCountry, pkCountry);
+        queryWrapper.le(BdWithdrawalProcess::getEffectiveDate, DateUtils.currentDateTime());
         return baseMapper.selectOne(queryWrapper);
     }
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalServiceImpl.java

@@ -3,9 +3,7 @@ package com.hzs.system.config.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.core.constant.CacheConstants;
 import com.hzs.common.core.enums.EDelFlag;
-import com.hzs.common.core.service.RedisService;
 import com.hzs.common.domain.system.config.BdWithdrawal;
 import com.hzs.common.domain.system.config.BdWithdrawalAuto;
 import com.hzs.common.domain.system.config.ext.BdWithdrawalAutoExt;
@@ -27,8 +25,6 @@ import java.util.List;
 @Service
 public class BdWithdrawalServiceImpl extends ServiceImpl<BdWithdrawalMapper, BdWithdrawal> implements IBdWithdrawalService {
 
-    @Autowired
-    private RedisService redisService;
     @Autowired
     private IBdWithdrawalAutoService iBdWithdrawalAutoService;
 
@@ -64,9 +60,6 @@ public class BdWithdrawalServiceImpl extends ServiceImpl<BdWithdrawalMapper, BdW
             wao.setCreationTime(new Date());
             iBdWithdrawalAutoService.save(wao);
         }
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL + SecurityUtils.getPkCountry());
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL_IS_AUTO + SecurityUtils.getPkCountry());
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL_AUTO + SecurityUtils.getPkCountry());
         return true;
     }
 
@@ -86,9 +79,6 @@ public class BdWithdrawalServiceImpl extends ServiceImpl<BdWithdrawalMapper, BdW
             wao.setCreationTime(new Date());
             iBdWithdrawalAutoService.save(wao);
         }
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL + SecurityUtils.getPkCountry());
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL_IS_AUTO + SecurityUtils.getPkCountry());
-        redisService.deleteObjectByKey(CacheConstants.BD_WITHDRAWAL_AUTO + SecurityUtils.getPkCountry());
         return true;
     }
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdWithdrawalSpecialServiceImpl.java

@@ -1,78 +1,15 @@
 package com.hzs.system.config.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hzs.common.core.constant.CacheConstants;
-import com.hzs.common.core.service.RedisService;
 import com.hzs.common.domain.system.config.BdWithdrawalSpecial;
 import com.hzs.system.config.mapper.BdWithdrawalSpecialMapper;
 import com.hzs.system.config.service.IBdWithdrawalSpecialService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
- * <p>
  * 提现设置特殊配置 服务实现类
- * </p>
- *
- * @author zhangjing
- * @since 2022-09-06
  */
 @Service
 public class BdWithdrawalSpecialServiceImpl extends ServiceImpl<BdWithdrawalSpecialMapper, BdWithdrawalSpecial> implements IBdWithdrawalSpecialService {
 
-
-    private RedisService redisService;
-
-    @Autowired
-    public void setRedisService(RedisService redisService) {
-        this.redisService = redisService;
-    }
-
-
-    /**
-     * @description: 根据国家查询提现设置特殊配置
-     * @author: zhang jing
-     * @date: 2022/9/27 16:23
-     * @param: [pkCountry]
-     * @return: java.util.List<com.hzs.common.domain.system.config.BdWithdrawalSpecial>
-     **/
-    @Override
-    public List<BdWithdrawalSpecial> queryWithdrawalSpecial(Integer pkCountry) {
-        List<BdWithdrawalSpecial> withdrawalSpecial = redisService.getCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL + pkCountry);
-        if(null == withdrawalSpecial){
-            QueryWrapper<BdWithdrawalSpecial> queryWrapper = new QueryWrapper();
-            queryWrapper.eq("PK_COUNTRY",pkCountry);
-            withdrawalSpecial = baseMapper.selectList(queryWrapper);
-            if(null != withdrawalSpecial){
-                redisService.setCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL + pkCountry, withdrawalSpecial);
-            }
-        }
-        return withdrawalSpecial;
-    }
-
-    /**
-     * @description: 根据会员编号查询提现特殊配置
-     * @author: zhang jing
-     * @date: 2022/9/27 16:34
-     * @param: [pkCountry, memberCode]
-     * @return: com.hzs.common.domain.system.config.BdWithdrawalSpecial
-     **/
-    @Override
-    public BdWithdrawalSpecial getWithdrawalSpecial(Integer pkCountry, String memberCode) {
-        BdWithdrawalSpecial withdrawalSpecial = redisService.getCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL_MEMBER_CODE + memberCode);
-        if(null == withdrawalSpecial){
-            QueryWrapper<BdWithdrawalSpecial> queryWrapper = new QueryWrapper();
-            queryWrapper.eq("PK_COUNTRY",pkCountry);
-            queryWrapper.eq("MEMBER_CODE",memberCode);
-            withdrawalSpecial = baseMapper.selectOne(queryWrapper);
-            if(null != withdrawalSpecial){
-                redisService.setCacheObject(CacheConstants.BD_WITHDRAWAL_SPECIAL_MEMBER_CODE + memberCode, withdrawalSpecial);
-            }
-        }
-        return withdrawalSpecial;
-    }
-
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/BdTradeConfigVO.java

@@ -13,12 +13,6 @@ import java.util.List;
 
 /**
  * 交易配置
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/8/18 11:14
- * @Classname: BdTradeConfigVO
- * @Package_name: com.hzs.system.config.vo
  */
 @Data
 @AllArgsConstructor
@@ -42,7 +36,6 @@ public class BdTradeConfigVO implements Serializable {
     /**
      * 1:提现 2:转账 (来源枚举EBusinessModule)
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.BUSINESS_MODULE)
     private Integer businessModule;
 
     private String businessModuleVal;

bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java

@@ -2423,7 +2423,7 @@ public class EnumsController extends BaseController {
     public AjaxResult getPaymentStatus() {
         List<EnumEntity> enumEntityList = new ArrayList<>();
         for (EWithdrawStatus value : EWithdrawStatus.values()) {
-            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ENU_WITHDRAW_STATUS));
+            enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
         }
         return AjaxResult.success(enumEntityList);
     }

bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java

@@ -539,10 +539,6 @@ public class EnumsInitController {
             initList.add(this.createData(value.getKey(), value.getLabel()));
         }
 
-        for (EWithdrawStatus value : EWithdrawStatus.values()) {
-            initList.add(this.createData(value.getKey(), value.getLabel()));
-        }
-
         /**
          * 站内信类型
          */

bd-business/bd-business-system/src/main/resources/mapper/system/base/BdCurrencyMapper.xml

@@ -2,23 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.system.base.mapper.BdCurrencyMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.system.base.BdCurrency">
-        <id column="PK_ID" property="pkId"/>
-        <result column="NAME" property="name"/>
-        <result column="ENABLE_STATE" property="enableState"/>
-        <result column="IN_EXCHANGE_RATE" property="inExchangeRate"/>
-        <result column="OUT_EXCHANGE_RATE" property="outExchangeRate"/>
-        <result column="SYMBOL" property="symbol"/>
-        <result column="IS_CURRENCY" property="isCurrency"/>
-        <result column="PK_COUNTRY" property="pkCountry"/>
-        <result column="PK_CREATOR" property="pkCreator"/>
-        <result column="CREATION_TIME" property="creationTime"/>
-        <result column="PK_MODIFIED" property="pkModified"/>
-        <result column="MODIFIED_TIME" property="modifiedTime"/>
-        <result column="DEL_FLAG" property="delFlag"/>
-        <result column="EFFECTIVE_DATE" property="effectiveDate"/>
-        <result column="CURRENCY_CODE" property="currencyCode"/>
-    </resultMap>
-
 </mapper>

bd-business/bd-business-system/src/main/resources/mapper/system/config/BdWithdrawalProcessMapper.xml

@@ -2,29 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.system.config.mapper.BdWithdrawalProcessMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdWithdrawalProcess">
-        <id column="PK_ID" property="pkId" />
-    <result column="DEL_FLAG" property="delFlag" />
-    <result column="PK_COUNTRY" property="pkCountry" />
-    <result column="CREATION_TIME" property="creationTime" />
-    <result column="MODIFIED_TIME" property="modifiedTime" />
-    <result column="PK_CREATOR" property="pkCreator" />
-    <result column="PK_MODIFIED" property="pkModified" />
-        <result column="SERVICE_RATIO" property="serviceRatio" />
-        <result column="SERVICE_TYPE" property="serviceType" />
-        <result column="EFFECTIVE_DATE" property="effectiveDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        CREATION_TIME,
-        MODIFIED_TIME,
-        PK_CREATOR,
-        PK_MODIFIED,
-        PK_ID, SERVICE_RATIO, SERVICE_TYPE, EFFECTIVE_DATE
-    </sql>
-
 </mapper>

bd-business/bd-business-system/src/main/resources/mapper/system/config/BdWithdrawalSpecialMapper.xml

@@ -2,28 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.system.config.mapper.BdWithdrawalSpecialMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdWithdrawalSpecial">
-        <id column="PK_ID" property="pkId" />
-    <result column="DEL_FLAG" property="delFlag" />
-    <result column="PK_COUNTRY" property="pkCountry" />
-    <result column="PK_CREATOR" property="pkCreator" />
-    <result column="CREATION_TIME" property="creationTime" />
-    <result column="PK_MODIFIED" property="pkModified" />
-    <result column="MODIFIED_TIME" property="modifiedTime" />
-        <result column="PK_WITHDRAWAL" property="pkWithdrawal" />
-        <result column="MEMBER_CODE" property="memberCode" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        PK_CREATOR,
-        CREATION_TIME,
-        PK_MODIFIED,
-        MODIFIED_TIME,
-        PK_ID, PK_WITHDRAWAL, MEMBER_CODE
-    </sql>
-
 </mapper>

bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitSimpleAspectAdvice.java

@@ -23,11 +23,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
- * @Description: 防止表单重复提交处理
- * @Author: jiang chao
- * @Time: 2023/6/15 9:24
- * @Classname: RepeatSubmitOldAspectAdvice
- * @PackageName: com.hzs.common.core.aspect
+ * 防止表单重复提交处理
  */
 @Slf4j
 @Aspect
@@ -67,7 +63,7 @@ public class RepeatSubmitSimpleAspectAdvice {
 
         Map<String, Object> nowDataMap = new HashMap<>();
         nowDataMap.put(REPEAT_PARAMS, nowParams);
-        nowDataMap.put(REPEAT_TIME, System.currentTimeMillis());
+        nowDataMap.put(REPEAT_TIME, System.currentTimeMillis() / 1000);
 
         // 请求地址（作为存放cache的key值）
         String url = request.getRequestURI();

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

@@ -164,42 +164,11 @@ public class CacheConstants {
      */
     public static final String BD_SHARE = CACHE_PREFIX + "share:";
 
-    /**
-     * 提现配置
-     */
-    public static final String BD_WITHDRAWAL = CACHE_PREFIX + "withdrawal:";
-
-    /**
-     * 提现手续费配置
-     */
-    public static final String BD_WITHDRAWAL_PROCESS = CACHE_PREFIX + "withdrawalProcess:";
-
-
-    /**
-     * 自动提现明细配置
-     */
-    public static final String BD_WITHDRAWAL_AUTO = CACHE_PREFIX + "withdrawalAuto:";
-
-    /**
-     * 查询所有配置了自动提现的提现配置列表
-     */
-    public static final String BD_WITHDRAWAL_IS_AUTO = CACHE_PREFIX + "withdrawal:is:auto:";
-
     /**
      * 个税明细配置
      */
     public static final String BD_WITHDRAWAL_TAX = CACHE_PREFIX + "withdrawalTax:";
 
-    /**
-     * 提现特殊配置列表
-     */
-    public static final String BD_WITHDRAWAL_SPECIAL = CACHE_PREFIX + "withdrawalSpecial:";
-
-    /**
-     * 根据会员编号查询提现特殊配置
-     */
-    public static final String BD_WITHDRAWAL_SPECIAL_MEMBER_CODE = CACHE_PREFIX + "withdrawalSpecial:memberCode:";
-
     /**
      * 转账配置配置列表
      */
@@ -295,78 +264,11 @@ public class CacheConstants {
      */
     public final static String TRADE_CONFIG = CACHE_PREFIX + "trade:config";
 
-
     /**
      * 交易白名单配置
      */
     public final static String TRADE_CONFIG_WHITE = CACHE_PREFIX + "trade:config:white";
 
-
-    /**
-     * 采购订单锁
-     */
-    public static final String PO_ORDER_LOCK = CACHE_PREFIX + "lock:po:order:";
-
-    /**
-     * 采购入库单锁
-     */
-    public static final String IC_PURCHASE_IN_LOCK = CACHE_PREFIX + "lock:ic:purchase:";
-
-    /**
-     * 其他入库单锁
-     */
-    public static final String IC_GENERAL_IN_LOCK = CACHE_PREFIX + "lock:ic:general-in:";
-
-    /**
-     * 其他出库单锁
-     */
-    public static final String IC_GENERAL_OUT_LOCK = CACHE_PREFIX + "lock:ic:general-out:";
-
-    /**
-     * 调拨订单单锁
-     */
-    public static final String TRANSFER_ORDER_LOCK = CACHE_PREFIX + "lock:ic:transfer-order:";
-
-    /**
-     * 调拨入库单锁
-     */
-    public static final String TRANSFER_IN_LOCK = CACHE_PREFIX + "lock:ic:transfer-in:";
-
-    /**
-     * 调拨出库单锁
-     */
-    public static final String TRANSFER_OUT_LOCK = CACHE_PREFIX + "lock:ic:transfer-out:";
-
-    /**
-     * 库存盘点单锁
-     */
-    public static final String INVENTORY_ORDER_LOCK = CACHE_PREFIX + "lock:ic:inventory:";
-
-    /**
-     * 业务领用订单
-     */
-    public static final String IO_ORDER_LOCK = CACHE_PREFIX + "lock:io:order:";
-
-    /**
-     * 现存量
-     */
-    public static final String IC_ON_HAND_NUM_LOCK = CACHE_PREFIX + "lock:ic:hand:";
-
-    /**
-     * 可用量
-     */
-    public static final String IC_AVAILABLE_NUM_LOCK = CACHE_PREFIX + "lock:ic:available:";
-
-    /**
-     * 批次号
-     */
-    public static final String BATCH_CODE = CACHE_PREFIX + "lock:ic:batch-code:";
-
-    /**
-     * 产品bas
-     */
-    public static final String BD_PRODUCT_BAS = "product:bas:";
-
     /**
      * 后台管理员，数据访问权限缓存key
      */

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

@@ -609,11 +609,6 @@ public class EnumsPrefixConstants {
      */
     public static final String CYCLE = "ENU_CYCLE_";
 
-    /**
-     * 提现状态
-     */
-    public static final String ENU_WITHDRAW_STATUS = "ENU_WITHDRAW_S_";
-
     /**
      * 服务类型枚举
      */

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

@@ -195,61 +195,6 @@ public class FinanceMsgConstants {
      */
     public static final String SELECT_CHARGED_RECORD = "请选择要打款充正的记录";
 
-    /**
-     * 请配置提现信息 -- 请配置提现信息
-     */
-    public static final String CONFIGURE_WITHDRAWAL_INFO = "请配置提现信息";
-
-    /**
-     * 请绑定银行卡 -- 请绑定银行卡
-     */
-    public static final String BIND_BANK_CARD = "请绑定银行卡";
-
-    /**
-     * 暂时不请允许提现，请先升级 -- 暂时不请允许提现，请先升级
-     */
-    public static final String NOT_WITHDRAWAL_UPGRADE = "暂时不请允许提现，请先升级";
-
-    /**
-     * 请选择提现账户 -- 请选择提现账户
-     */
-    public static final String SELECT_WITHDRAWAL_ACCOUNT = "请选择提现账户";
-
-    /**
-     * 不允许提现 -- 不允许提现
-     */
-    public static final String NOT_ALLOWED_WITHDRAWAL = "不允许提现";
-
-    /**
-     * 超过提现次数 -- 超过提现次数
-     */
-    public static final String EXCEEDING_WITHDRAWALS_NUMBER = "超过提现次数";
-
-    /**
-     * 请配置提现金额限制 -- 请配置提现金额限制
-     */
-    public static final String CONFIGURE_WITHDRAWAL_AMOUNT_LIMIT = "请配置提现金额限制";
-
-    /**
-     * 请输入提现金额 -- 请输入提现金额
-     */
-    public static final String ENTER_WITHDRAWAL_AMOUNT = "请输入提现金额";
-
-    /**
-     * 请输入整数值 -- 请输入整数值
-     */
-    public static final String ENTER_INTEGER_VALUE = "请输入整数值";
-
-    /**
-     * 提现金额必须大于最低提现金额 -- 提现金额必须大于最低提现金额
-     */
-    public static final String WITHDRAWAL_AMOUNT_GREATER_MINIMUM_AMOUNT = "提现金额必须大于最低提现金额";
-
-    /**
-     * 提现金额必须小于最高提现金额 -- 提现金额必须小于最高提现金额
-     */
-    public static final String WITHDRAWAL_AMOUNT_LESS_MAXIMUM_AMOUNT = "提现金额必须小于最高提现金额";
-
     /**
      * 余额不足 -- 余额不足
      */
@@ -339,26 +284,11 @@ public class FinanceMsgConstants {
      */
     public static final String RECHARGE_DETAILS_EXPORT = "充值明细导出";
 
-    /**
-     * 银行卡号不能为空 -- 银行卡号不能为空！
-     */
-    public static final String BANK_CARD_CANNOT_EMPTY = "银行卡号不能为空！";
-
-    /**
-     * 开户名不能为空 -- 开户名不能为空！
-     */
-    public static final String ACCOUNT_NAME_CANNOT_EMPTY = "开户名不能为空！";
-
     /**
      * 验证码不能为空 -- 验证码不能为空！
      */
     public static final String VERIFICATION_CODE_CANNOT_EMPTY = "验证码不能为空！";
 
-    /**
-     * 开户支行不能为空 -- 开户支行不能为空！
-     */
-    public static final String OPENING_BRANCH_CANNOT_EMPTY = "开户支行不能为空！";
-
     /**
      * 开户支行不能为空 -- 真实姓名不能为空！
      */
@@ -369,16 +299,6 @@ public class FinanceMsgConstants {
      */
     public static final String REAL_NAME_MEMBER_NOT_DIFFERENT = "真实姓名与会员姓名不一致";
 
-    /**
-     * 所在省不能为空 -- 所在省不能为空！
-     */
-    public static final String PROVINCE_CANNOT_EMPTY = "所在省不能为空！";
-
-    /**
-     * 所在市不能为空 -- 所在市不能为空！
-     */
-    public static final String CITY_CANNOT_EMPTY = "所在市不能为空！";
-
     /**
      * 详细地址不能为空 -- 详细地址不能为空！
      */
@@ -472,17 +392,6 @@ public class FinanceMsgConstants {
      */
     public static final String BUSINESS_LICENSE_REFUSE_RESET = "营业执照审核未通过，请勿操作重置";
 
-    /**
-     * 提现正在审批中，请稍后再试 -- 提现正在审批中，请稍后再试
-     */
-    public static final String WITHDRAWAL_APPROVAL = "提现正在审批中，请稍后再试";
-
-
-    /**
-     * 提现金额必须为100的整数倍
-     */
-    public static final String WITHDRAW_AMOUNT_MULTIPLE = "提现金额必须为100的整数倍";
-
     /**
      * 身份证的图片地址不能为空
      */
@@ -544,12 +453,6 @@ public class FinanceMsgConstants {
     public static final String TERMINATED_NOT_TRANSFER = "已终止会员不允许转账";
 
 
-    /**
-     * 会员续约 -- 已终止会员不允许提现
-     */
-    public static final String TERMINATED_NOT_WITHDRAWAL = "已终止会员不允许提现";
-
-
     /**
      * 账号异常无法接受转账 -- 账号异常无法接受转账
      */

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

@@ -287,5 +287,9 @@ public class MemberMsgConstants {
      * 已超最大门票销售数量，不能购买！
      */
     public static final String NOT_CHECK_AC_ACTIVITY = "门票数量已售罄，请稍后再试！";
+    /**
+     * 会员安置伞下和推荐伞下还有未删除会员，不可删除
+     */
+    public static final String NOT_DEAD_MEMBER = "会员安置伞下和推荐伞下还有未删除会员，不可删除";
 
 }

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

@@ -169,5 +169,10 @@ public class SaOrderMsgConstants {
      * 会员续约 -- 已终止会员不允许报单
      */
     public static final String TERMINATED_NOT_DECLARATION = "已终止会员不允许报单";
+    /**
+     * 原订单价格和调换完货之后的价格不相同 -- 不允许货物调换
+     */
+    public static final String PRODUCT_CONFIRM_PRICE = "原订单价格和调换完货之后的价格不相同";
+
 
 }

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java

@@ -302,6 +302,10 @@ public enum EOperationBusiness {
 
     DRAW_DETAIL("抽奖明细"),
 
+    DRAW_PURCHASED("充值已购买次数"),
+
+    DRAW_UNPURCHASED("充值未购买次数"),
+
     AC_RECOMMEEND_CONFIG("直推赠送"),
 
     AC_WARES_RULE_CONFIG("商品赠送"),

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java

@@ -206,6 +206,10 @@ public enum EOperationModule {
 
     DRAW_DETAIL("抽奖明细"),
 
+    DRAW_PURCHASED("充值已购买次数"),
+
+    DRAW_UNPURCHASED("充值未购买次数"),
+
     RECOMMEND_GIVE("直推赠送"),
     BENEFITS_GIVE("权益赠送"),
     BENEFITS_GIVE_LOG("权益赠送记录"),
@@ -425,6 +429,8 @@ public enum EOperationModule {
 
     CANCEL_ORDER_CONFIRM("撤销订单确认"),
 
+    DELETE_DEAD_LOCK("删除死点"),
+
     ///////////////////////////统计分析////////////////////////////
 
     STATISTIC_ANALYSIS("统计分析"),

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java

@@ -4,11 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @Description: 转账类型
- * @Author: ljc
- * @Time: 2022/9/26 10:33
- * @Classname: ETransferType
- * @Package_name: com.hzs.common.core.enums
+ * 转账类型
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWithdrawStatus.java

@@ -1,13 +1,10 @@
 package com.hzs.common.core.enums;
 
-import com.hzs.common.core.constant.EnumsPrefixConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
  * 提现状态枚举
- *
- * @author: hzs
  */
 @AllArgsConstructor
 @Getter
@@ -16,20 +13,20 @@ public enum EWithdrawStatus {
     /**
      * 正常
      */
-    NORMAL(0, "未打款", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "0"),
+    NORMAL(0, "未打款", 0),
 
     /**
      * 打款
      */
-    PAYMENT(1, "已打款", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "1"),
+    PAYMENT(1, "已打款", 0),
     /**
      * 充正
      */
-    CHARGING(2, "已充正", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "2"),
+    CHARGING(2, "已充正", 0),
     /**
      * 取消
      */
-   CANCEL(3, "取消", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "3"),
+    CANCEL(3, "取消", 0),
     ;
 
     /**
@@ -44,9 +41,18 @@ public enum EWithdrawStatus {
      * 是否启用（0=是,1=否） -- 来源EYesNo
      */
     private final int enable;
-    /**
-     * 国际化翻译key值
-     */
-    private final String key;
+
+
+    public static String getLabelByValue(Integer value) {
+        if (null == value) {
+            return "";
+        }
+        for (EWithdrawStatus enums : EWithdrawStatus.values()) {
+            if (enums.getValue() == value) {
+                return enums.getLabel();
+            }
+        }
+        return "";
+    }
 
 }

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberBank.java

@@ -9,12 +9,7 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 会员信息-银行卡信息
- * </p>
- *
- * @author hzs
- * @since 2022-08-31
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberSplit.java

@@ -0,0 +1,37 @@
+package com.hzs.common.domain.member.base;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 系统会员拆分表
+ */
+@Data
+@Accessors(chain = true)
+@TableName("CU_MEMBER_SPLIT")
+public class CuMemberSplit {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 体系ID
+     */
+    @TableField("PK_VERTEX")
+    private Long pkVertex;
+
+    /**
+     * 时间线（时间戳毫秒级）
+     */
+    @TableField("SPLIT_TIME")
+    private Long splitTime;
+
+    /**
+     * 提示信息
+     */
+    @TableField("CONTENT")
+    private String content;
+
+
+}

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java

@@ -86,13 +86,13 @@ public class BdWaresExtend extends BaseEntity {
     /**
      * 上架时间
      */
-    @TableField("PUT_ON_TIME")
+    @TableField(value = "PUT_ON_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date putOnTime;
 
     /**
      * 下架时间
      */
-    @TableField("PUT_OFF_TIME")
+    @TableField(value = "PUT_OFF_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date putOffTime;
 
     /**
@@ -134,7 +134,7 @@ public class BdWaresExtend extends BaseEntity {
     /**
      * （预计时间）到货时间
      */
-    @TableField("ARRIVAL_TIME")
+    @TableField(value = "ARRIVAL_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date arrivalTime;
 
     /**

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCurrency.java

@@ -13,11 +13,6 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * Created with IntelliJ IDEA.
- * @author: yuhui
- * Description:
- */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java

@@ -9,8 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-
 /**
  * 自动提现明细表
  */