Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-11 f18a802137a7642473891f6886d44cf0c229efed

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java

@@ -3,7 +3,6 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.vo.CouponInfoVo;
import com.ruoyi.account.api.vo.PaymentUserCouponVo;
import com.ruoyi.account.mapper.UserCouponMapper;
import com.ruoyi.account.api.model.UserCoupon;
@@ -13,12 +12,13 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

import static org.aspectj.util.LangUtil.split;

/**
 * <p>
@@ -39,7 +39,6 @@
   /**
    * 获取支付页面的优惠券列表数据
    * @param userId
    * @param orderMoney
    * @return
    */
   @Override
@@ -61,21 +60,21 @@
            continue;
         }
         PaymentUserCouponVo couponInfoVo = new PaymentUserCouponVo();
         couponInfoVo.setId(userCoupon.getId());
         couponInfoVo.setId(userCoupon.getId().toString());
         couponInfoVo.setName(couponInfo.getCouponName());
         couponInfoVo.setCouponType(couponInfo.getCouponType());
         couponInfoVo.setConditionAmount(couponInfo.getConditionAmount());
         couponInfoVo.setDiscountAmount(couponInfo.getDiscountAmount());
         couponInfoVo.setMoneyAmount(couponInfo.getMoneyAmount());
         couponInfoVo.setDiscount(couponInfo.getDiscount());
         couponInfoVo.setPeriodEndTime(couponInfo.getPeriodStartTime().format(formatter));
         couponInfoVo.setPeriodStartTime(couponInfo.getPeriodStartTime().format(formatter));
         couponInfoVo.setPeriodEndTime(couponInfo.getPeriodEndTime().format(formatter));
         String forGoodIds = couponInfo.getForGoodIds();
         Integer instant = JSON.parseArray(forGoodIds).getInteger(0);
         if(-1 == instant){
            String forGoodIds = couponInfo.getForGoodIds();
            String[] split = forGoodIds.split(",");
         if("-1".equals(forGoodIds)){
            couponInfoVo.setForGoodIds(null);
         }else{
            couponInfoVo.setForGoodIds(JSON.parseArray(forGoodIds, Integer.class));
                couponInfoVo.setForGoodIds(Arrays.asList(split));
         }
         couponInfoVo.setAvailable(false);
         infoVoList.add(couponInfoVo);