Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -211,24 +211,24 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                     complementPrice = complementGoodies.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                 }
 
-                BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
+                BigDecimal hasRouteSellOrderExpectAmount = BigDecimal.ZERO;
                 BigDecimal hasRouteSellOrderBalance = BigDecimal.ZERO;
                 for (SellOrder sellOrder : sellOrderList) {
                     if (!goods.getId().equals(sellOrder.getParentGoodsId()) && !goods.getId().equals(sellOrder.getParentGoodsId())) {
                         continue;
                     }
-                    BigDecimal sellOrderActualAmount = BigDecimal.ZERO;
+                    BigDecimal sellOrderExpectAmount = BigDecimal.ZERO;
                     BigDecimal sellOrderBalance = BigDecimal.ZERO;
                     if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
-                        sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(expectAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
+                        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(balance).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                     }
                      complementGoodsNum = complementGoodsNum - sellOrder.getNum();
                     if (complementGoodsNum <= 0) {
-                        sellOrderActualAmount = expectAmount.subtract(hasRouteSellOrderActualAmount);
-                        sellOrderBalance = balance.subtract(hasRouteSellOrderActualAmount);
+                        sellOrderExpectAmount = expectAmount.subtract(hasRouteSellOrderExpectAmount);
+                        sellOrderBalance = balance.subtract(hasRouteSellOrderBalance);
                     }
-                    hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
+                    hasRouteSellOrderExpectAmount = hasRouteSellOrderExpectAmount.add(sellOrderExpectAmount);
                     hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
 
                     sellOrder.setOrganId(studentPaymentOrder.getOrganId());
@@ -239,14 +239,13 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                         sellOrder.setEduTeacherId(musicGroup.getEducationalTeacherId());
                     }
                     sellOrder.setOrderNo(studentPaymentOrder.getOrderNo());
-                    sellOrder.setActualAmount(sellOrderActualAmount.subtract(sellOrderBalance));
+                    sellOrder.setActualAmount(sellOrderExpectAmount.subtract(sellOrderBalance));
                     sellOrder.setBalanceAmount(sellOrderBalance);
-                    sellOrder.setExpectAmount(sellOrderActualAmount);
+                    sellOrder.setExpectAmount(sellOrderExpectAmount);
                     sellOrder.setNum(1);
                     sellOrder.setUserId(studentPaymentOrder.getUserId());
                     sellOrder.setPaymentChannel(studentPaymentOrder.getPaymentChannel());
                     sellOrder.setMerNo(studentPaymentOrder.getMerNos());
-                    sellOrder.setAccountType(accountType);
                     sellOrder.setSellTime(studentPaymentOrder.getCreateTime());
                     sellOrder.setCreateIme(new Date());
                     sellOrder.setUpdateTime(new Date());

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -340,10 +340,10 @@
         </foreach>
     </select>
     <select id="getInnerRepertoryWarnName" resultType="java.lang.String">
-        SELECT GROUP_CONCAT( DISTINCT name_) FROM goods WHERE stock_count_ &lt;= #{innerRepertoryWarnNum} AND stock_warning_ = 0 AND status_ = 1
+        SELECT GROUP_CONCAT( DISTINCT name_) FROM goods WHERE stock_count_ &lt;= #{innerRepertoryWarnNum} AND stock_warning_ = 1 AND complement_goods_id_list_ IS NULL
     </select>
     <select id="getOuterRepertoryWarnName" resultType="java.lang.String">
-        SELECT GROUP_CONCAT( DISTINCT name_) FROM goods WHERE tax_stock_count_ &lt;= #{outerRepertoryWarnNum} AND stock_warning_ = 0 AND status_ = 1
+        SELECT GROUP_CONCAT( DISTINCT name_) FROM goods WHERE tax_stock_count_ &lt;= #{outerRepertoryWarnNum} AND stock_warning_ = 1 AND complement_goods_id_list_ IS NULL
     </select>
 
     <select id="getWithComplementGoodsAndStatus" resultMap="Goods">

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -30,6 +30,7 @@
         <result column="user_id_" property="userId"/>
         <result column="payment_channel_" property="paymentChannel"/>
         <result column="mer_no_" property="merNo"/>
+        <result column="batch_no_" property="batchNo"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="sell_time_" property="sellTime"/>
         <result column="create_ime_" property="createIme"/>