1

zj

2024-10-29 57c2b6875b5f026a1432f3209471d6b4503f43fc

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

@@ -222,8 +222,8 @@

        for (int i = 0; i <userRecharges.size() ; i++) {
          SitePay s =   sitePayMapper.selectById(userRecharges.get(i).getPayId());
            userRecharges.get(i).setAssetsType(EStockType.JP.getSymbol1());
            userRecharges.get(i).setChannelName(EStockType.JP.getSymbol());
            userRecharges.get(i).setAssetsType(EStockType.getEStockTypeByCode(userRecharges.get(i).getAssetsType()).getSymbol1());
            userRecharges.get(i).setChannelName(EStockType.getEStockTypeByCode(userRecharges.get(i).getAssetsType()).getSymbol());
        }

        return ServerResponse.createBySuccess(pageInfo);
@@ -306,7 +306,7 @@
                return ServerResponse.createByErrorMsg("用户不存在");
            }
//            SitePay payChnnel = sitePayMapper.selectById(userRecharge.getPayId());
            userAssetsServices.availablebalanceChange(EStockType.JP.getCode(),user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
            userAssetsServices.availablebalanceChange(userRecharge.getAssetsType(),user.getId(), EUserAssets.TOP_UP,userRecharge.getPayAmt(),"","");
        }
        userRecharge.setOrderStatus(Integer.valueOf((state.intValue() == 1) ? 1 : 2));
        userRecharge.setPayTime(new Date());
@@ -318,7 +318,7 @@
    }


    public ServerResponse createOrder(Integer userId, Integer state, Integer amt, String payChannel) {
    public ServerResponse createOrder(Integer userId, Integer state, Integer amt, String payChannel,String accectType) {
        if (userId == null || state == null || amt == null) {
            return ServerResponse.createByErrorMsg("参数不能为空");
        }
@@ -342,7 +342,8 @@
        userRecharge.setPayTime(new Date());
        userRecharge.setOrderStatus(Integer.valueOf(1));
        userRecharge.setPayId(1);
        userAssetsServices.availablebalanceChange(EStockType.JP.getCode(),
        userRecharge.setAssetsType(accectType);
        userAssetsServices.availablebalanceChange(userRecharge.getAssetsType(),
                userId,EUserAssets.TOP_UP,new BigDecimal(amt),"","");
        int insertCount = this.userRechargeMapper.insert(userRecharge);
        if (insertCount > 0) {
@@ -352,7 +353,7 @@
    }

    @Override
    public ServerResponse createUSDTOrder(Integer userId, Integer amt,String currency, HttpServletRequest request) {
    public ServerResponse createUSDTOrder(Integer userId, Integer amt,String currency,String accectType, HttpServletRequest request) {
        if (userId == null || amt == null) {
            return ServerResponse.createByErrorMsg("参数不能为空");
        }
@@ -378,6 +379,7 @@
        userRecharge.setPayId(1);
        userRecharge.setRechargeType(1);
        userRecharge.setImg(currency);
        userRecharge.setAssetsType(accectType);
        int insertCount = this.userRechargeMapper.insert(userRecharge);
        if (insertCount > 0) {
            return ServerResponse.createBySuccessMsg("提交成功",request);