|
|
@@ -22,10 +22,7 @@ import com.yami.shop.bean.model.Area;
|
|
|
import com.yami.shop.bean.model.ChannelProd;
|
|
|
import com.yami.shop.bean.model.UserShopBehavior;
|
|
|
import com.yami.shop.common.util.PageParam;
|
|
|
-import com.yami.shop.dao.AreaMapper;
|
|
|
-import com.yami.shop.dao.ProductMapper;
|
|
|
-import com.yami.shop.dao.SkuMapper;
|
|
|
-import com.yami.shop.dao.UserShopBehaviorMapper;
|
|
|
+import com.yami.shop.dao.*;
|
|
|
import com.yami.shop.service.AreaService;
|
|
|
import com.yami.shop.service.UserShopBehaviorService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -49,6 +46,9 @@ public class UserShopBehaviorServiceImpl extends ServiceImpl<UserShopBehaviorMap
|
|
|
@Autowired
|
|
|
private SkuMapper skuMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private BasketMapper basketMapper;
|
|
|
+
|
|
|
@Override
|
|
|
public int findByUserIdCount(String userId) {
|
|
|
|
|
|
@@ -76,7 +76,7 @@ public class UserShopBehaviorServiceImpl extends ServiceImpl<UserShopBehaviorMap
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public IPage<SearchProdDto> findByProdAndShop(PageParam<SearchProdDto> page, List<ProductDto> productDtos) {
|
|
|
+ public IPage<SearchProdDto> findByProdAndShop(PageParam<SearchProdDto> page, List<ProductDto> productDtos,String userId) {
|
|
|
IPage<SearchProdDto> byProdAndShop = productMapper.findByProdAndShop(page,productDtos);
|
|
|
if (byProdAndShop!=null&&byProdAndShop.getRecords()!=null&&!byProdAndShop.getRecords().isEmpty()){
|
|
|
for (SearchProdDto searchProdDto : byProdAndShop.getRecords()) {
|
|
|
@@ -85,6 +85,7 @@ public class UserShopBehaviorServiceImpl extends ServiceImpl<UserShopBehaviorMap
|
|
|
.stocks(sku.getStocks()).properties(sku.getProperties()).skuId(sku.getSkuId())
|
|
|
.build()).collect(Collectors.toList());
|
|
|
searchProdDto.setSkuList(skuList);
|
|
|
+ int basketTotal = basketMapper.findByCount(searchProdDto.getProdId(),searchProdDto.getShopId(),userId);
|
|
|
}
|
|
|
}
|
|
|
|