phpcjl
2024-12-11 d489379928b6940e7f5ad4ea1f8a13294316a87f
1.后台管理-商品管理
1个文件已修改
32 ■■■■ 已修改文件
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/VipCenterController.java
@@ -6,6 +6,7 @@
import com.ruoyi.account.vo.vip.Level;
import com.ruoyi.account.vo.vip.VipLevel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.*;
@@ -87,21 +88,22 @@
                level.setVipDesc(baseSetting.getContent());
                R<List<VipGood>> vipGoodR = vipGoodsMap.get(vipSetting.getId());
                if (R.isSuccess(vipGoodR)) {
                    List<VipGood> vipGoodList = vipGoodR.getData();
                    if (vipGoodList != null && !vipGoodList.isEmpty()) {
                        List<String> goodsNames = new ArrayList<>();
                        vipGoodList.forEach(vipGood -> {
                            String goodJson = vipGood.getGoodJson();
                            if (isValidJson(goodJson)) {
                                Goods goods = JSONObject.parseObject(goodJson, Goods.class);
                                goodsNames.add(goods.getName());
                            } else {
                                log.warn("JSON无效: " + goodJson);
                            }
                        });
                        level.setGoodsNames(goodsNames);
                    }
                if (R.isError(vipGoodR)) {
                    throw new ServiceException("会员商品获取失败");
                }
                List<VipGood> vipGoodList = vipGoodR.getData();
                if (vipGoodList != null && !vipGoodList.isEmpty()) {
                    List<String> goodsNames = new ArrayList<>();
                    vipGoodList.forEach(vipGood -> {
                        String goodJson = vipGood.getGoodJson();
                        if (isValidJson(goodJson)) {
                            Goods goods = JSONObject.parseObject(goodJson, Goods.class);
                            goodsNames.add(goods.getName());
                        } else {
                            log.warn("JSON无效: " + goodJson);
                        }
                    });
                    level.setGoodsNames(goodsNames);
                }
                levelList.add(level);
            });