瀏覽代碼

fix:订单取消需改

liujunchi 2 年之前
父節點
當前提交
928388d3ce

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -246,4 +246,6 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     void mallBuyOrderCallback(StudentPaymentOrder order);
 
     void mallSaveOrderInfo(MallCreateOrderModel model);
+
+    OrderCancelModel cancelOrder(StudentPaymentOrder orderByOrderNo);
 }

+ 18 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1219,4 +1219,22 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         studentGoodsSell.setGoodsType("MALL");
         studentGoodsSellDao.update(studentGoodsSell);
     }
+
+    @Override
+    public OrderCancelModel cancelOrder(StudentPaymentOrder order) {
+        OrderCancelModel model = new OrderCancelModel();
+        try {
+            TenantContextHolder.setTenantId(order.getTenantId());
+            order.setStatus(DealStatusEnum.FAILED);
+            order.setMemo("超时未支付关闭");
+            callOrderCallBack(order);
+            TenantContextHolder.clearTenantId();
+            model.setSuccess(true);
+            model.setStatus(false);
+        } catch (Exception e) {
+            model.setSuccess(false);
+            e.printStackTrace();
+        }
+        return model;
+    }
 }

+ 1 - 2
mec-web/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -204,8 +204,7 @@ public class APIController extends BaseController {
 				cancelModel.setStatus(false);
 				return succeed(cancelModel);
 			}
-			cancelModel = studentPaymentOrderService.updateOrderStatus(new Date(), new HashMap<>(),
-																						 orderByOrderNo, false);
+			cancelModel = studentPaymentOrderService.cancelOrder(orderByOrderNo);
 			return succeed(cancelModel);
 		} catch (Exception e) {
 			e.printStackTrace();