订单商品过滤

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -445,6 +445,7 @@ public class GoodsSpuController {
             if(selectSpecialFlag!=null&& selectSpecialFlag.equals(1)){
                 if(!spu.getSpecialSkuId().equals(0L)){
                     GoodsSku goodsSku = goodsSkuService.getById(spu.getSpecialSkuId());
+                    spu.setSkuId(goodsSku.getId());
                     spu.setSkuCode(goodsSku.getSkuCode());
                     spu.setSkuPrice(goodsSku.getSalesPrice());
                     spu.setVolume(goodsSku.getVolume().toString());
@@ -456,6 +457,7 @@ public class GoodsSpuController {
                 if(spu.getSpuCode().equals(skuKey.getSkuCode())){
                     GoodsSku goodsSku = goodsSkuService.getByCode(skuKey.getInvCode());
                     spu.setSkuCode(goodsSku.getSkuCode());
+                    spu.setSkuId(goodsSku.getId());
                     spu.setSkuPrice(goodsSku.getSalesPrice());
                     spu.setVolume(goodsSku.getVolume().toString());
                     spu.setWeight(goodsSku.getWeight().toString());

src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java

@@ -156,6 +156,9 @@ public class GoodsSpu implements Serializable {
     @TableField(exist = false)
     private BigDecimal skuPrice;
 
+    @TableField(exist = false)
+    private Long skuId;
+
     @TableField(exist = false)
     private String skuCode;
 

src/main/java/com/qs/serve/modules/goods/mapper/GoodsCrmSkuMapper.java

@@ -77,7 +77,7 @@ public interface GoodsCrmSkuMapper {
      * 根据sku状态，更新spu上架状态
      * @return
      */
-    @Update("update goods_spu set shelf = 0 where goods_spu.id not in ( " +
+    @Update("update goods_spu set order_flag = 0 where goods_spu.id not in ( " +
             " select goods_sku.spu_id from goods_sku where goods_sku.`enable` = 1 " +
             ") ")
     int updateSpuShelfBySku();

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -261,11 +261,15 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
                 goodsSpu = goodsSpuService.getById(goodsSku.getSpuId());
             }else {
                 //PC下单
-                //goodsSpu = goodsSpuService.getById(modifyItem.getSpuId());
                 goodsSpu = goodsSpuMap.get(modifyItem.getSpuId());
+                //防止切换ID
+                if(modifyItem.getSkuId()!=null){
+                    goodsSku = goodsSkuService.getById(modifyItem.getSkuId());
+                }else {
                     String skuCode = spuGetSkuMap.get(goodsSpu.getSpuCode());
                     goodsSku = goodsSkuService.getByCode(skuCode);
                 }
+            }
             OmsOrderItem orderItem = new OmsOrderItem();
             orderItem.setOrderId(order.getId());
             orderItem.setOrderSn(order.getOrderSn());

src/main/resources/log4j2.xml

@@ -20,6 +20,11 @@
         </console>
         <File name="Filelog" fileName="${FILE_PATH}/test.log" append="false">
             <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="20MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
         </File>
 
 		<!-- info -->

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -88,9 +88,13 @@
             <if test="query.updateBy != null and query.updateBy != ''"> and `goods_spu`.`update_by` = #{query.updateBy}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and `goods_spu`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.delFlag != null and query.delFlag != ''"> and `goods_spu`.`del_flag` = #{query.delFlag}</if>
-            <if test="query.selectSpecialFlag != null and query.selectSpecialFlag != 0">
+            <if test="query.orderFlag != null"> and `goods_spu`.`order_flag` = #{query.orderFlag}</if>
+            <if test="query.selectSpecialFlag != null and query.selectSpecialFlag == 1">
                 and `goods_spu`.`special_sku_id` is not null and `goods_spu`.`special_sku_id` != '0'
             </if>
+            <if test="query.selectSpecialFlag != null and query.selectSpecialFlag == 0">
+                and (`goods_spu`.`special_sku_id` is null or `goods_spu`.`special_sku_id` = '0')
+            </if>
             <if test="query.searchValue != null and query.searchValue != ''"> and (`goods_spu`.`name` like concat('%',#{query.searchValue},'%') or `goods_spu`.`goods_spu` like concat('%',#{query.searchValue},'%')) </if>
             <if test="query.selectIds!=null and query.selectIds.size > 0">
                 and `goods_spu`.`id` in