|
|
|
@ -46,6 +46,7 @@ import co.yixiang.modules.product.service.YxStoreProductService;
|
|
|
|
|
import co.yixiang.modules.product.service.dto.FromatDetailDto; |
|
|
|
|
import co.yixiang.modules.product.service.dto.ProductFormatDto; |
|
|
|
|
import co.yixiang.modules.product.service.dto.ProductResultDto; |
|
|
|
|
import co.yixiang.modules.product.service.impl.YxStoreProductServiceImpl; |
|
|
|
|
import co.yixiang.modules.product.service.mapper.StoreProductMapper; |
|
|
|
|
import co.yixiang.modules.product.vo.YxStoreProductAttrQueryVo; |
|
|
|
|
import co.yixiang.modules.shop.service.YxSystemConfigService; |
|
|
|
@ -84,12 +85,11 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
|
|
|
|
|
@Autowired |
|
|
|
|
private IGenerator generator; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private YxStoreProductService yxStoreProductService; |
|
|
|
|
@Autowired |
|
|
|
|
private YxStorePinkMapper yxStorePinkMapper; |
|
|
|
|
@Autowired |
|
|
|
|
private YxStoreVisitMapper yxStoreVisitMapper; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private RedisUtils redisUtils; |
|
|
|
|
@Autowired |
|
|
|
@ -105,8 +105,6 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
|
|
|
|
|
@Autowired |
|
|
|
|
private YxShippingTemplatesService shippingTemplatesService; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private YxStoreProductService storeProductService; |
|
|
|
|
@Autowired |
|
|
|
|
private YxSystemConfigService systemConfigService; |
|
|
|
|
|
|
|
|
@ -243,7 +241,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
|
|
|
|
|
List<YxStoreCombinationDto> combinationDTOS = generator.convert(page.getList(),YxStoreCombinationDto.class); |
|
|
|
|
for (YxStoreCombinationDto combinationDTO : combinationDTOS) { |
|
|
|
|
//这里把商品的售价放入到拼团的原价中,方便后台列表查看
|
|
|
|
|
YxStoreProduct yxStoreProduct=yxStoreProductService.getById(combinationDTO.getProductId()); |
|
|
|
|
YxStoreProduct yxStoreProduct=storeProductMapper.selectById(combinationDTO.getProductId()); |
|
|
|
|
if (ObjectUtil.isNotEmpty(yxStoreProduct)){ |
|
|
|
|
combinationDTO.setProductPrice(yxStoreProduct.getPrice()); |
|
|
|
|
}; |
|
|
|
|