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

@@ -180,6 +180,7 @@ public class ApiCuMemberTransferController extends BaseController {
         return iCuMemberServiceLogService.selectServiceValue(log);
     }
 
+
     /**
      * 用户转账
      *
@@ -337,17 +338,11 @@ 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);
@@ -355,6 +350,7 @@ public class ApiCuMemberTransferController extends BaseController {
         return toAjax(iCuMemberTransferService.saveMemberTransferInfo(cuMemberTransfer, cuMemberAccount, toMemberAccount));
     }
 
+
     /**
      * 判断是否走血缘
      *

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

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

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

@@ -4,7 +4,6 @@ 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;
@@ -66,6 +65,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return iTransferServiceApi.queryTransfer(pkCountry).getData();
     }
 
+
     @Override
     public Boolean isBloodKinshipOnUmbrella(Long pkMember, Long toPkMember) {
         //查找血缘伞上，推荐人
@@ -108,16 +108,9 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Integer saveMemberTransferInfo(CuMemberTransfer cuMemberTransfer, CuMemberAccount cuMemberAccount, CuMemberAccount toMemberAccount) {
-        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("转账失败，请确认后重试");
-        }
+        Integer row = baseMapper.insert(cuMemberTransfer);
+        this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_OUT.getValue());
+        this.updateTradeAndBalancd(cuMemberTransfer, ETransferType.TRANSFER_IN.getValue());
         ChargingBonusDetail(cuMemberTransfer, cuMemberAccount, toMemberAccount);
         return row;
     }
@@ -167,6 +160,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         }
     }
 
+
     /**
      * 更新交易流水和余额
      *
@@ -191,13 +185,9 @@ 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);
@@ -239,6 +229,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return memberTrade;
     }
 
+
     /**
      * 构造转入方交易明细
      *
@@ -303,6 +294,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return remarks.toString();
     }
 
+
     @Override
     public Object[] selectMemberTransferList(CuMemberTransferVO cuMemberTransferVO) {
         CuMemberTransferVO memberTransferVO;
@@ -319,6 +311,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
         return new Object[]{cuMemberTransferExts, cuMemberTransferVOS};
     }
 
+
     /**
      * 页面显示公用参数
      *
@@ -354,3 +347,4 @@ public class CuMemberTransferServiceImpl extends ServiceImpl<CuMemberTransferMap
     }
 
 }
+

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

@@ -110,9 +110,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
     public Integer saveMemberWithdrawInfo(CuMemberWithdraw cuMemberWithdraw) {
         int row = baseMapper.insert(cuMemberWithdraw);
         if (row != 0) {
-            if (this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT) == 0) {
-                throw new ServiceException("提现失败，请确认后重试");
-            }
+            this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT);
         }
         return row;
     }
@@ -132,15 +130,10 @@ 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);
     }
 

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

@@ -241,9 +241,6 @@
         <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-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitSimpleAspectAdvice.java

@@ -23,7 +23,11 @@ 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
@@ -63,7 +67,7 @@ public class RepeatSubmitSimpleAspectAdvice {
 
         Map<String, Object> nowDataMap = new HashMap<>();
         nowDataMap.put(REPEAT_PARAMS, nowParams);
-        nowDataMap.put(REPEAT_TIME, System.currentTimeMillis() / 1000);
+        nowDataMap.put(REPEAT_TIME, System.currentTimeMillis());
 
         // 请求地址（作为存放cache的key值）
         String url = request.getRequestURI();

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

@@ -4,7 +4,11 @@ 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