1

zj

19 hours ago 640ccb9229224642515527daf87f308a7aa9bdf4

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

@@ -126,13 +126,13 @@
        try {

            if (!C2cOrderLock.add(order_no)) {
                throw new YamiShopBindException("系统繁忙，请稍后重试");
                throw new YamiShopBindException("System busy, please try again later");
            }
            lock = true;

            C2cOrder order = this.c2cOrderService.get(order_no);
            if (null == order) {
                throw new YamiShopBindException("订单不存在");
                throw new YamiShopBindException("Order does not exist");
            }

            sysUserService.checkSafeWord(safeword);
@@ -163,7 +163,7 @@
        String remark = model.getRemark();
        C2cOrder order = c2cOrderService.get(order_no);
        if (null == order) {
            throw new YamiShopBindException("订单不存在");
            throw new YamiShopBindException("Order does not exist");
        }
        order.setRemark("订单号:" + order.getOrderNo() + "管理员取消订单:" + remark);
        this.c2cOrderService.saveOrderCancel(order, "manager");
@@ -207,7 +207,7 @@
        String order_no =request.getOrder_no();
            C2cOrder order = this.c2cOrderService.get(order_no);
            if (null == order) {
                throw new YamiShopBindException("订单不存在");
                throw new YamiShopBindException("Order does not exist");
            }
            Map<String, Object> detail_map =adminC2cOrderService.detail(order);
            User user = userService.getById(order.getPartyId());