修复了积分商城详情页面的门店列表查询；兑换支付todo

lisy

2023-07-14 7865a1010be2f95faab151d99ecdb095f44c2a08

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

@@ -1,24 +1,25 @@
package com.dsh.activity.service.impl;


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.feginClient.account.AppUserClient;
import com.dsh.activity.feginClient.account.StudentClient;
import com.dsh.activity.feginClient.account.model.AppUser;
import com.dsh.activity.feginClient.account.model.Student;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
import com.dsh.activity.feignclient.account.model.Student;
import com.dsh.activity.mapper.CouponMapper;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.service.ICouponService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
 * @author zhibing.pu
@@ -48,38 +49,38 @@
    public List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception {
        AppUser appUser = appUserClient.queryAppUser(uid);
        List<CouponListVo> listVos = new ArrayList<>();
        if(null != appUser){
        if (null != appUser) {
            List<Integer> userPopulation = new ArrayList<>();
            userPopulation.add(1);//全部用户
            if(1 == appUser.getIsVip()){
            if (1 == appUser.getIsVip()) {
                userPopulation.add(2);//年度会员
            }
            List<Student> students = studentClient.queryStudentList(uid);
            if(students.size() > 0){
            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").orderByDesc("insertTime"));
                    .last(" and now() between startTime and endTime order by insertTime desc"));
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            for (Coupon coupon : list) {
                CouponListVo couponListVo = new CouponListVo();
                couponListVo.setId(coupon.getId());
                couponListVo.setId(coupon.getId().longValue());
                couponListVo.setName(coupon.getName());
                couponListVo.setType(coupon.getType());
                couponListVo.setEffectiveTime(sdf.format(coupon.getStartTime()) + "-" + sdf.format(coupon.getEndTime()));
                String content = coupon.getContent();
                if(coupon.getType() == 1){//满减{"num1":1,"num2":1}
                if (coupon.getType() == 1) {//满减{"num1":1,"num2":1}
                    JSONObject jsonObject = JSON.parseObject(content);
                    couponListVo.setUseCondition("满" + jsonObject.getDouble("num1") + "元可用");
                    couponListVo.setFavorable(jsonObject.getDouble("num2") + "元");
                }
                if(coupon.getType() == 2){//满减{"num1":1}
                if (coupon.getType() == 2) {//代金券{"num1":1}
                    JSONObject jsonObject = JSON.parseObject(content);
                    couponListVo.setUseCondition("");
                    couponListVo.setFavorable(jsonObject.getDouble("num1") + "元");
                }
                if(coupon.getType() == 3){//体验券{"num1":1}
                if (coupon.getType() == 3) {//体验券{"num1":1}
                    JSONObject jsonObject = JSON.parseObject(content);
                    couponListVo.setUseCondition("");
                    couponListVo.setFavorable(jsonObject.getString("num1"));
@@ -89,4 +90,12 @@
        }
        return listVos;
    }



    @Override
    public Map<String, Object> queryConponRuleOfJson(Integer id) {
        return this.baseMapper.queryConponRuleOfJson(id);
    }

}