Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-23 7085ba24d8decee4b13c86a55b93a3bcc4ea0d03

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java

@@ -1,10 +1,15 @@
package com.ruoyi.other.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.mapper.TCouponMapper;
import com.ruoyi.other.mapper.TVipMapper;
import com.ruoyi.other.service.TVipService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -20,10 +25,28 @@
@Service
public class TVipServiceImpl extends ServiceImpl<TVipMapper, TVip> implements TVipService {

    @Autowired
    private TCouponMapper tCouponMapper;
    @Override
    public PageInfo<TVip> pageList(Integer pageCurr,Integer pageSize) {
        PageInfo<TVip> pageInfo = new PageInfo<>(pageCurr,pageSize);
        List<TVip> list = this.baseMapper.pageList(pageInfo);

        for (TVip tVip : list) {
            String coupon = tVip.getCoupon();
            JSONArray jsonArray = JSONObject.parseArray(coupon);
            StringBuilder stringBuilder = new StringBuilder();
            for (int i = 0; i < jsonArray.size(); i++) {
                JSONObject jsonObject = jsonArray.getJSONObject(i);
                Integer id = jsonObject.getInteger("id");
                Integer number = jsonObject.getInteger("number");
                TCoupon tCoupon = tCouponMapper.selectById(id);
                if (tCoupon!=null){
                    stringBuilder.append(tCoupon.getName()).append("*").append(number).append(";");
                }
            }
            tVip.setCouponName(stringBuilder.toString());
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }