feat&bug：文档内容修改

刘帅

2026-09-08 572df690f72ed4a077d934823f261dec39b3cc7d

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

@@ -4,9 +4,7 @@
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.entity.CouponStore;
import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.entity.*;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -16,10 +14,10 @@
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.Site;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.activity.mapper.CouponMapper;
import com.dsh.activity.mapper.CouponStoreMapper;
import com.dsh.activity.mapper.UserCouponMapper;
import com.dsh.activity.mapper.*;
import com.dsh.activity.model.ConponJsonRuleModel;
import com.dsh.activity.model.CouponDeductionQuery;
import com.dsh.activity.model.CouponDeductionVO;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.CouponPackageReq;
import com.dsh.activity.model.response.CouponPackageResp;
@@ -28,12 +26,18 @@
import com.dsh.activity.util.GDMapGeocodingUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
@@ -47,11 +51,15 @@
@Service
public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCoupon> implements UserCouponService {

    private static final Logger LOGGER = LoggerFactory.getLogger(UserCouponServiceImpl.class);

    @Resource
    private CoursePackageClient coursePackageClient;

    @Autowired
    private GDMapGeocodingUtil gdMapGeocodingUtil;
    @Autowired
    private PointsMerchandiseMapper pointsMerchandiseMapper;

    @Resource
    private AppUserClient appClient;
@@ -63,6 +71,9 @@
    private CouponMapper couponMapper;

    @Resource
    private CouponCityMapper couponCityMapper;

    @Resource
    private StoreClient storeClient;

    @Resource
@@ -71,12 +82,64 @@
    @Resource
    private SiteClient siteClient;

    /**
     * 批量解析已核销优惠券的固定抵扣金额，避免统计页面逐条远程查询优惠券。
     *
     * @param query 用户优惠券领取记录 ID 集合
     * @return 每条领取记录对应的抵扣金额；无固定抵扣规则时返回 0
     */
    @Override
    public List<CouponDeductionVO> queryDeductionAmounts(CouponDeductionQuery query) {
        if (query == null || query.getUserCouponIds() == null || query.getUserCouponIds().isEmpty()) {
            return Collections.emptyList();
        }

        Set<Long> userCouponIds = new LinkedHashSet<>(query.getUserCouponIds());
        List<UserCoupon> userCoupons = this.list(new QueryWrapper<UserCoupon>()
                .in("id", userCouponIds));
        if (userCoupons.isEmpty()) {
            return Collections.emptyList();
        }

        Set<Integer> couponIds = userCoupons.stream()
                .map(UserCoupon::getCouponId)
                .filter(java.util.Objects::nonNull)
                .collect(Collectors.toSet());
        List<Coupon> coupons = couponIds.isEmpty()
                ? Collections.emptyList()
                : couponMapper.selectBatchIds(couponIds);
        Map<Integer, Coupon> couponMap = coupons.stream()
                .collect(Collectors.toMap(Coupon::getId, coupon -> coupon));

        List<CouponDeductionVO> result = new ArrayList<>();
        for (UserCoupon userCoupon : userCoupons) {
            CouponDeductionVO deduction = new CouponDeductionVO();
            deduction.setUserCouponId(userCoupon.getId());
            deduction.setDeductionAmount(getCouponDeductionAmount(couponMap.get(userCoupon.getCouponId())));
            result.add(deduction);
        }
        return result;
    }

    /** 解析优惠券规则中的固定抵扣金额。 */
    private BigDecimal getCouponDeductionAmount(Coupon coupon) {
        if (coupon == null || coupon.getContent() == null) {
            return BigDecimal.ZERO;
        }
        try {
            JSONObject content = JSON.parseObject(coupon.getContent());
            BigDecimal deductionAmount = content.getBigDecimal("deductionAmount");
            return deductionAmount == null ? BigDecimal.ZERO : deductionAmount.max(BigDecimal.ZERO);
        } catch (Exception e) {
            LOGGER.warn("解析优惠券抵扣规则失败，couponId={}", coupon.getId(), e);
            return BigDecimal.ZERO;
        }
    }


    /**
     * 获取购买课程可用优惠券列表
     *
     * @param uid
     * @param coursePackageId
     * @return
@@ -101,16 +164,19 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if (price.compareTo(num1) < 0) {
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
                couponListVo.setUseCondition("满￥" + num1 + "元可用");
                couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
            }
            if (type == 2) {//代金券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("deductionAmount");
                if(price.compareTo(num1) <= 0){
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if (num1 == null) {
                    num1 = 0d;
                }
                if (price.compareTo(num1) < 0) {
                    continue;
                }
                couponListVo.setUseCondition("");
@@ -129,6 +195,7 @@

    /**
     * 获取预约场地可用优惠券列表
     *
     * @param siteId
     * @param price
     * @return
@@ -154,7 +221,7 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if (price.compareTo(num1) < 0) {
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
@@ -162,8 +229,11 @@
            }
            if (type == 2) {//代金券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("deductionAmount");
                if(price.compareTo(num1) <= 0){
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if (num1 == null) {
                    num1 = 0d;
                }
                if (price.compareTo(num1) < 0) {
                    continue;
                }
                couponListVo.setUseCondition("");
@@ -185,9 +255,9 @@
        AppUser appUser = appClient.queryAppUser(uid);
        if (null != appUser) {
            List<UserCoupon> userCoupons = this.baseMapper.selectList(new QueryWrapper<UserCoupon>()
                    .eq("userId",appUser.getId() )
                    .eq("userId", appUser.getId())
                    .orderByDesc("insertTime"));
            if (userCoupons.size() > 0){
            if (userCoupons.size() > 0) {
                for (UserCoupon userCoupon : userCoupons) {
                    Coupon coupon = couponMapper.selectById(userCoupon.getCouponId());
                    CouponPackageResp packageResp = new CouponPackageResp();
@@ -195,20 +265,26 @@
                    packageResp.setName(coupon.getName());
                    packageResp.setType(coupon.getType());
                    packageResp.setUseCondition(coupon.getUseScope());
                    switch (coupon.getUseScope()){
                    switch (coupon.getUseScope()) {
                        case 1:
                            packageResp.setAvailable("全国通用");
                            break;
                        case 2:
                            packageResp.setAvailable("指定城市可用");
                            packageResp.setCityOrStore("");
                            List<CouponCity> couponId = couponCityMapper.selectList(new QueryWrapper<CouponCity>().eq("couponId", coupon.getId()));
                            StringBuilder stringBuilder = new StringBuilder();
                            for (CouponCity couponCity : couponId) {
                                stringBuilder.append(couponCity.getCity());
                            }
                            packageResp.setCityOrStore(String.valueOf(stringBuilder));
                            break;
                        case 3:
                            packageResp.setAvailable("指定门店可用");
                            CouponStore couponStore = csMapper.selectOne(new QueryWrapper<CouponStore>()
                                    .eq("couponId",coupon.getId()));
                                    .eq("couponId", coupon.getId()).last("limit 1"));
                            StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStore.getStoreId());
                            packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
//                            packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
                            packageResp.setCityOrStore(courseOfStore.getStoreName());
                            break;
                        default:
                            break;
@@ -218,25 +294,34 @@
                    JSONObject jsonObject = JSON.parseObject(coupon.getContent());
                    switch (coupon.getType()) {
                        case 1:
//                        {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
//                            满减券
                            Double num1 = jsonObject.getDouble("num1");
                            Double num2 = jsonObject.getDouble("num2");
                            ruleModel.setConditionalAmount("满"+num1+"可用");
                            ruleModel.setDeductionAmount("¥ "+num2);
                            Double num1 = jsonObject.getDouble("conditionalAmount");
                            Double num2 = jsonObject.getDouble("deductionAmount");
                            ruleModel.setConditionalAmount("满" + num1 + "可用");
                            ruleModel.setDeductionAmount("¥ " + num2);
                            ruleModel.setExperienceName("");
                            break;
                        case 2:
//                            代金券
                            Double jsonObjectDouble = jsonObject.getDouble("num1");
                            Double jsonObjectDouble = jsonObject.getDouble("conditionalAmount");
                            ruleModel.setConditionalAmount("");
                            ruleModel.setDeductionAmount("¥ "+jsonObjectDouble);
                            ruleModel.setDeductionAmount("¥ " + jsonObjectDouble);
                            ruleModel.setExperienceName("");
                            break;
                        case 3:
//                            体验券
                            ruleModel.setConditionalAmount("");
                            ruleModel.setDeductionAmount("");
                            ruleModel.setExperienceName(jsonObject.getString("num1"));
                            ruleModel.setExperienceName(jsonObject.getString("experienceName"));
                            break;
                            case 4:
//                            抵扣券
                                Integer goodsId = coupon.getGoodsId();
                                PointsMerchandise pointsMerchandise = pointsMerchandiseMapper.selectById(goodsId);
                                ruleModel.setConditionalAmount("");
                            ruleModel.setDeductionAmount("");
                            ruleModel.setExperienceName(pointsMerchandise.getName());
                            break;
                        default:
                            break;
@@ -246,24 +331,27 @@
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                    packageResp.setEffectiveTime(simpleDateFormat.format(coupon.getEndTime()));

                    if (userCoupon.getStatus() == 1){
                        if (DateUtil.getDate().before(coupon.getEndTime())){
                    if (userCoupon.getStatus() == 1) {
                        if (DateUtil.getDate().before(coupon.getEndTime())) {
                            packageResp.setUseStatus(1);
                        }else {
                        } else {
                            packageResp.setUseStatus(3);
                        }
                    }
                    if (userCoupon.getStatus() == 2){
                    if (userCoupon.getStatus() == 2) {
                        packageResp.setUseStatus(2);
                    }
                    if (userCoupon.getStatus() == 3) {
                        packageResp.setUseStatus(3);
                    }
                    respList.add(packageResp);
                }
                if (null != req.getCouponType()){
                if (null != req.getCouponType()) {
                    respList = respList.stream()
                            .filter(couponPackageResp -> couponPackageResp.getType().equals(req.getCouponType()))
                            .collect(Collectors.toList());
                }
                if (null != req.getUseStatus()){
                if (null != req.getUseStatus()) {
                    respList = respList.stream()
                            .filter(couponPackageResp -> couponPackageResp.getUseStatus().equals(req.getUseStatus()))
                            .collect(Collectors.toList());