|
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.qs.mp.admin.domain.CdKey;
|
|
|
import com.qs.mp.admin.domain.CdKeyGroup;
|
|
|
import com.qs.mp.admin.domain.CdKeyGroupGoods;
|
|
|
+import com.qs.mp.admin.domain.Goods;
|
|
|
import com.qs.mp.admin.domain.excel.CdKeyOrderExcel;
|
|
|
import com.qs.mp.admin.domain.param.CdKeyActivateParam;
|
|
|
import com.qs.mp.admin.domain.param.CdKeyCreateParam;
|
|
@@ -16,6 +17,7 @@ import com.qs.mp.admin.domain.vo.CdKeyGroupVO;
|
|
|
import com.qs.mp.admin.service.ICdKeyGroupGoodsService;
|
|
|
import com.qs.mp.admin.service.ICdKeyGroupService;
|
|
|
import com.qs.mp.admin.service.ICdKeyService;
|
|
|
+import com.qs.mp.admin.service.IGoodsService;
|
|
|
import com.qs.mp.channel.domain.Channel;
|
|
|
import com.qs.mp.channel.service.IChannelService;
|
|
|
import com.qs.mp.common.core.domain.AjaxResult;
|
|
@@ -63,6 +65,9 @@ public class CdKeyMgrController extends BaseController {
|
|
|
@Autowired
|
|
|
private IChannelService channelService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IGoodsService goodsService;
|
|
|
+
|
|
|
@Value("${cloud.public-bucket-name}")
|
|
|
private String publicBucketName;
|
|
|
|
|
@@ -155,6 +160,13 @@ public class CdKeyMgrController extends BaseController {
|
|
|
CdKeyGroup cdKeyGroup = cdKeyGroupService.getById(groupId);
|
|
|
CdKeyGroupVO cdKeyGroupVO = mapperFacade.map(cdKeyGroup, CdKeyGroupVO.class);
|
|
|
List<CdKeyGroupGoods> goodsList = cdKeyGroupGoodsService.list(new QueryWrapper<CdKeyGroupGoods>().eq("group_id", groupId));
|
|
|
+ goodsList.forEach(g ->{
|
|
|
+ if (StringUtils.isNotEmpty(g.getRefId())) {
|
|
|
+ Goods goods = goodsService.getById(g.getRefId());
|
|
|
+ g.setTitle(goods.getTitle());
|
|
|
+ g.setPicUrl(goods.getPicUrl());
|
|
|
+ }
|
|
|
+ });
|
|
|
cdKeyGroupVO.setGoodsList(goodsList);
|
|
|
return AjaxResult.success(cdKeyGroupVO);
|
|
|
}
|
|
@@ -187,6 +199,11 @@ public class CdKeyMgrController extends BaseController {
|
|
|
cdKeyExchangeVOList.forEach(cdKeyExchangeVO -> {
|
|
|
cdKeyExchangeVO.setRemainQty((int) unCashedCount);
|
|
|
cdKeyExchangeVO.setCashedQty((int) cashedCount);
|
|
|
+ if (StringUtils.isNotEmpty(cdKeyExchangeVO.getRefId())) {
|
|
|
+ Goods goods = goodsService.getById(cdKeyExchangeVO.getRefId());
|
|
|
+ cdKeyExchangeVO.setGoodsName(goods.getTitle());
|
|
|
+ cdKeyExchangeVO.setPicUrl(goods.getPicUrl());
|
|
|
+ }
|
|
|
});
|
|
|
return getDataTable(cdKeyExchangeVOList);
|
|
|
|