## 订单计算盒数商品编号扩充；

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

@@ -311,11 +311,17 @@ public class ApiCuMemberTransferController extends BaseController {
         //转入币种ID（从配置中获取）
         Integer toPkAccount = accountServiceApi.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);

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;
@@ -84,9 +85,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,11 +168,14 @@ 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);
     }
 

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

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

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

@@ -233,6 +233,9 @@
         <if test="account2 != null">
             and account2 + #{account2} >= 0
         </if>
+        <if test="account4 != null">
+            and account4 + #{account4} >= 0
+        </if>
     </update>
 
     <select id="queryMemberAccountByMemberCode" resultType="com.hzs.member.account.dto.CuMemberRechargeAccountParam">

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/RetailConstants.java

@@ -90,21 +90,29 @@ public class RetailConstants {
             "SP02410006", "SP02410007", "SP02410008", "SP02410009", "SP02410010",
             "SP02410011", "SP02410012", "SP02410013", "SP02410014", "SP02410015",
             "SP02410016", "SP02410017", "SP02410018", "SP02410019", "SP02410020",
+            "SP02410021", "SP02410022", "SP02410023", "SP02410024", "SP02410025",
+            "SP02410026", "SP02410027", "SP02410028", "SP02410029", "SP02410030",
             // 升级
             "SP02420001", "SP02420002", "SP02420003", "SP02420004", "SP02420005",
             "SP02420006", "SP02420007", "SP02420008", "SP02420009", "SP02420010",
             "SP02420011", "SP02420012", "SP02420013", "SP02420014", "SP02420015",
             "SP02420016", "SP02420017", "SP02420018", "SP02420019", "SP02420020",
+            "SP02420021", "SP02420022", "SP02420023", "SP02420024", "SP02420025",
+            "SP02420026", "SP02420027", "SP02420028", "SP02420029", "SP02420030",
             // 复消
             "SP02430001", "SP02430002", "SP02430003", "SP02430004", "SP02430005",
             "SP02430006", "SP02430007", "SP02430008", "SP02430009", "SP02430010",
             "SP02430011", "SP02430012", "SP02430013", "SP02430014", "SP02430015",
             "SP02430016", "SP02430017", "SP02430018", "SP02430019", "SP02430020",
+            "SP02430021", "SP02430022", "SP02430023", "SP02430024", "SP02430025",
+            "SP02430026", "SP02430027", "SP02430028", "SP02430029", "SP02430030",
             // 重消
             "SP02440001", "SP02440002", "SP02440003", "SP02440005", "SP02440005",
             "SP02440006", "SP02440007", "SP02440008", "SP02440009", "SP02440010",
             "SP02440011", "SP02440012", "SP02440013", "SP02440014", "SP02440015",
-            "SP02440016", "SP02440017", "SP02440018", "SP02440019", "SP02440020"
+            "SP02440016", "SP02440017", "SP02440018", "SP02440019", "SP02440020",
+            "SP02440021", "SP02440022", "SP02440023", "SP02440024", "SP02440025",
+            "SP02440026", "SP02440027", "SP02440028", "SP02440029", "SP02440030"
     );
 
     /**
@@ -116,21 +124,29 @@ public class RetailConstants {
             "SP02410006", "SP02410007", "SP02410008", "SP02410009", "SP02410010",
             "SP02410011", "SP02410012", "SP02410013", "SP02410014", "SP02410015",
             "SP02410016", "SP02410017", "SP02410018", "SP02410019", "SP02410020",
+            "SP02410021", "SP02410022", "SP02410023", "SP02410024", "SP02410025",
+            "SP02410026", "SP02410027", "SP02410028", "SP02410029", "SP02410030",
             // 升级
             "SP02420001", "SP02420002", "SP02420003", "SP02420004", "SP02420005",
             "SP02420006", "SP02420007", "SP02420008", "SP02420009", "SP02420010",
             "SP02420011", "SP02420012", "SP02420013", "SP02420014", "SP02420015",
             "SP02420016", "SP02420017", "SP02420018", "SP02420019", "SP02420020",
+            "SP02420021", "SP02420022", "SP02420023", "SP02420024", "SP02420025",
+            "SP02420026", "SP02420027", "SP02420028", "SP02420029", "SP02420030",
             // 复消
             "SP02430001", "SP02430002", "SP02430003", "SP02430004", "SP02430005",
             "SP02430006", "SP02430007", "SP02430008", "SP02430009", "SP02430010",
             "SP02430011", "SP02430012", "SP02430013", "SP02430014", "SP02430015",
             "SP02430016", "SP02430017", "SP02430018", "SP02430019", "SP02430020",
+            "SP02430021", "SP02430022", "SP02430023", "SP02430024", "SP02430025",
+            "SP02430026", "SP02430027", "SP02430028", "SP02430029", "SP02430030",
             // 重消
             "SP02440001", "SP02440002", "SP02440003", "SP02440005", "SP02440005",
             "SP02440006", "SP02440007", "SP02440008", "SP02440009", "SP02440010",
             "SP02440011", "SP02440012", "SP02440013", "SP02440014", "SP02440015",
-            "SP02440016", "SP02440017", "SP02440018", "SP02440019", "SP02440020"
+            "SP02440016", "SP02440017", "SP02440018", "SP02440019", "SP02440020",
+            "SP02440021", "SP02440022", "SP02440023", "SP02440024", "SP02440025",
+            "SP02440026", "SP02440027", "SP02440028", "SP02440029", "SP02440030"
     );
 
 }