phpcjl
2024-12-13 5d3f48d2842b9c5cbd336a013fb6cd8ea2a3eb6b
1.后台管理-评论
2.后台管理-门店特殊价
2个文件已修改
23 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/OrderActivityInfo.java
@@ -82,6 +82,10 @@
    @TableField(exist = false)
    private String idStr;
    @ApiModelProperty(value = "会员名称")
    @TableField(exist = false)
    private String vipName;
    public String getIdStr() {
        return String.valueOf(id);
    }
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.other.api.domain.OrderActivityInfo;
import com.ruoyi.other.service.OrderActivityInfoService;
import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -34,6 +35,8 @@
    @Resource
    private OrderActivityInfoService orderActivityInfoService;
    @Resource
    private VipSettingService vipSettingService;
    
    
    /**
@@ -107,6 +110,22 @@
            }else {
                item.setStatus(0); // 未开始
            }
            String vipIds = item.getVipIds();
            if (StringUtils.isNotEmpty(vipIds)){
                String[] vipIdArr = vipIds.split(",");
                if (vipIdArr.length == 7){
                    item.setVipIds("全部");
                }else {
                    List<String> vipNameList = new ArrayList<>();
                    for (String vipId : vipIdArr) {
                        String vipName = vipSettingService.getById(Long.parseLong(vipId)).getVipName();
                        vipNameList.add(vipName);
                    }
                    item.setVipName(String.join(",", vipNameList));
                }
            }
        });
        return R.ok(page);
    }