Merge remote-tracking branch 'origin/master'

mall-server-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitSalesController.java

@@ -137,6 +137,17 @@ public class WebsitSalesController {
         return ResponseHelper.success();
     }
 
+    @PostMapping("/del")
+    @ApiOperation(value = "网点销售订单-删除")
+    public ResponseHelper del(
+            @RequestBody List<String> salesIds
+    ) throws Exception {
+
+        websitSalesLogic.del(salesIds);
+
+        return ResponseHelper.success();
+    }
+
     @PostMapping("change/cash")
     @ApiOperation(value = "网点销售订单-改为现金支付")
     public ResponseHelper changeCash(
@@ -299,4 +310,6 @@ public class WebsitSalesController {
         websitSalesLogic.testRefund(salesId, request);
         return ResponseHelper.success();
     }
+
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -1515,4 +1515,25 @@ public class WebsitSalesLogic {
                 .one();
         allInPayLogic.serviceRefundOrder(payOrder, null, payOrder.getPayValue());
     }
+
+    @Transactional
+    public void del(List<String> salesIds) {
+        for (String salesId : salesIds) {
+            final boolean success = websitSalesService.lambdaUpdate()
+                    .eq(WebsitSales::getSalesId, salesId)
+                    .eq(WebsitSales::getFlag, MaterialSalesFlagEnum.SUBMIT.getKey())
+                    .remove();
+            if (success) {
+                websitSalesItemService.lambdaUpdate()
+                        .eq(WebsitSalesItem::getSalesId, salesId)
+                        .remove();
+
+                websitSalesPayOrderService.lambdaUpdate()
+                        .eq(WebsitSalesPayOrder::getGoodsType, "M")
+                        .eq(WebsitSalesPayOrder::getPayFlag, IsYesNoEnum.NO.getKey())
+                        .eq(WebsitSalesPayOrder::getOrderId, salesId)
+                        .remove();
+            }
+        }
+    }
 }