出货失败处理

src/main/java/org/springblade/common/enums/OrderStateEnum.java

@@ -14,7 +14,8 @@ public enum OrderStateEnum {
 	CANCEL("已取消", 5),
 	REFUNDING("退款中", 6),
 	REFUNDED("已退款", 7),
-	AFTER_SALES("售后", 8);
+	AFTER_SALES("售后", 8),
+	SHIP_FAIL("出货失败", 9);
 	private String name;
 	private Integer value;
 

src/main/java/org/springblade/modules/api/controller/ApiVendingController.java

@@ -80,7 +80,7 @@ public class ApiVendingController {
             //按订单分组
             Map<Long, List<OrderGoodsVO>> vendingOrderGoodMap = vendingOrderVOs.stream().collect(Collectors.groupingBy(OrderGoodsVO::getOrderId));
             OrderVO backOrder = vendingOrderService.getBackOrder(vendingOrderReq);
-            if (Objects.isNull(backOrder)){
+            if (Objects.isNull(backOrder)) {
                 vendingOrderRes.setSaleSn("");
                 vendingOrderRes.setChannelNum("0");
                 vendingOrderRes.setSaledata(new ArrayList<>());
@@ -149,9 +149,20 @@ public class ApiVendingController {
                 orderService.lambdaUpdate()
                         .set(Order::getOrderState, OrderStateEnum.COMPLETED.getValue())
                         .eq(Order::getId, req.getSaleSn());
+
+                orderGoodsService.lambdaUpdate()
+                        .set(OrderGoods::getShipment, 1)
+                        .eq(OrderGoods::getId, req.getOrderGoodsId());
             }
         } else {//出货故障处理
+            //将订单状态改为出货失败
+            orderService.lambdaUpdate()
+                    .set(Order::getOrderState, OrderStateEnum.SHIP_FAIL.getValue())
+                    .eq(Order::getId, req.getSaleSn());
 
+            orderGoodsService.lambdaUpdate()
+                    .set(OrderGoods::getShipment, 0)
+                    .eq(OrderGoods::getId, req.getOrderGoodsId());
         }
 
     }

src/main/java/org/springblade/modules/finance/entity/OrderGoods.java

@@ -51,6 +51,11 @@ public class OrderGoods extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "出货数量")
 	private Integer shipmentNum;
+	/**
+	 * 出货数量
+	 */
+	@ApiModelProperty(value = "出货成功？0不成功，1成功")
+	private Integer shipment;
 	/**
 	* 商品名称
 	*/