更新维修单

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SellOrder.java

@@ -195,6 +195,8 @@ public class SellOrder {
     @ApiModelProperty(value = "收货状态，NO_RECEIVE 未确认,MANUAL_RECEIVE 手动确认,AUTO_RECEIVE 自动确认",required = true)
     private String receiveStatus;
 
+    private Boolean hasRoute = false;
+
     public String getReceiveStatus() {
         return receiveStatus;
     }
@@ -466,4 +468,12 @@ public class SellOrder {
     public void setRefundTime(Date refundTime) {
         this.refundTime = refundTime;
     }
+
+    public Boolean getHasRoute() {
+        return hasRoute;
+    }
+
+    public void setHasRoute(Boolean hasRoute) {
+        this.hasRoute = hasRoute;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -110,6 +110,9 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 if (!goodsId.equals(sellOrder.getParentGoodsId()) && !goodsId.equals(sellOrder.getGoodsId())) {
                     continue;
                 }
+                if (sellOrder.getHasRoute()) {
+                    continue;
+                }
                 BigDecimal sellOrderActualAmount = BigDecimal.ZERO;
                 BigDecimal sellOrderBalance = BigDecimal.ZERO;
                 if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
@@ -146,6 +149,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 } else {
                     sellOrder.setType(SellTypeEnum.OTHER);
                 }
+                sellOrder.setHasRoute(true);
             }
         }
         sellOrderDao.batchInsert(sellOrderList);
@@ -217,6 +221,9 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                     if (!goods.getId().equals(sellOrder.getParentGoodsId()) && !goods.getId().equals(sellOrder.getGoodsId())) {
                         continue;
                     }
+                    if (sellOrder.getHasRoute()) {
+                        continue;
+                    }
                     BigDecimal sellOrderExpectAmount = BigDecimal.ZERO;
                     BigDecimal sellOrderBalance = BigDecimal.ZERO;
                     if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
@@ -265,6 +272,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                         sellOrder.setBalanceAmount(BigDecimal.ZERO);
                         sellOrder.setExpectAmount(BigDecimal.ZERO);
                     }
+                    sellOrder.setHasRoute(true);
                 }
 
                 sellOrders.addAll(sellOrderList);
@@ -289,7 +297,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<SellOrder> refund(List<SellOrder> sellOrders,Boolean reBackFee) {
+    public List<SellOrder> refund(List<SellOrder> sellOrders, Boolean reBackFee) {
         Date nowDate = new Date();
         for (SellOrder sellOrder : sellOrders) {
             //1、更改销售列表状态
@@ -311,12 +319,12 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
     }
 
     @Override
-    public List<SellOrder> refundByOrderId(Long orderId,Boolean reBackFee) {
+    public List<SellOrder> refundByOrderId(Long orderId, Boolean reBackFee) {
         List<SellOrder> sellOrders = sellOrderDao.getSellOrderByParentGoodsId(orderId, null);
         if (sellOrders.size() <= 0) {
             return sellOrders;
         }
-        return refund(sellOrders,reBackFee);
+        return refund(sellOrders, reBackFee);
     }
 
     @Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -656,6 +656,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 if (!goodsId.equals(sellOrder.getParentGoodsId()) && !goodsId.equals(sellOrder.getGoodsId())) {
                     continue;
                 }
+                if (sellOrder.getHasRoute()) {
+                    continue;
+                }
                 BigDecimal sellOrderExpectAmount = BigDecimal.ZERO;
                 BigDecimal sellOrderBalance = BigDecimal.ZERO;
                 if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
@@ -693,6 +696,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 } else {
                     sellOrder.setType(SellTypeEnum.OTHER);
                 }
+                sellOrder.setHasRoute(true);
             }
         }
         sellOrderDao.batchInsert(sellOrderList);