刘俊驰 1 年間 前
コミット
1ae29c9c6b

+ 3 - 0
mec-common/common-core/src/main/java/com/ym/mec/common/dto/OrderCreate.java

@@ -68,6 +68,9 @@ public class OrderCreate {
 
 //    @ApiModelProperty(value = "订单状态:0->待付款;1->待发货;2->已发货;3->已完成;4->已关闭;5->无效订单")
     private Integer status;
+
+    // 需要关闭的订单号
+    private List<String> closeOrderNoList;
     @Data
     public static class OrderItem implements Serializable {
 

+ 3 - 0
mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dto/OrderCreate.java

@@ -68,6 +68,9 @@ public class OrderCreate {
     @ApiModelProperty("商品详情")
     private List<OrderItem> orderItemList;
 
+    // 需要关闭的订单号
+    private List<String> closeOrderNoList;
+
     @Data
     public static class OrderItem implements Serializable {
 

+ 10 - 0
mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -767,6 +767,16 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         if (!CollectionUtils.isEmpty(orderItemList)) {
             omsOrderItemMapper.insertList(orderItemList);
         }
+
+        // 关闭需要关闭的订单
+        if(!CollectionUtils.isEmpty(order.getCloseOrderNoList())) {
+            OmsOrderExample example = new OmsOrderExample();
+            example.createCriteria().andOrderSnIn(order.getCloseOrderNoList());
+            OmsOrder record = new OmsOrder();
+            record.setStatus(4);
+            orderMapper.updateByExampleSelective(record, example);
+        }
+
         // 如果订单状态是已发货,扣减库存
         if (order.getStatus() ==2 || order.getStatus() == 3) {