Merge remote-tracking branch 'origin/master'

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

@@ -114,6 +114,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void updateGoodsStatus(Integer goodsId, Integer status) {
 		if(Objects.isNull(goodsId)){
 			throw new BizException("请指定商品");
@@ -486,7 +487,12 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 					SellOrder sellOrder = new SellOrder();
 					sellOrder.setGoodsId(goodsNumMapEntry.getKey());
 					sellOrder.setNum(goodsNumMapEntry.getValue().intValue());
-					sellOrder.setStockType(goods.getStockType());
+					sellOrder.setGoodsName(goods.getName());
+					if(StockType.INTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.INTERNAL.equals(accountType))){
+						sellOrder.setStockType(StockType.INTERNAL);
+					}else if(StockType.EXTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.EXTERNAL.equals(accountType))){
+						sellOrder.setStockType(StockType.EXTERNAL);
+					}
 					sellOrder.setGoodsName(goods.getName());
 					sellOrder.setAccountType(accountType);
 					sellOrder.setBatchNo(batchNoGoodsIdMapEntry.getKey());
@@ -511,7 +517,12 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 				sellOrder.setParentGoodsId(goodsProcurement.getParentGoodsId());
 				sellOrder.setGoodsId(goodsProcurement.getGoodsId());
 				sellOrder.setNum(1);
-				sellOrder.setStockType(goods.getStockType());
+				sellOrder.setGoodsName(goods.getName());
+				if(StockType.INTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.INTERNAL.equals(accountType))){
+					sellOrder.setStockType(StockType.INTERNAL);
+				}else if(StockType.EXTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.EXTERNAL.equals(accountType))){
+					sellOrder.setStockType(StockType.EXTERNAL);
+				}
 				sellOrder.setGoodsName(goods.getName());
 				sellOrder.setAccountType(accountType);
 				sellOrder.setBatchNo(goodsProcurement.getBatchNo());
@@ -550,12 +561,12 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		for (SellOrder sellOrder : sellOrders) {
 			Goods goods = goodsDao.get(sellOrder.getGoodsId());
 			GoodsProcurement goodsProcurement = goodsProcurementDao.getWithGoodsAndBatchNo(sellOrder.getGoodsId(), sellOrder.getBatchNo());
-			if(StockType.INTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.INTERNAL.equals(accountType))){
+			if(StockType.INTERNAL.equals(sellOrder.getStockType())){
 				goods.setStockCount(new AtomicInteger(goods.getStockCount()).addAndGet(sellOrder.getNum()));
 				if(Objects.nonNull(goodsProcurement)){
 					goodsProcurement.setStockSoldNum(new AtomicInteger(goodsProcurement.getStockSoldNum()).addAndGet(-sellOrder.getNum()));
 				}
-			}else if(StockType.EXTERNAL.equals(goods.getStockType())||(StockType.ALL.equals(goods.getStockType())&&AccountType.EXTERNAL.equals(accountType))){
+			}else if(StockType.EXTERNAL.equals(sellOrder.getStockType())){
 				goods.setTaxStockCount(new AtomicInteger(goods.getTaxStockCount()).addAndGet(sellOrder.getNum()));
 				if(Objects.nonNull(goodsProcurement)){
 					goodsProcurement.setTaxStockSoldNum(new AtomicInteger(goodsProcurement.getTaxStockSoldNum()).addAndGet(-sellOrder.getNum()));

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"/>
@@ -290,7 +291,7 @@
                 AND FIND_IN_SET(so.organ_id_,#{organIdList})
             </if>
             <if test="goodsName != null and goodsName != ''">
-                AND so.goods_name_ = #{goodsName}
+                AND so.goods_name_ LIKE CONCAT('%',#{goodsName},'%')
             </if>
             <if test="cooperationOrganId != null">
                 AND so.cooperation_organ_id_ = #{cooperationOrganId}

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

@@ -155,6 +155,7 @@
 	</resultMap>
 	<sql id="queryStudentPaymentOrdersSql">
 		<where>
+				spo.type_ IN ('GOODS_SELL','APPLY','SUBJECT_CHANGE') AND so.id_ IS NOT NULL
 			<if test="status != null">
 				AND spo.status_ = #{status}
 			</if>
@@ -178,6 +179,7 @@
 	<select id="countStudentPaymentOrders" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT spo.id_)
 		FROM student_payment_order spo
+		LEFT JOIN sell_order so ON so.order_no_ = spo.order_no_
 		<include refid="queryStudentPaymentOrdersSql"/>
 	</select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -150,7 +150,7 @@ public class RepairController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         queryInfo.setStudentId(sysUser.getId());
-        return succeed(studentGoodsSellService.queryStudentPaymentOrders(queryInfo));
+        return succeed(studentGoodsSellService.queryStudentGoodsOrders(queryInfo));
     }
 
     @ApiOperation(value = "获取学员商品订单")