fix

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

@@ -51,8 +51,8 @@ public class SkuController {
 
     @GetMapping("/buyTogetherOften")
     @ApiOperation(value = "商品详情-经常一起买")
-    public ResponseEntity<IPage<SkuBuyTogetherOftenVo>> buyTogetherOften(PageParam<SkuBuyTogetherOftenVo> page, Long skuId,Long shopId) {
-        return ResponseEntity.ok(skuService.buyTogetherOften(page,skuId,shopId));
+    public ResponseEntity<IPage<SkuBuyTogetherOftenVo>> buyTogetherOften(PageParam<SkuBuyTogetherOftenVo> page, Long skuId,Long shopId,Long channelId) {
+        return ResponseEntity.ok(skuService.buyTogetherOften(page,skuId,shopId,channelId));
     }
 
 }

yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java

@@ -35,6 +35,7 @@ public interface SkuMapper extends BaseMapper<Sku> {
     List<Sku> listByProdIdAndPlatform(@Param("prodId") Long prodId, @Param("platform") Integer platform, @Param("shopId") Long shopId);
 
     Sku listBySukIdAndPlatformShop(@Param("skuId") Long skuId, @Param("platform") Integer platform, @Param("shopId") Long shopId);
+
     Sku listBySukIdAndPlatform(@Param("skuId") Long skuId, @Param("platform") Integer platform);
 
     int updateStocks(@Param("sku") Sku sku);
@@ -52,5 +53,6 @@ public interface SkuMapper extends BaseMapper<Sku> {
     Sku selectByHbSkuId(@Param("hbSkuId") String hbSkuId);
 
     IPage<SkuBuyTogetherOftenVo> buyTogetherOften(@Param("page") PageParam<SkuBuyTogetherOftenVo> page,
-                                                  @Param("skuId") Long skuId,@Param("shopId") Long shopId);
+                                                  @Param("skuId") Long skuId, @Param("shopId") Long shopId,
+                                                  @Param("channelId") Long channelId);
 }

yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java

@@ -65,5 +65,5 @@ public interface SkuService extends IService<Sku> {
 
     void removeSkuCacheBySkuId(Long skuId, Long prodId);
 
-    IPage<SkuBuyTogetherOftenVo> buyTogetherOften(PageParam<SkuBuyTogetherOftenVo> page, Long skuId,Long shopId);
+    IPage<SkuBuyTogetherOftenVo> buyTogetherOften(PageParam<SkuBuyTogetherOftenVo> page, Long skuId,Long shopId,Long channelId);
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/SkuServiceImpl.java

@@ -68,7 +68,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
     }
 
     @Override
-    public IPage<SkuBuyTogetherOftenVo> buyTogetherOften(PageParam<SkuBuyTogetherOftenVo> page, Long skuId,Long shopId) {
-        return skuMapper.buyTogetherOften(page, skuId,shopId);
+    public IPage<SkuBuyTogetherOftenVo> buyTogetherOften(PageParam<SkuBuyTogetherOftenVo> page, Long skuId,Long shopId,Long channelId) {
+        return skuMapper.buyTogetherOften(page, skuId,shopId,channelId);
     }
 }

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

@@ -539,7 +539,6 @@
         LEFT JOIN tz_user_addr_order b on a.addr_order_id=b.addr_order_id
         LEFT JOIN tz_shop_detail c on a.shop_id=c.shop_id
         <where>
-            a.dvy_type=1
             <if test="orderParam.orderNumber != null and orderParam.orderNumber != ''">
                 and a.order_number = #{orderParam.orderNumber}
             </if>

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

@@ -186,12 +186,15 @@
                  LEFT JOIN tz_sku b on a.sku_id = b.sku_id
                  LEFT JOIN tz_channel_prod c on a.sku_id = c.sku_id and c.is_delete = 0
                  LEFT JOIN tz_shop_sku d on a.sku_id = d.sku_id and d.is_delete = 0
-        WHERE a.order_number in (SELECT order_number FROM tz_order_item WHERE sku_id = #{skuId} and shop_id = #{shopId})
+        WHERE a.order_number in (SELECT a.order_number FROM tz_order_item a
+                                 LEFT JOIN tz_order b on a.order_number=b.order_number
+                                 WHERE a.sku_id = #{skuId} and a.shop_id = #{shopId} and b.channel_id=#{channelId})
           and a.sku_id!=#{skuId}
           and a.shop_id=#{shopId}
           and b.`status`=1
           and b.is_delete=0
           and d.sale_status=1
+          and c.channel_id=#{channelId}
         GROUP BY a.sku_id
         ORDER BY a.rec_time desc, a.order_item_id desc
     </select>