modify

Helius

2021-03-11 7fb8daefab9776720052db58bee680f1ab8bba04

 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java

@@ -93,6 +93,12 @@

    @Autowired
    RabiitMqTemplate rabiitMqTemplate;

    @Autowired
    private SysProjUseDao sysProjUseDao;

    @Autowired
    private SysProjServicesService projServicesService;
    @Value("${evn}")
    private String evn;

@@ -130,6 +136,7 @@
        SysUsers user = getMe();
        sysOrder.setShopId(user.getShopId());
        sysOrder.setOrderType(SysOrder.ORDER_TYPE_SEAL);
        sysOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_N);
        //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
        sysOrder = orderService.checkAndSaveOrder(sysOrder);
        orderService.updateReceiptMoney(sysOrder);
@@ -471,13 +478,16 @@
        if (order == null) {
            return new AjaxResult(AjaxResult.STATUS_FAIL, "订单不存在！");
        }

//        SysProjServices sysProjServices = new SysProjServices();
//        projServicesService.findByModel()
        orderService.cancelOrder(id);
        if (del > 0) {
            orderService.removeById(id);
            result.setInfo("删除成功！");
        } else {
//        if (del > 0) {
//            orderService.removeById(id);
//            result.setInfo("删除成功！");
//        } else {
            result.setInfo("取消成功！");
        }
//        }
        result.setStatus(AjaxResult.STATUS_SUCCESS);

        return result;