xdd 1 månad sedan
förälder
incheckning
9f83889444

+ 1 - 1
fs-service-system/src/main/java/com/fs/store/mapper/FsStoreCouponIssueMapper.java

@@ -145,6 +145,6 @@ public interface FsStoreCouponIssueMapper
      * @param couponId
      * @return
      */
-    @Select("select * from fs_store_coupon_issue where coupon_id=${couponId} and status=1 and is_del=0 limit 1")
+    @Select("select * from fs_store_coupon_issue where coupon_id=${couponId} and status=1 and is_del=0 and limit_time > now() limit 1")
     FsStoreCouponIssue selectFsStoreCouponIssueByCouponId(@Param("couponId") Long couponId);
 }

+ 1 - 1
fs-service-system/src/main/java/com/fs/store/service/impl/FsCouponScheduleServiceImpl.java

@@ -269,7 +269,7 @@ public class FsCouponScheduleServiceImpl implements IFsCouponScheduleService
                     String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd");
 
                     if(StringUtil.isNotEmpty(beginTimeStr) && StringUtil.isNotEmpty(endTimeStr)){
-                        couponValidate.setValue(beginTime + " ~ " + endTime);
+                        couponValidate.setValue(beginTimeStr + " ~ " + endTimeStr);
                     } else {
                         couponValidate.setValue("#");
                     }

+ 3 - 3
fs-service-system/src/main/resources/mapper/store/FsMiniprogramSubNotifyTaskMapper.xml

@@ -44,17 +44,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateBatchById" parameterType="java.util.List">
         <foreach collection="list" item="item" separator=";">
-            UPDATE FsMiniprogramSubNotifyTask
+            UPDATE fs_miniprogram_sub_notify_task
             SET
             task_name = #{item.taskName},
             template_id = #{item.templateId},
             touser = #{item.touser},
             page = #{item.page},
-            data = #{item.data, typeHandler=com.alibaba.fastjson.typehandler.JSONObjectTypeHandler},
+            data = #{item.data},
             status = #{item.status},
             retry_count = #{item.retryCount},
             max_retries = #{item.maxRetries},
-            request_params = #{item.requestParams, typeHandler=com.alibaba.fastjson.typehandler.JSONObjectTypeHandler},
+            request_params = #{item.requestParams},
             request_body = #{item.requestBody},
             response_body = #{item.responseBody},
             error_message = #{item.errorMessage},