Merge remote-tracking branch 'origin/dev' into test

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java

@@ -58,8 +58,8 @@ public class ApiCuMemberBonusController extends BaseController {
                 memberBonusVO.setServiceSpend(BigDecimal.ZERO);
                 memberBonusVO.setSettleDate(DateUtils.currentDate());
                 BigDecimal serviceSpend = ComputeUtil.computeSubtract(
-                        ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(),
+                        ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), cuMemberBonus.getRetailAreaIncome(), cuMemberBonus.getRepurRangeIncome()),
-                                cuMemberBonus.getRetailAreaIncome()), cuMemberBonus.getRetailRealSubtotal()
+                        cuMemberBonus.getRetailRealSubtotal()
                 );
                 memberBonusVO.setBackPoints(serviceSpend);
 

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

@@ -126,11 +126,11 @@ public class ApiCuMemberWithdrawController extends BaseController {
             return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.RECHAGER_USER_NOT_EXIST));
         }
         //获取银行卡信息
-        Long pkBank = cuMemberWithdrawParam.getPkBank();
+//        Long pkBank = cuMemberWithdrawParam.getPkBank();
-        CuMemberBankVO memberBank = cuMemberBankService.selectCuMemberBankById(pkBank);
+//        CuMemberBankVO memberBank = cuMemberBankService.selectCuMemberBankById(pkBank);
-        if (null == memberBank) {
+//        if (null == memberBank) {
-            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.BIND_BANK_CARD));
+//            return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.BIND_BANK_CARD));
-        }
+//        }
         //校验支付密码
         String payPwd = cuMemberLoginExt.getPayPwd();
         if (StringUtils.isEmpty(payPwd) || !SecurityUtils.matchesPassword(cuMemberWithdrawParam.getPayPwd(), payPwd)) {
@@ -235,7 +235,8 @@ public class ApiCuMemberWithdrawController extends BaseController {
         CurrencyDTO currencyDTO = baseService.getCurrency(pkCountry);
 
         CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder().pkMember(pkMember)
-                .pkAccount(pkAccount).pkBank(pkBank).remarks(cuMemberWithdrawParam.getRemarks())
+//                .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();

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

@@ -18,6 +18,7 @@ import com.hzs.common.security.service.UserTokenService;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.service.ITransactionCommonService;
 import com.hzs.common.util.TransactionUtils;
+import com.hzs.member.account.param.CuMemberWithdrawRejectParam;
 import com.hzs.member.account.service.ICuMemberBaseService;
 import com.hzs.member.account.service.ICuMemberWithdrawService;
 import com.hzs.member.account.vo.CuMemberPetitionVO;
@@ -209,4 +210,11 @@ public class CuMemberWithdrawController extends BaseController {
         return toAjax(cuMemberWithdrawService.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);
+        return AjaxResult.success();
+    }
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/account/param/CuMemberWithdrawRejectParam.java

@@ -0,0 +1,13 @@
+package com.hzs.member.account.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class CuMemberWithdrawRejectParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private List<Long> idList;
+    private String rejectRemark;
+}

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

@@ -6,6 +6,7 @@ import com.hzs.common.domain.member.account.CuMemberAccount;
 import com.hzs.common.domain.member.account.CuMemberWithdraw;
 import com.hzs.common.domain.system.config.BdWithdrawal;
 import com.hzs.member.account.dto.MemberAccountAudit;
+import com.hzs.member.account.param.CuMemberWithdrawRejectParam;
 import com.hzs.member.account.vo.CuMemberPetitionVO;
 import com.hzs.member.account.vo.CuMemberWithdrawVO;
 
@@ -211,4 +212,9 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
      */
     List<Long> selectWithdrawMember(Integer pkCountry, Long pkMember);
 
+    /**
+     * 提现驳回
+     * @param param
+     */
+    void withdrawReject(CuMemberWithdrawRejectParam param);
 }

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

@@ -4,12 +4,16 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.constant.MemberFieldConstants;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
+import com.hzs.common.core.exception.ServiceException;
 import com.hzs.common.core.utils.CommonUtil;
 import com.hzs.common.core.utils.reflect.ReflectUtils;
 import com.hzs.common.domain.member.account.CuMemberAccount;
@@ -20,9 +24,11 @@ import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.member.ext.CuMemberAccountExt;
 import com.hzs.common.domain.system.config.*;
 import com.hzs.common.domain.system.config.ext.BdWithdrawalTaxExt;
+import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.member.account.dto.CuMemberAccountParam;
 import com.hzs.member.account.dto.MemberAccountAudit;
 import com.hzs.member.account.mapper.CuMemberWithdrawMapper;
+import com.hzs.member.account.param.CuMemberWithdrawRejectParam;
 import com.hzs.member.account.service.*;
 import com.hzs.member.account.vo.CuMemberBankVO;
 import com.hzs.member.account.vo.CuMemberPetitionVO;
@@ -48,10 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -767,4 +770,26 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
     public List<Long> selectWithdrawMember(Integer pkCountry, Long pkMember) {
         return baseMapper.selectWithdrawMember(pkCountry, pkMember);
     }
+
+    @Override
+    public void withdrawReject(CuMemberWithdrawRejectParam param) {
+        if(ObjectUtil.isEmpty(param)){
+            throw new ServiceException("参数异常!");
+        }
+        if(CollUtil.isEmpty(param.getIdList())){
+            throw new ServiceException("请选择需要驳回的数据!");
+        }
+        if(StrUtil.isEmpty(param.getRejectRemark())){
+            throw new ServiceException("请录入驳回原因!");
+        }
+        LambdaQueryWrapper<CuMemberWithdraw> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(CuMemberWithdraw::getPkId, param.getIdList());
+        CuMemberWithdraw withdraw = CuMemberWithdraw.builder().build();
+        withdraw.setApproveRemarks(param.getRejectRemark());
+        withdraw.setApproveState(EApproveStatus.REJECTED.getValue());
+        withdraw.setApprover(SecurityUtils.getUserId());
+        withdraw.setApproveTime(new Date());
+        baseMapper.update(withdraw, wrapper);
+    }
+
 }

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

@@ -31,10 +31,6 @@ public enum EBonusItems {
      * 服务补贴
      */
     SERVICE_SUBSIDIES(7, "旧服务补贴", 0, EnumsPrefixConstants.BONUS_ITEMS + 7),
-    /**
-     * 复购级差收益
-     */
-    REPURCHASE_RANGE_INCOME(8, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8),
     /**
      * 消费拓展收益
      */
@@ -62,6 +58,11 @@ public enum EBonusItems {
 
     ////////////////////////////////////////////////// 新奖项 //////////////////////////////////////////////////
 
+    /**
+     * 复购级差收益 -- 秒结，日奖
+     */
+    REPURCHASE_RANGE_INCOME(8, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8),
+
     /**
      * 直推收益（新零售直推级差收益） -- 秒结，日奖
      */
@@ -78,11 +79,11 @@ public enum EBonusItems {
     /**
      * 福利极差收益 -- 月结，月奖
      */
-    RETAIL_BENEFIT_RANGE_INCOME(30, "福利级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30),
+    RETAIL_BENEFIT_RANGE_INCOME(30, "月度福利级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30),
     /**
      * 复购级差收益（新） -- 月结，月奖
      */
-    RETAIL_MONTH_REPURCHASE_INCOME(31, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 31),
+    RETAIL_MONTH_REPURCHASE_INCOME(31, "月度复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 31),
     /**
      * 培育津贴（新） -- 月结，月奖
      */