1

zj

19 hours ago 640ccb9229224642515527daf87f308a7aa9bdf4

 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java

@@ -103,29 +103,29 @@
            // 交易所提现是否需要资金密码
            String exchange_withdraw_need_safeword = this.sysparaService.find("exchange_withdraw_need_safeword").getSvalue();
            if(StringUtils.isEmptyString(exchange_withdraw_need_safeword)) {
                throw new YamiShopBindException("系统参数错误");
                throw new YamiShopBindException("System parameter error");
            }

//        if ("true".equals(exchange_withdraw_need_safeword)) {
//
//            if (StringUtils.isEmptyString(safeword)) {
//                throw new YamiShopBindException("资金密码不能为空");
//            }
//
//            if (safeword.length() < 6 || safeword.length() > 12) {
//                throw new YamiShopBindException("资金密码必须6-12位");
//            }
//            if (!userService.checkLoginSafeword(SecurityUtils.getUser().getUserId(),safeword)){
//                throw new YamiShopBindException("资金密码错误");
//            }
//        }
        if ("true".equals(exchange_withdraw_need_safeword)) {

            if (StringUtils.isEmptyString(safeword)) {
                throw new YamiShopBindException("Fund password cannot be empty");
            }

            if (safeword.length() < 6 || safeword.length() > 12) {
                throw new YamiShopBindException("Fund password must be 6-12 characters");
            }
            if (!userService.checkLoginSafeword(SecurityUtils.getUser().getUserId(),safeword)){
                throw new YamiShopBindException("Incorrect fund password");
            }
        }

            // 获取资金账户（capital）
            CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
            /*CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
                    .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
            if(capitaltWallet.getMoney().compareTo(new BigDecimal(amount)) < 0){
                throw new YamiShopBindException("Insufficient available balance for withdrawal！");
            }
            }*/

            this.sessionTokenService.del(session_token);
            Withdraw withdraw = new Withdraw();
@@ -136,24 +136,26 @@
            withdraw.setTx("");

            //获取商户支持币种
            List<Coin> coinList = udunClient.listSupportCoin(false);
            Coin coin = coinList.stream().filter(x -> x.getName().equals(channel)).findFirst().orElse(null);
            /*List<Coin> coinList = udunClient.listSupportCoin(false);
            String channelName = channel.replace("_", "");
            Coin coin = coinList.stream().filter(x -> x.getName().replace("-","").equals(channelName)).findFirst().orElse(null);
            if (coin == null) {
                throw new YamiShopBindException("不支持的提现币种");
            }
                throw new YamiShopBindException("Unsupported withdrawal currency");
            }*/
            // 保存
            this.withdrawService.saveApply(withdraw, channel, null);
            ResultMsg resultMsg = udunClient.withdraw(from, withdraw.getVolume(), coin.getMainCoinType(),
            /*ResultMsg resultMsg = udunClient.withdraw(from, withdraw.getVolume(), coin.getMainCoinType(),
                    coin.getCoinType(), withdraw.getOrderNo(), null);
            if (resultMsg.getCode() != HttpStatus.HTTP_OK) {
                log.error("withdraw:{}", JSONUtil.toJsonStr(resultMsg));
                throw new UdunException(resultMsg.getCode(), resultMsg.getMessage());
            }
            }*/
            resultObject.setCode(0);
        } catch (YamiShopBindException e) { // 1. 显式捕获业务异常，优先处理
            resultObject.setCode(1);
            resultObject.setMsg(e.getMessage()); // 直接获取纯业务消息
            log.error("业务异常: {}", e.getMessage());
            throw e;
        } catch (UdunException e) {
            resultObject.setCode(1);
            resultObject.setMsg(e.getMessage());
@@ -177,6 +179,7 @@

        ResultMsg resultMsg = new ResultMsg();
        try{
            log.info("===withdrawCallback===：{}", body);
            boolean flag = udunClient.checkSign(timestamp, nonce, body, sign);
            log.info("===withdrawCallback===sign：{}", flag);

@@ -197,7 +200,12 @@
                resultMsg.setCode(200);
                return resultMsg;
            }
            withdrawService.examineOk(order_no, Long.valueOf(withdraw.getUserId()));
            Integer status = Integer.valueOf(map.get("status").toString());
            if (status == 3) { //交易成功
                withdrawService.examineOk(withdraw.getUuid(), null);
            } else if(status == 2) {   //驳回
                withdrawService.reject(withdraw.getUuid(), "订单失败：" + status, "withdrawCallback");
            }
            resultMsg.setCode(200);
        }catch (Exception e){
            resultMsg.setCode(500);
@@ -217,7 +225,7 @@
    public Result get(@RequestParam String order_no) throws IOException {
        Withdraw withdraw = this.withdrawService.findByOrderNo(order_no);
        if (withdraw==null){
            throw  new YamiShopBindException("订单不存在!");
            throw new YamiShopBindException("Order does not exist!");
        }
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("order_no", withdraw.getOrderNo());
@@ -247,10 +255,10 @@
            page_no = "1";
        }
        if (!StringUtils.isInteger(page_no)) {
            throw new YamiShopBindException("页码不是整数");
            throw new YamiShopBindException("Page number must be an integer");
        }
        if (Integer.valueOf(page_no).intValue() <= 0) {
            throw new YamiShopBindException("页码不能小于等于0");
            throw new YamiShopBindException("Page number must be greater than 0");
        }
        int page_no_int = Integer.valueOf(page_no).intValue();
        List<Map<String, Object>> data = this.walletLogService.pagedQueryWithdraw(page_no_int, 10, SecurityUtils.getUser().getUserId(), "1").getRecords();