bug修改

无关风月

2025-05-08 9486766c806fe1d9e082b2fd02ea1cc558f1b443

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java

@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.entity.TStudent;
import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -17,13 +19,20 @@
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.IntegralGoodsOfSearch;
import com.dsh.activity.service.ICouponService;
import com.dsh.activity.service.UserCouponService;
import com.dsh.activity.util.RedisUtil;
import com.dsh.activity.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -38,36 +47,41 @@
    @Resource
    private StudentClient studentClient;

    @Autowired
    private UserCouponService userCouponService;

    @Autowired
    private ICouponService couponService;


    @Autowired
    private RedisUtil redisUtil;


    /**
     * 获取购买会员支付成功页面的优惠券
     *
     * @param uid
     * @return
     * @throws Exception
     */
    @Override
    public List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception {
        AppUser appUser = appUserClient.queryAppUser(uid);
        String value = redisUtil.getValue("VIP_P_" + uid);
        if (ToolUtil.isEmpty(value)) {
            Thread.sleep(3000);
            value = redisUtil.getValue("VIP_P_" + uid);
        }
        List<CouponListVo> listVos = new ArrayList<>();
        if (null != appUser) {
            List<Integer> userPopulation = new ArrayList<>();
            userPopulation.add(1);//全部用户
            if (1 == appUser.getIsVip()) {
                userPopulation.add(2);//年度会员
            }
            List<Student> students = studentClient.queryStudentList(uid);
            if (students.size() > 0) {
                userPopulation.add(3);//已有学员用户
            }
            List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", distributionMethod).in("userPopulation", userPopulation)
                    .eq("auditStatus", 2).eq("status", 2).eq("state", 1)
                    .last(" and now() between startTime and endTime order by insertTime desc"));
        if (ToolUtil.isNotEmpty(value)) {
            List<Long> longs = JSON.parseArray(value, Long.class);
            List<UserCoupon> list = userCouponService.getBaseMapper().selectBatchIds(longs);
            List<Integer> collect = list.stream().map(UserCoupon::getCouponId).collect(Collectors.toList());
            List<Coupon> coupons = couponService.getBaseMapper().selectBatchIds(collect);
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            for (Coupon coupon : list) {
            for (Coupon coupon : coupons) {
                if (coupon.getDistributionMethod() != 2) {
                    continue;
                }
                CouponListVo couponListVo = new CouponListVo();
                couponListVo.setId(coupon.getId().longValue());
                couponListVo.setName(coupon.getName());
@@ -97,7 +111,6 @@
    }



    @Override
    public Map<String, Object> queryConponRuleOfJson(Integer id) {
        return this.baseMapper.queryConponRuleOfJson(id);
@@ -105,17 +118,31 @@

    @Override
    public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) {
        return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId());
        return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),
                ofSearch.getType(),
                ofSearch.getDistributionMethod(),
                ofSearch.getUserPopulation(),
                ofSearch.getStatus(),
                ofSearch.getState(),
                ofSearch.getCityCode(),
                ofSearch.getStoreId(),
                ofSearch.getOperatorId(),
                ofSearch.getObjType());
    }

    @Override
    public List<Map<String, Object>> queryCouponListOfSearch1(CouponListOfSearch ofSearch) {
        return this.baseMapper.queryCouponListOfSearch1(ofSearch.getName(), ofSearch.getType(), ofSearch.getDistributionMethod(), ofSearch.getUserPopulation(), ofSearch.getStatus(), ofSearch.getState(), ofSearch.getPage(), ofSearch.getCityCode(), ofSearch.getStoreId());
    }

    @Override
    public List<Map<String, Object>> queryCouponExamineList(CouponExamineListSearch ofSearch) {
        return this.baseMapper.queryCouponExamineList(ofSearch.getName(),ofSearch.getType(),ofSearch.getUserPopulation(),ofSearch.getDistributionMethod(),ofSearch.getAuditStatus(),ofSearch.getPage());
        return this.baseMapper.queryCouponExamineList(ofSearch.getName(), ofSearch.getType(), ofSearch.getUserPopulation(), ofSearch.getDistributionMethod(), ofSearch.getAuditStatus(), ofSearch.getPage());
    }

    @Override
    public List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type) {
        return this.baseMapper.listRecord(objectPage,id,ids,type);
    public List<Map<String, Object>> listRecord(Integer id, List<Integer> ids, Integer type) {
        return this.baseMapper.listRecord(id, ids, type);
    }

    @Override