1

zj

2025-07-30 c3ae54fb66a8f097a63fc457d611da8fcfdc1de5

1

 src/main/java/com/nq/service/impl/PayServiceImpl.java

@@ -8,6 +8,8 @@
import com.nq.common.CmcPayConfig;
import com.nq.common.ServerResponse;
import com.nq.dao.*;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pay.PayUtil;
import com.nq.pojo.*;
import com.nq.service.*;
@@ -82,6 +84,9 @@

    @Autowired
    PaymentRechargeService paymentRechargeService;

    @Autowired
    UserAssetsServices userAssetsServices;

    public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount, Integer type) throws UnsupportedEncodingException, JsonProcessingException, NoSuchAlgorithmException {
        // 支付1
@@ -946,7 +951,7 @@
                return;
            }else if(vo.getStatus().equals("payin_fail")){
                paymentRecharge.setStatus(2);
                paymentRecharge.setAmount(new BigDecimal(vo.getAccount_fee()));
                paymentRecharge.setAmount(new BigDecimal(vo.getTotal_fee()));
                paymentRecharge.setPayInfo(vo.toString());
                paymentRechargeService.updateById(paymentRecharge);
                userRecharge.setOrderStatus(2);
@@ -962,13 +967,14 @@
                    .eq(UserAssets::getUserId, paymentRecharge.getUserId())
                    .eq(UserAssets::getAccectType, "IN")
            );
            ServerResponse serverResponse = iUserAssetsServices.updateUserAssets(userAssets.getId(), vo.getAccount_fee().toString(), "2");
            if(serverResponse.getStatus() == 0){
                paymentRecharge.setStatus(2);
                paymentRecharge.setAmount(new BigDecimal(vo.getAccount_fee()));
                paymentRecharge.setPayInfo(vo.toString());
                paymentRechargeService.updateById(paymentRecharge);
            }
//            ServerResponse serverResponse = iUserAssetsServices.updateUserAssets(userAssets.getId(), vo.getTotal_fee().toString(), "2");
            userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),
                    paymentRecharge.getUserId(), EUserAssets.TOP_UP,new BigDecimal(vo.getTotal_fee().toString()),"","");

            paymentRecharge.setStatus(2);
            paymentRecharge.setAmount(new BigDecimal(vo.getTotal_fee()));
            paymentRecharge.setPayInfo(vo.toString());
            paymentRechargeService.updateById(paymentRecharge);

            userRecharge.setOrderStatus(1);
            userRechargeMapper.updateById(userRecharge);

 src/main/java/com/nq/service/impl/UserAssetsServices.java

@@ -214,6 +214,7 @@
                   BigDecimal subtract = amount.subtract(userAssets.getHandlingChargeWritten());
                   if(subtract.compareTo(BigDecimal.ZERO) >= 0) {
                       BigDecimal decimal = amount.subtract(userAssets.getAmountToBeCovered());
                       decimal = decimal.subtract(userAssets.getHandlingChargeWritten());
                       userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.subtract(userAssets.getHandlingChargeWritten())));
                       userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
                       userAssets.setAmountToBeCovered(decimal.negate());