fix

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

@@ -10,8 +10,11 @@
 
 package com.yami.shop.api.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.app.dto.SkuDto;
+import com.yami.shop.bean.model.SearchTerm;
 import com.yami.shop.bean.model.Sku;
+import com.yami.shop.common.util.PageParam;
 import com.yami.shop.service.SkuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -45,4 +48,12 @@ public class SkuController {
         List<SkuDto> skuDtoList = mapperFacade.mapAsList(skus.stream().filter(sku -> sku.getStatus() == 1).collect(Collectors.toList()), SkuDto.class);
         return ResponseEntity.ok(skuDtoList);
     }
+
+    @GetMapping("/buyTogetherOften")
+    @ApiOperation(value = "商品详情-经常一起买")
+    public ResponseEntity<IPage<SearchTerm>> buyTogetherOften(PageParam<SearchTerm> page) {
+        IPage<SearchTerm> searchTermIPage = skuService.buyTogetherOften(page);
+        return ResponseEntity.ok(searchTermIPage);
+    }
+
 }

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

@@ -22,7 +22,7 @@
                  LEFT JOIN tz_shop_detail tsd ON tb.shop_id = tsd.shop_id
                  LEFT JOIN tz_prod tp ON tb.prod_id = tp.prod_id
                  LEFT JOIN tz_sku ts ON tb.sku_id = ts.sku_id
-                 LEFT JOIN tz_channel_prod cp on cp.sku_id=ts.sku_id and cp.is_delete=0
+                 LEFT JOIN tz_channel_prod cp on cp.sku_id=ts.sku_id and cp.is_delete=0 and tb.shop_id = cp.shop_id
                  LEFT JOIN tz_user_collection uc ON uc.prod_id = tp.prod_id AND tb.user_id = uc.user_id
         WHERE tp.status = 1 AND ts.status =1 AND tb.user_id = #{userId}
         ORDER BY tb.`basket_id` DESC