Merge remote-tracking branch 'origin/dev' into dev

huliguo

4 小时以前 cbad982befcf58521b224da1e8898c23c5e0d2c6

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

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

import com.ruoyi.account.api.feignClient.AppCouponClient;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.mapper.TCouponMapper;
import com.ruoyi.other.query.CouponQuery;
import com.ruoyi.other.service.TCouponService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.util.List;

/**
 * <p>
@@ -17,4 +25,34 @@
@Service
public class TCouponServiceImpl extends ServiceImpl<TCouponMapper, TCoupon> implements TCouponService {

    @Autowired
    private AppCouponClient appCouponClient;
    @Override
    public PageInfo<TCoupon> pageList(CouponQuery dto) {
        PageInfo<TCoupon> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<TCoupon> list = this.baseMapper.pageList(pageInfo,dto);
        StringBuilder couponIds = new StringBuilder();
        for (TCoupon tCoupon : list) {
            couponIds.append(tCoupon.getId()).append(",");
            // 如果优惠券库存为0 那么将优惠券状态改为下架 不启用
            if (tCoupon.getInventoryQuantity()==0){
                tCoupon.setStatus(2);
                this.baseMapper.updateById(tCoupon);

            }

        }
        if (!list.isEmpty()){
            if (StringUtils.hasLength(couponIds)){
                // 去除最后一个字符
                couponIds.deleteCharAt(couponIds.length()-1);
            }
            List<Integer> data = appCouponClient.getCountByCouponIds(couponIds.toString()).getData();
            for (int i = 0; i < list.size(); i++) {
                list.get(i).setCount(data.get(i));
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
}