fixed 订单结算、卡券过期时间问题、卡券发行总数问题修复

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -2151,7 +2151,11 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         result.put("usePointAmount", usePointAmount);
         result.put("deliveryFee", deliveryFee);
         result.put("discount", discount);
-        result.put("memberDiscount", (new BigDecimal("10").multiply(percent)));
+        if (memberDiscount.compareTo(new BigDecimal("0")) > 0) {
+            result.put("memberDiscount", (new BigDecimal("10").multiply(percent)));
+        } else {
+            result.put("memberDiscount", 0);
+        }
 
         return result;
     }

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCouponController.java

@@ -176,6 +176,8 @@ public class ClientCouponController extends BaseController {
         String effectiveDate = "";
         if (couponInfo.getExpireType().equals(CouponExpireTypeEnum.FIX.getKey())) {
             effectiveDate = DateUtil.formatDate(couponInfo.getBeginTime(), "yyyy.MM.dd HH:mm") + " - " + DateUtil.formatDate(couponInfo.getEndTime(), "yyyy.MM.dd");
+        } else if(couponInfo.getExpireType().equals(CouponExpireTypeEnum.FLEX.getKey())) {
+            effectiveDate = "领取后" + couponInfo.getExpireTime() + "天内有效";
         } else {
             effectiveDate = DateUtil.formatDate(couponInfo.getCreateTime(), "yyyy.MM.dd HH:mm") + " - 永久";
         }

fuint-repository/src/main/resources/mapper/MtUserCouponMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.repository.mapper.MtUserCouponMapper">
     <select id="getSendNum" resultType="java.lang.Long">
-        select count(*) from mt_user_coupon t where t.COUPON_ID = #{couponId}
+        select count(*) from mt_user_coupon t where t.COUPON_ID = #{couponId} AND t.STATUS != 'D'
     </select>
 
     <select id="getPeopleNumByCouponId" resultType="com.fuint.repository.bean.CouponNumBean">
@@ -50,7 +50,7 @@
     </select>
 
     <select id="findUserCouponDetail" resultType="com.fuint.repository.model.MtUserCoupon">
-        SELECT * FROM mt_user_coupon t WHERE t.COUPON_ID = #{couponId} AND t.USER_ID = #{userId} ORDER BY t.ID DESC
+        SELECT * FROM mt_user_coupon t WHERE t.COUPON_ID = #{couponId} AND t.USER_ID = #{userId} and t.STATUS != 'D' ORDER BY t.ID DESC
     </select>
 
     <select id="getUserCouponListByExpireTime" resultType="com.fuint.repository.model.MtUserCoupon">