caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!346 fix & improve

Browse Source 
Merge pull request !346 from OceansDeep/pg
This commit is contained in:
OceansDeep 2024-06-04 06:44:23 +00:00 committed by Gitee
commit a263bc6301
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
View File

@ -743,6 +743,9 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
* @param goodsSku sku * @param goodsSku sku
*/ */
void renderImages(GoodsSku goodsSku, List<String> goodsImages) { void renderImages(GoodsSku goodsSku, List<String> goodsImages) {
if (goodsImages == null || goodsImages.isEmpty()) {
return;
}
JSONObject jsonObject = JSONUtil.parseObj(goodsSku.getSpecs()); JSONObject jsonObject = JSONUtil.parseObj(goodsSku.getSpecs());
List<String> images = jsonObject.getBeanList("images", String.class); List<String> images = jsonObject.getBeanList("images", String.class);
GoodsGallery goodsGallery; GoodsGallery goodsGallery;

4
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
View File

@ -107,7 +107,9 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
//获取已参团人数 //获取已参团人数
this.setMemberVONum(memberVO, pintuan.getRequiredNum(), order.getSn()); this.setMemberVONum(memberVO, pintuan.getRequiredNum(), order.getSn());
memberVO.setOrderSn(order.getSn()); memberVO.setOrderSn(order.getSn());
members.add(memberVO); if (memberVO.getToBeGroupedNum() > 0) {
members.add(memberVO);
}
} }
return members; return members;
} }