下单门店库存管理

yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java

@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
- *
- * https://www.gz-yami.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
 
 package com.yami.shop.api.config;
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java

@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
- *
- * https://www.gz-yami.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
 
 package com.yami.shop.api.controller;
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java

@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
- *
- * https://www.gz-yami.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
 
 package com.yami.shop.api.controller;
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java

@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
- *
- * https://www.gz-yami.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
 
 package com.yami.shop.api.controller;
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java

@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
- *
- * https://www.gz-yami.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
 
 package com.yami.shop.api.controller;
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java

@@ -262,6 +262,9 @@ public class ProdController {
     @GetMapping("/similarProdList")
     @ApiOperation(value = "相似商品", notes = "传入商品id")
     public R<IPage<SimilarProdListVo>> similarProdList(PageParam<Product> page, Long prodId, Long shopId, Long channelId,String userId) {
+        if (channelId == null){
+            channelId = 1L;
+        }
         return R.SUCCESS(prodService.similarProdList(page, prodId , shopId, channelId, userId));
     }
 

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SimilarProdListVo.java

@@ -23,6 +23,8 @@ public class SimilarProdListVo {
     private Long shopId;
     @ApiModelProperty("商品spuID")
     private Long prodId;
+    @ApiModelProperty("商品skuID")
+    private Long skuId;
     @ApiModelProperty("商品购物车数量")
     private Integer prodCount;
     @ApiModelProperty("商品名")

yami-shop-mp/yami-shop-mp-comment/src/main/java/com/yami/shop/mp/comment/model/WeixinSubscribe.java

@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
- *
- * https://www.gz-yami.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
 
 package com.yami.shop.mp.comment.model;
 

yami-shop-service/src/main/resources/mapper/ProductMapper.xml

@@ -1013,6 +1013,7 @@
         p.pic,
         min(cha.channel_prod_price) AS channelProdPrice,
         sum(ss.shop_sku_stocks) shopSkuStocks,
+        min(ss.sku_id) skuId,
         max(b.basket_count ) as prodCount
         FROM tz_category_prod cp
         INNER JOIN tz_prod p on p.prod_id = cp.prod_id
@@ -1022,8 +1023,8 @@
         where p.is_delete = 0 and
         <if test="channelId == null">cha.channel_id = 1</if>
         <if test="channelId != null">cha.channel_id = #{channelId}</if>
-        and
-        cp.code in (select sc.code
+
+        and(cp.code in (select sc.code
         FROM tz_category_prod cp
         LEFT JOIN tz_shop_category sc on cp.code = sc.code
         WHERE sc.level = 2
@@ -1045,7 +1046,7 @@
         AND cha.channel_prod_price BETWEEN
         base_cha.channel_prod_price * 0.9
         AND base_cha.channel_prod_price * 1.1)
-        )
+        ))
         AND p.prod_id != #{prodId}
         GROUP BY p.prod_id
     </select>