1

zj

2026-02-03 c7c4c4eec809cfd5e399edab50fae9bf68681585

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

@@ -470,7 +470,7 @@
        order.setRemark(remark);
        // 用户不能取消提现
        if (SecurityUtils.getUser().getUserId().equals(order.getPartyId())) {
            if ("withdraw".equals(order.getDirection())) {
            if ("sell".equals(order.getDirection())) {
                throw new YamiShopBindException("用户不能取消提现");
            }
            this.c2cOrderService.saveOrderCancel(order, "user");
@@ -488,16 +488,17 @@
        if (null == c2cOrder) {
            throw new YamiShopBindException("订单不存在");
        }

        List<String> nos = new ArrayList<String>();
        nos.add(c2cOrder.getOrderNo());
        // TODO: 2023/4/15
//        Map<String, Integer> unreadMsgs =this.otcOnlineChatMessageService.unreadMsgsApi(nos);
//        Integer unreadMsg = unreadMsgs.get(c2cOrder.getOrderNo());
//        if (null == unreadMsg) {
//            c2cOrder.setUnreadMsg(0);
//        } else {
//            c2cOrder.setUnreadMsg(unreadMsg.intValue());
//        }
        Map<String, Integer> unreadMsgs =this.otcOnlineChatMessageService.unreadMsgsApi(nos);
        Integer unreadMsg = unreadMsgs.get(c2cOrder.getOrderNo());
        if (null == unreadMsg) {
            c2cOrder.setUnreadMsg(0);
        } else {
            c2cOrder.setUnreadMsg(unreadMsg);
        }
        if (StringUtils.isNotEmpty(c2cOrder.getMethodImg())) {
            //String path = Constants.WEB_URL + "/public/showimg!showImg.action?imagePath=" + c2cOrder.getMethodImg();
            String path = Constants.IMAGES_HTTP + c2cOrder.getMethodImg();
@@ -508,10 +509,22 @@
        long nowTimestamp = (new Date()).getTime();
        long createTimestamp = c2cOrder.getCreateTime().getTime();
        long autoCancelSeconds = 0;
        long remainSeconds = 0;
        if ("0".equals(c2cOrder.getState())) {
            autoCancelSeconds = c2cOrder.getExpireTime() * 60 * 1000 - (nowTimestamp - createTimestamp);
            remainSeconds = c2cOrder.getExpireTime() * 60 * 1000 * 2 - (nowTimestamp - createTimestamp);
        } else if ("1".equals(c2cOrder.getState())) {
            long payTimestamp = c2cOrder.getPayTime().getTime();
            autoCancelSeconds = c2cOrder.getExpireTime() * 60 * 1000 - (nowTimestamp - createTimestamp);
            remainSeconds = c2cOrder.getExpireTime() * 60 * 1000 - (nowTimestamp - payTimestamp);
        }

        c2cOrder.setAutoCancelTimeRemain((int) (autoCancelSeconds <= 0 ? 0 : autoCancelSeconds / 1000));
        c2cOrder.setExpireTimeRemain((int) (remainSeconds <= 0 ? 0 : remainSeconds / 1000));

        if (c2cOrder.getC2cUserHeadImg() != null) {
            c2cOrder.setC2cUserHeadImg(Constants.IMAGES_HTTP + c2cOrder.getC2cUserHeadImg());
        }
        return Result.succeed(c2cOrder);
    }

@@ -560,12 +573,12 @@
            throw new YamiShopBindException("页码不能小于等于0");
        }
        int page_no_int = Integer.valueOf(page_no).intValue();
        if (StringUtils.isNotEmpty(direction) && !Arrays.asList("recharge", "withdraw").contains(direction)) {
        /*if (StringUtils.isNotEmpty(direction) && !Arrays.asList("recharge", "withdraw").contains(direction)) {
            throw new YamiShopBindException("充值或提现不正确");
        }
        if (StringUtils.isNotEmpty(state) && !Arrays.asList("0", "3", "4").contains(state)) {
            throw new YamiShopBindException("订单状态不正确");
        }
        }*/
        Page page = this.c2cOrderService.pagedQuery(page_no_int, 20, direction, state, partyId);
        if (null == page) {
            return Result.succeed(new ArrayList<Map<String, Object>>());