1

zj

19 hours ago 640ccb9229224642515527daf87f308a7aa9bdf4

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/BankCardController.java

@@ -87,18 +87,18 @@
            String methodType = String.valueOf((Integer) map.get("method_type"));
            if (map.containsKey("img")) {
                if (map.get("img") != null) {
                    map.put("img", awsS3OSSFileService.getUrl(map.get("img").toString()));
                    map.put("img", Constants.IMAGES_HTTP+map.get("img").toString());
                }
            }
            if (map.containsKey("method_img")) {
                if (map.get("method_img") != null) {
                    map.put("method_img", awsS3OSSFileService.getUrl(map.get("method_img").toString()));
                    map.put("method_img", Constants.IMAGES_HTTP+map.get("method_img").toString());
                }
            }
            if (map.containsKey("qrcode")) {
                if (map.get("qrcode") != null) {
                    if ((!map.get("qrcode").toString().startsWith("http"))){
                        map.put("qrcode", awsS3OSSFileService.getUrl(map.get("qrcode").toString()));
                        map.put("qrcode", Constants.IMAGES_HTTP+map.get("qrcode").toString());
                    }
                }
            }
@@ -128,12 +128,12 @@
        String order_no = model.getOrderNo();
        C2cOrder order = this.c2cOrderService.get(order_no);
        if (null == order) {
            throw new YamiShopBindException("订单不存在");
            throw new YamiShopBindException("Order does not exist");
        }
        boolean lock = false;
        try {
            if (!C2cOrderLock.add(order_no)) {
                throw new YamiShopBindException("系统繁忙，请稍后重试");
                throw new YamiShopBindException("System busy, please try again later");
            }
            lock = true;
           sysUserService.checkSafeWord(model.getSafeword());
@@ -155,7 +155,7 @@

        C2cOrder order = this.c2cOrderService.get(model.getOrderNo());
        if (null == order) {
            throw new YamiShopBindException("订单不存在");
            throw new YamiShopBindException("Order does not exist");
        }
        order.setRemark(model.getReason());
        this.c2cOrderService.saveOrderCancel(order, "manager");
@@ -172,7 +172,7 @@
        boolean lock = false;
        try {
            if (!C2cOrderLock.add(model.getOrder_no())) {
                throw new YamiShopBindException("系统繁忙，请稍后重试");
                throw new YamiShopBindException("System busy, please try again later");
            }
            lock = true;
            sysUserService.checkSafeWord(model.getSafeword());