1. 优惠券调整

electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java

@@ -36,6 +36,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * app接口（需要登录校验的）
@@ -1302,17 +1303,36 @@ public class AppVerifyController extends BaseController
     }
 
     /**
-     * 我的骑行卡(未使用)
+     * 我的骑行卡(未使用和已过期)
      */
     @GetMapping("/getCouponListByUserId")
     public AjaxResult getCouponListByUserId(Long userId)
     {
         logger.info("根据用户搜索优惠券：【userId="+userId+"】");
-        EtCouponUserLog etCouponUserLog = new EtCouponUserLog();
+        List<EtCouponUserLog> list = etCouponClaimLogService.selectCouponListByUserId(userId);
-        etCouponUserLog.setUserId(userId);
+//        // 判空处理，确保list不为null
-        etCouponUserLog.setStatus(ServiceConstants.COUPON_STATUS_UNUSED);
+//        if (list != null && !list.isEmpty()) {
-        etCouponUserLog.setStatusList(new String[]{ServiceConstants.COUPON_STATUS_UNUSED, ServiceConstants.COUPON_STATUS_EXPIRED});
+//            // 将 couponType 为 1 和 2 的记录按类型分组，并各保留一条记录
-        List<EtCouponUserLog> list = etCouponClaimLogService.selectEtCouponClaimLogList(etCouponUserLog);
+//            Map<String, List<EtCouponUserLog>> type12Map = list.stream()
+//                    .filter(log -> "1".equals(log.getCouponType()) || "2".equals(log.getCouponType()))
+//                    .collect(Collectors.groupingBy(EtCouponUserLog::getCouponType));
+//
+//            // 创建结果列表，并添加每个类型的第一条记录
+//            List<EtCouponUserLog> resultList = new ArrayList<>();
+//            type12Map.values().forEach(logs -> {
+//                if (logs != null && !logs.isEmpty()) {
+//                    resultList.add(logs.get(0));
+//                }
+//            });
+//
+//            // 添加其他类型的记录
+//            list.stream()
+//                    .filter(log -> !"1".equals(log.getCouponType()) && !"2".equals(log.getCouponType()))
+//                    .forEach(resultList::add);
+//
+//            // 将结果列表赋值回原列表
+//            list = resultList;
+//        }
         return success(list);
     }
 

electripper-system/src/main/java/com/ruoyi/system/domain/EtCouponUserLog.java

@@ -43,6 +43,10 @@ public class EtCouponUserLog extends BaseEntity
     @Excel(name = "优惠券")
     private Long couponId;
 
+    /** 优惠券类型 */
+    @Excel(name = "优惠券类型")
+    private String couponType;
+
     /** 优惠券名称 */
     @Excel(name = "优惠券名称")
     private String couponName;
@@ -68,4 +72,8 @@ public class EtCouponUserLog extends BaseEntity
     @Excel(name = "有效时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date expirationTime;
 
+    /** 可使用次数：0-无限制；其他数字直接显示次数 */
+    @Excel(name = "可使用次数")
+    private int limitNum;
+
 }

electripper-system/src/main/java/com/ruoyi/system/mapper/EtCouponClaimLogMapper.java

@@ -58,4 +58,14 @@ public interface EtCouponClaimLogMapper
      * @return 结果
      */
     public int deleteEtCouponClaimLogByLogIds(Long[] claimIds);
+
+    /**
+     * 我的骑行卡(未使用和已过期)
+     */
+    List<EtCouponUserLog> selectCouponListByUserId(Long userId);
+
+    /**
+     * 扣除一次使用次数
+     */
+    void deductLimitNum(Long logId);
 }

electripper-system/src/main/java/com/ruoyi/system/service/IEtCouponClaimLogService.java

@@ -58,4 +58,9 @@ public interface IEtCouponClaimLogService
      * @return 结果
      */
     public int deleteEtCouponClaimLogByLogId(Long claimId);
+
+    /**
+     * 我的骑行卡(未使用和已过期)
+     */
+    List<EtCouponUserLog> selectCouponListByUserId(Long userId);
 }

electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.*;
+import com.ruoyi.common.core.domain.entity.AsUser;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
@@ -22,10 +23,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.response.OrderResponse;
 import com.ruoyi.system.domain.vo.*;
-import com.ruoyi.system.mapper.AsDeviceMapper;
+import com.ruoyi.system.mapper.*;
-import com.ruoyi.system.mapper.EtCommandLogMapper;
-import com.ruoyi.system.mapper.EtLocationLogMapper;
-import com.ruoyi.system.mapper.EtOrderMapper;
 import com.ruoyi.system.service.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -116,6 +114,16 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
     @Resource
     private EtLocationLogMapper etLocationLogMapper;
 
+    @Resource
+    private EtCouponMapper etCouponMapper;
+
+    @Resource
+    private EtCouponClaimLogMapper etCouponClaimLogMapper;
+
+    @Resource
+    private AsUserMapper asUserMapper;
+
+
     @Value(value = "${iot.iotUrl}")
     private String iotUrl;
 
@@ -191,10 +199,6 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         EtOperatingArea etOperatingArea;
         if (ObjectUtil.isNotNull(areaId) && areaId!=0) {
             etOperatingArea = etOperatingAreaService.selectEtOperatingAreaByAreaId(areaId);
-        }else{
-            throw new ServiceException("【selectAsDeviceBySn】区域信息不存在");
-        }
-        if(ObjectUtil.isNotNull(etOperatingArea)){
             asDevice.setAreaName(etOperatingArea.getAreaName());
         }
         EtModel model = etModelService.selectEtModelByModelId(asDevice.getModelId());
@@ -1789,6 +1793,11 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
             }
             /** 3. 计算订单费用，保存订单总金额*/
             order = calculateOrderFee(order,isInParkingArea);
+            /** 4. 优惠券计算价格
+             *      order中有couponId则有使用优惠券   */
+            if(ObjectUtil.isNotNull(order.getCouponId())){
+                order = calculateCoupon(order);
+            }
             /** 6.计算行车距离*/
             String tripRouteStr = order.getTripRouteStr();
             if(StrUtil.isNotBlank(tripRouteStr)){
@@ -1904,6 +1913,74 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
 ////        }
 //    }
 
+     /**
+     * 使用优惠券后的价格
+      *  1. 先判断是否过期？并且是否是未使用的状态
+      *  2. 再判断是哪种类型的优惠券，
+      *     如果是
+      *     时间卡：骑行价格直接改成0
+      *     贵宾卡：所有价格改成0
+      *     折扣卡：总金额 * 折扣比例  次数减一
+      *     抵用券：总金额 - 抵用金额  次数减一
+     */
+    private EtOrder calculateCoupon(EtOrder order) {
+        Long couponId = order.getCouponId();
+        EtCoupon etCoupon = etCouponMapper.selectEtCouponByCouponId(couponId);
+        Long userId = order.getUserId();
+        AsUser asUser = asUserMapper.selectUserById(userId);
+
+        EtCouponUserLog etCouponUserLog = new EtCouponUserLog();
+        etCouponUserLog.setUserId(userId);
+        etCouponUserLog.setCouponId(couponId);
+        etCouponUserLog.setStatus(ServiceConstants.COUPON_STATUS_UNUSED);
+        List<EtCouponUserLog> etCouponUserLogs = etCouponClaimLogMapper.selectEtCouponClaimLogList(etCouponUserLog);
+        EtCouponUserLog etCouponUserLog1 = null;
+        if(etCouponUserLogs !=null && etCouponUserLogs.size()>0){
+            etCouponUserLog1 = etCouponUserLogs.get(0);
+        }
+
+        if(etCoupon.getType().equals(asUser.getVipType()) || asUser.getExpirationTime().compareTo(new Date()) < 0){
+            throw new ServiceException("会员已过期");
+        }
+
+        if((etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD) || etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER))
+                && isCouponExpired(etCouponUserLog1)){
+            throw new ServiceException("优惠券已过期");
+        }
+
+        if(etCouponUserLog1.getLimitNum() == 0){
+            throw new ServiceException("可用次数不足");
+        }
+
+        if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_TIME_CARD)){
+            order.setPayFee(order.getTotalFee().subtract(order.getRidingFee()));//会员
+            order.setRidingFee(BigDecimal.ZERO);
+        }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VIP_CARD)){//贵宾卡
+            order.setPayFee(BigDecimal.ZERO);
+        }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD)){//折扣卡
+            order.setPayFee(order.getTotalFee().multiply(etCoupon.getDiscountPercent()).setScale(2, RoundingMode.HALF_UP));
+        }else if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER)){//抵用券
+            order.setPayFee(order.getTotalFee().subtract(etCoupon.getDiscountAmount()));
+        }else{
+            throw new ServiceException("优惠券类型错误");
+        }
+
+        // 扣除一次使用次数
+        if(etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_DISCOUNT_CARD) || etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_VOUCHER) && etCouponUserLog1.getLimitNum() > 0){
+            etCouponClaimLogMapper.deductLimitNum(etCouponUserLog1.getLogId());
+        }
+        return order;
+    }
+
+    /** 判断优惠券是否过期 */
+    private boolean isCouponExpired(EtCouponUserLog etCouponUserLog) {
+        if(etCouponUserLog!=null){
+            return etCouponUserLog.getExpirationTime().compareTo(new Date()) < 0;
+        }else{
+            return true;
+        }
+    }
+
     /**
      * 计算订单费用
      */

electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java

@@ -325,6 +325,7 @@ public class CallbackServiceImpl implements CallbackService {
         etCouponUserLog.setGainMethod(ServiceConstants.COUPON_GAIN_METHOD_BUY);
         etCouponUserLog.setAreaId(etCoupon.getAreaId());
         etCouponUserLog.setAreaName(etCoupon.getAreaName());
+        etCouponUserLog.setLimitNum(Integer.parseInt(etCoupon.getLimitNum()));
         if(ObjectUtil.isNull(etCoupon.getValidityUnit())){
             throw new ServiceException("优惠券【有效期单位--validityUnit】为空");
         }

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCouponClaimLogServiceImpl.java

@@ -92,4 +92,12 @@ public class EtCouponClaimLogServiceImpl implements IEtCouponClaimLogService
     {
         return etCouponClaimLogMapper.deleteEtCouponClaimLogByLogId(claimId);
     }
+
+    /**
+     * 我的骑行卡(未使用和已过期)
+     */
+    @Override
+    public List<EtCouponUserLog> selectCouponListByUserId(Long userId) {
+    	return etCouponClaimLogMapper.selectCouponListByUserId(userId);
+    }
 }

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCouponServiceImpl.java

@@ -173,6 +173,9 @@ public class EtCouponServiceImpl implements IEtCouponService
             if(ObjectUtil.isNull(etCoupon)){
                 throw new ServiceException("优惠券【"+couponId+"】不存在");
             }
+            if(asUser.getVipType().equals(ServiceConstants.COUPON_TYPE_VIP_CARD) && etCoupon.getType().equals(ServiceConstants.COUPON_TYPE_TIME_CARD)){
+                throw new ServiceException("用户【"+asUser.getUserName()+"】已经是贵宾卡，无需添加会员卡");
+            }
             EtCouponUserLog etCouponUserLog = new EtCouponUserLog();
             etCouponUserLog.setCouponId(couponId);
             etCouponUserLog.setUserId(userId);
@@ -181,6 +184,7 @@ public class EtCouponServiceImpl implements IEtCouponService
             etCouponUserLog.setGainMethod(ServiceConstants.COUPON_GAIN_METHOD_ISSUE);
             etCouponUserLog.setAreaId(etCoupon.getAreaId());
             etCouponUserLog.setAreaName(etCoupon.getAreaName());
+            etCouponUserLog.setLimitNum(Integer.parseInt(etCoupon.getLimitNum()));
             if(ObjectUtil.isNull(etCoupon.getValidityUnit())){
                 throw new ServiceException("优惠券【有效期单位--validityUnit】为空");
             }

electripper-system/src/main/resources/mapper/system/EtCouponClaimLogMapper.xml

@@ -54,6 +54,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where log_id = #{logId}
     </select>
 
+    <select id="selectCouponListByUserId" resultType="com.ruoyi.system.domain.EtCouponUserLog">
+        select cl.log_id logId,
+               cl.area_id areaId,
+               cl.user_id userId,
+               cl.coupon_id couponId,
+               cl.create_time createTime,
+               cl.gain_method gainMethod,
+               cl.status,
+               CASE
+                   WHEN c.type IN (1, 2) THEN u.expiration_time
+                   ELSE cl.expiration_time
+                   END AS expirationTime,
+               c.type couponType,
+               c.name couponName,
+               u.vip_type,
+               cl.limit_num limitNum
+        from et_coupon_user_log cl
+        left join et_coupon c on c.coupon_id = cl.coupon_id
+        left join et_user u on u.user_id = cl.user_id
+        where cl.user_id = #{userId} and cl.status in('1', '3')
+          AND (c.type NOT IN (1, 2) OR (c.type IN (1, 2) AND cl.log_id = (
+            SELECT MIN(cl_inner.log_id)
+            FROM et_coupon_user_log cl_inner
+                     LEFT JOIN et_coupon c_inner ON c_inner.coupon_id = cl_inner.coupon_id
+            WHERE cl_inner.user_id = cl.user_id
+              AND c_inner.type IN (1, 2)
+        )))
+    </select>
+
     <insert id="insertEtCouponClaimLog" parameterType="EtCouponUserLog" useGeneratedKeys="true" keyProperty="logId">
         insert into et_coupon_user_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -90,6 +119,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where log_id = #{logId}
     </update>
 
+    <update id="deductLimitNum">
+        update et_coupon
+        set limit_num = limit_num - 1
+        where log_id = #{logId} and limit_num > 0
+    </update>
+
     <delete id="deleteEtCouponClaimLogByLogId" parameterType="Long">
         delete from et_coupon_user_log where log_id = #{logId}
     </delete>