Merge remote-tracking branch 'origin/master'

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

@@ -488,6 +488,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 					sellOrder.setGoodsId(goodsNumMapEntry.getKey());
 					sellOrder.setNum(goodsNumMapEntry.getValue().intValue());
 					sellOrder.setStockType(goods.getStockType());
+					sellOrder.setGoodsName(goods.getName());
 					sellOrder.setAccountType(accountType);
 					sellOrder.setBatchNo(batchNoGoodsIdMapEntry.getKey());
 					GoodsProcurement goodsProcurement = goodsProcurementDao.getWithGoodsAndBatchNo(sellOrder.getGoodsId(), sellOrder.getBatchNo());
@@ -512,6 +513,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 				sellOrder.setGoodsId(goodsProcurement.getGoodsId());
 				sellOrder.setNum(1);
 				sellOrder.setStockType(goods.getStockType());
+				sellOrder.setGoodsName(goods.getName());
 				sellOrder.setAccountType(accountType);
 				sellOrder.setBatchNo(goodsProcurement.getBatchNo());
 				if(Objects.nonNull(goodsProcurement.getBatchNo())){

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

@@ -116,13 +116,15 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                     sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(goodsPrice).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                     sellOrderBalance = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(goodsBalance).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                 }
-                hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
-                hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
+
                 complementGoodsNum = complementGoodsNum - sellOrder.getNum();
                 if (complementGoodsNum <= 0) {
                     sellOrderActualAmount = goodsPrice.subtract(hasRouteSellOrderActualAmount);
                     sellOrderBalance = goodsBalance.subtract(hasRouteSellOrderActualAmount);
                 }
+                hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
+                hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
+
                 sellOrder.setExpectAmount(sellOrderActualAmount);
                 sellOrder.setBalanceAmount(sellOrderBalance);
                 sellOrder.setActualAmount(sellOrderActualAmount.subtract(sellOrderBalance));
@@ -221,13 +223,14 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                         sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(expectAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                         sellOrderBalance = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(balance).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                     }
-                    hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
-                    hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
-                    complementGoodsNum = complementGoodsNum - sellOrder.getNum();
+                     complementGoodsNum = complementGoodsNum - sellOrder.getNum();
                     if (complementGoodsNum <= 0) {
                         sellOrderActualAmount = expectAmount.subtract(hasRouteSellOrderActualAmount);
                         sellOrderBalance = balance.subtract(hasRouteSellOrderActualAmount);
                     }
+                    hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
+                    hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
+
                     sellOrder.setOrganId(studentPaymentOrder.getOrganId());
                     sellOrder.setTransNo(studentPaymentOrder.getTransNo());
                     sellOrder.setOrderId(studentPaymentOrder.getId());

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

@@ -111,7 +111,6 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
         studentPaymentRouteOrderDao.insert(studentPaymentRouteOrder);
 
         if (studentPaymentRouteOrderDto.getGoodies() != null && studentPaymentRouteOrderDto.getGoodies().size() > 0) {
-            List<SellOrder> sellOrders = new ArrayList<>();
             BigDecimal hasRouteAmount = BigDecimal.ZERO;
             BigDecimal goodsTotalPrice = BigDecimal.ZERO;
 
@@ -159,11 +158,12 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
                         sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(actualAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                     }
-                    hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
                     goodsNum = goodsNum - sellOrder.getNum();
                     if (goodsNum <= 0) {
                         sellOrderActualAmount = actualAmount.subtract(hasRouteSellOrderActualAmount);
                     }
+                    hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
+
                     sellOrder.setSellTime(studentPaymentRouteOrderDto.getPayTime());
                     sellOrder.setOrganId(studentPaymentRouteOrderDto.getOrganId());
                     sellOrder.setCooperationOrganId(studentPaymentRouteOrderDto.getSchoolId());
@@ -180,10 +180,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     sellOrder.setCreateIme(nowDate);
                     sellOrder.setUpdateTime(nowDate);
                     sellOrder.setType(SellTypeEnum.SCHOOL_BUY);
-                    sellOrders.add(sellOrder);
                 }
             }
-            sellOrderDao.batchInsert(sellOrders);
+            sellOrderDao.batchInsert(sellOrderList);
         }
         return studentPaymentRouteOrderDto;
     }

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

@@ -624,13 +624,13 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                     sellOrderExpectAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(expectAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                     sellOrderBalance = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(goodsBalance).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                 }
-                hasRouteSellOrderExpectAmount = hasRouteSellOrderExpectAmount.add(sellOrderExpectAmount);
-                hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
                 complementGoodsNum = complementGoodsNum - sellOrder.getNum();
                 if (complementGoodsNum <= 0) {
                     sellOrderExpectAmount = expectAmount.subtract(hasRouteSellOrderExpectAmount);
                     sellOrderBalance = goodsBalance.subtract(hasRouteSellOrderBalance);
                 }
+                hasRouteSellOrderExpectAmount = hasRouteSellOrderExpectAmount.add(sellOrderExpectAmount);
+                hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
 
                 sellOrder.setExpectAmount(sellOrderExpectAmount);
                 sellOrder.setBalanceAmount(sellOrderBalance);