1

zj

2025-08-12 433a5af0116ed14adaddf84ba7549fb6c36d5faa

 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.*;
@@ -83,6 +85,9 @@
    @Autowired
    PaymentRechargeService paymentRechargeService;

    @Autowired
    UserAssetsServices userAssetsServices;

    public ServerResponse thirdPartyRecharge(HttpServletRequest request, String tradeAmount, Integer type) throws UnsupportedEncodingException, JsonProcessingException, NoSuchAlgorithmException {
        // 支付1
        String reqUrl = "https://api.watchglb.com/pay/web";
@@ -156,7 +161,7 @@
        userRecharge.setNickName(user.getRealName());
        userRecharge.setAgentId(user.getAgentId());
        userRecharge.setOrderSn(params.get("out_trade_no"));
        userRecharge.setPayChannel("支付1");
        userRecharge.setPayChannel("Payment 1");
        userRecharge.setPayAmt(amount);
        userRecharge.setAddTime(new Date());
        userRecharge.setPayTime(new Date());
@@ -737,7 +742,7 @@
            }
            UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<>(UserAssets.class)
                    .eq(UserAssets::getUserId, paymentRecharge.getUserId())
                    .eq(UserAssets::getAccectType, "IN")
                    .eq(UserAssets::getAccectType, "US")
            );
            ServerResponse serverResponse = iUserAssetsServices.updateUserAssets(userAssets.getId(), vo.getOriAmount().toString(), "2");
            if(serverResponse.getStatus() == 0){
@@ -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);
@@ -960,15 +965,16 @@

            UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<>(UserAssets.class)
                    .eq(UserAssets::getUserId, paymentRecharge.getUserId())
                    .eq(UserAssets::getAccectType, "IN")
                    .eq(UserAssets::getAccectType, "US")
            );
            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.US.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);