1

zj

2024-09-10 1c6748cbef6bf2348106b27fb47a74efff8a8b2e

1

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

@@ -94,9 +94,9 @@
        User user = this.userMapper.selectById(userId);
        /*实名认证开关开启*/
        SiteProduct siteProduct = iSiteProductService.getProductSetting();
        if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
            return ServerResponse.createByErrorMsg("下单失败，请先实名认证");
        }
//        if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
//            return ServerResponse.createByErrorMsg("下单失败，请先实名认证");
//        }

        if(siteProduct.getHolidayDisplay()){
            return ServerResponse.createByErrorMsg("周末或节假日不能交易！");

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

@@ -97,6 +97,9 @@
        if (userAssets.getAvailableBalance().compareTo(amount) < 0) {
            return ServerResponse.createByErrorMsg("订单失败，余额不足", request);
        }
        if(buyNum<100){
            return ServerResponse.createByErrorMsg("最低购买数量"+siteSetting.getBuyMinNum(), request);
        }

        userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
        userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));

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

@@ -132,9 +132,9 @@
        SiteProduct siteProduct = iSiteProductService.getProductSetting();

        User user = this.iUserService.getCurrentRefreshUser(request);
        if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
            return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
        }
//        if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
//            return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
//        }
        // 手续费率
        BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;

@@ -158,17 +158,12 @@
            }
        }

       StockConfig mainBuyConfig =  iStockConfigServices.queryByKey(EConfigKey.MIN_BUY.getCode());

        if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
            return ServerResponse.createByErrorMsg("最低购买数量"+mainBuyConfig.getCValue(), request);
        SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
        if(buyNum<siteSetting.getBuyMinNum()){
            return ServerResponse.createByErrorMsg("最低购买数量"+siteSetting.getBuyMinNum(), request);
        }

        UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
        StockConfig maxBuyConfig =  iStockConfigServices.queryByKey(EConfigKey.MAX_BUY.getCode());
        if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
            return ServerResponse.createByErrorMsg("最高购买数量"+maxBuyConfig.getCValue(), request);
        }

        if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
        }

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

@@ -89,9 +89,9 @@
                    .eq("code", model.getNewCode()).eq("type",model.getType()));
            //实名认证开关
            SiteProduct siteProduct = iSiteProductService.getProductSetting();
            if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
                return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
            }
//            if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
//                return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
//            }
            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
            }

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

@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;

import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.translate.GoogleTranslateUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;

@@ -182,7 +183,10 @@


        List<UserWithdraw> userWithdraws = this.userWithdrawMapper.findUserWithList(user.getId(), withStatus);

        userWithdraws.forEach(f->{
            f.setBankName(new GoogleTranslateUtil().translate(f.getBankName(),request.getHeader("lang")));
            f.setBankAddress(new GoogleTranslateUtil().translate(f.getBankAddress(),request.getHeader("lang")));
        });

        PageInfo pageInfo = new PageInfo(userWithdraws);