fixed 卡券消息问题修复

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

@@ -99,6 +99,10 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtUserCoupon::getStatus, status);
         }
+        String userCouponId = paginationRequest.getSearchParams().get("userCouponId") == null ? "" : paginationRequest.getSearchParams().get("userCouponId").toString();
+        if (StringUtils.isNotBlank(userCouponId)) {
+            lambdaQueryWrapper.eq(MtUserCoupon::getId, userCouponId);
+        }
         String userId = paginationRequest.getSearchParams().get("userId") == null ? "" : paginationRequest.getSearchParams().get("userId").toString();
         if (StringUtils.isNotBlank(userId)) {
             lambdaQueryWrapper.eq(MtUserCoupon::getUserId, userId);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserCouponController.java

@@ -246,6 +246,7 @@ public class BackendUserCouponController extends BaseController {
         String userId = request.getParameter("userId") == null ? "" : request.getParameter("userId");
         String couponId = request.getParameter("couponId") == null ? "" : request.getParameter("couponId");
         String status = request.getParameter("status") == null ? "" : request.getParameter("status");
+        String userCouponId = request.getParameter("id") == null ? "" : request.getParameter("id");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
@@ -258,6 +259,9 @@ public class BackendUserCouponController extends BaseController {
         paginationRequest.setPageSize(50000);
 
         Map<String, Object> searchParams = new HashMap<>();
+        if (StringUtil.isNotEmpty(userCouponId)) {
+            searchParams.put("userCouponId", userCouponId);
+        }
         if (StringUtil.isNotEmpty(mobile)) {
             searchParams.put("mobile", mobile);
         }

fuint-application/src/main/java/com/fuint/module/schedule/CouponExpireJob.java

@@ -105,6 +105,7 @@ public class CouponExpireJob {
                             params.put("tips", "您的卡券即将到期，请留意~");
                             weixinService.sendSubscribeMessage(userInfo.getMerchantId(), userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_EXPIRE.getKey(), "pages/user/index", params, sendTime);
                             mtUserCoupon.setExpireTime(null);
+                            mtUserCoupon.setUsedTime(new Date());
                             mtUserCouponMapper.updateById(mtUserCoupon);
                         }
 

fuint-repository/src/main/java/com/fuint/repository/model/MtCoupon.java

@@ -89,7 +89,7 @@ public class MtCoupon implements Serializable {
     @ApiModelProperty("不可用日期，逗号隔开。周末：weekend；其他：2019-01-02_2019-02-09")
     private String exceptTime;
 
-    @ApiModelProperty("所属店铺ID,逗号隔开")
+    @ApiModelProperty("适用店铺ID,逗号隔开")
     private String storeIds;
 
     @ApiModelProperty("适用会员等级,逗号隔开")

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

@@ -4,7 +4,6 @@
     <select id="findNewMessage" resultType="com.fuint.repository.model.MtMessage">
         select * from mt_message o where o.USER_ID = #{userId} and o.STATUS = 'A' and o.TYPE = #{type} and o.IS_READ = 'N' order by o.ID desc
     </select>
-
     <select id="findNeedSendMessage" resultType="com.fuint.repository.model.MtMessage">
         select * from mt_message t where t.TYPE = #{type} and t.IS_SEND = 'N' order by t.SEND_TIME asc
     </select>

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

@@ -56,9 +56,9 @@
     <select id="getUserCouponListByExpireTime" resultType="com.fuint.repository.model.MtUserCoupon">
         SELECT * FROM mt_user_coupon t WHERE t.STATUS = #{status}
         <if test="userId != null and userId > 0">
-            and USER_ID = #{userId}
+            AND USER_ID = #{userId}
         </if>
-        AND t.EXPIRE_TIME &lt; #{endTime} AND t.EXPIRE_TIME &gt; #{startTime}
+        AND t.EXPIRE_TIME &lt; #{endTime} AND t.EXPIRE_TIME &gt; #{startTime} AND t.USED_TIME IS NULL
         ORDER BY t.ID ASC
     </select>