Merge branch 'dev_v1.3.4_20220902' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.4_20220902

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/coupon/CouponIssueController.java

@@ -19,6 +19,7 @@ import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -110,7 +111,7 @@ public class CouponIssueController {
         }
         if (couponIssue.getUseState().equals(CouponUseStateEnum.USED)) {
             return failed("优惠券已被使用");
-        }  else if(couponIssue.getEndTime().compareTo(Instant.now().getEpochSecond()) <0) {
+        }  else if(couponIssue.getEndTime().compareTo(DateTime.now().getMillis()) <0) {
             return failed("优惠券已过期");
         }
         return HttpResponseResult.status(couponIssueService.withdrawCoupon(couponIssueId));

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponIssueVo.java

@@ -52,7 +52,7 @@ public class CouponIssueVo {
         private SendTypeEnum issueWay;
 
         //使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期
-        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期")
+        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期 WITHDRAW 撤回")
         private CouponUseStateEnum useState;
 
         //  发放开始时间
@@ -188,7 +188,7 @@ public class CouponIssueVo {
         @ApiModelProperty("客户端类型 TEACHER :老师端 STUDENT:学生端")
         private ClientEnum clientType;
 
-        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期")
+        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期  WITHDRAW 撤回")
         private CouponUseStateEnum useState;
 
         @ApiModelProperty("订单号")
@@ -331,7 +331,7 @@ public class CouponIssueVo {
         @ApiModelProperty("获取途径 PLATFORM：平台，ACTIVITY:活动")
         private SendTypeEnum issueWay;
 
-        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期")
+        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期  WITHDRAW 撤回")
         private CouponUseStateEnum useState;
 
         @ApiModelProperty("领取开始时间")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/coupon/CouponUseStateEnum.java

@@ -14,6 +14,7 @@ public enum CouponUseStateEnum implements BaseEnum<String, CouponUseStateEnum> {
     EXPIRED("已失效"),
     USABLE("可使用"),
     USED("已使用"),
+    WITHDRAW("撤回"),
     ;
     @EnumValue
     private String code;

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponIssueMapper.xml

@@ -33,13 +33,13 @@
             su.real_name_ as realName,
             su.username_ as username,
             ci.client_type_ as clientType,
-            ci.use_state_ as useState,
+            ci.issue_way_ as issueWay,
             ci.order_no_ as orderNo,
         from_unixtime(ci.start_time_) as startTime,
         from_unixtime(ci.end_time_) as endTime,
         from_unixtime(ci.issue_time_) as issueTime,
         from_unixtime(ci.use_time_) as useTime,
-            if( ci.end_time_ < unix_timestamp(now()) and ci.issue_way_  = 'USABLE','EXPIRED',ci.issue_way_) as issueWay,
+            (case when ci.status_ = 0 then 'WITHDRAW' when  ci.end_time_ < unix_timestamp(now()) and ci.use_state_  = 'USABLE' then 'EXPIRED' else ci.use_state_ end ) as useState,
             ci.issuer_ as issuer,
             ci.remark_ as remark,
             cou.name_ as couponName,
@@ -73,21 +73,24 @@
                     or cou.name_ like concat('%',#{query.couponKeyword},'%')
                 )
             </if>
-            <if test="query.issueWay != null">
+            <if test="query.useState != null">
                 <choose>
-                    <when test="query.issueWay.code == 'EXPIRED'">
-                        and ci.end_time_ &lt; unix_timestamp(now()) and ci.issue_way_  = 'USABLE'
+                    <when test="query.useState.code == 'EXPIRED'">
+                        and ci.end_time_ &lt; unix_timestamp(now()) and ci.use_state_  = 'USABLE'
+                    </when>
+                    <when test="query.useState.code == 'USABLE'">
+                        and ci.end_time_ &gt;= unix_timestamp(now()) and ci.use_state_ = 'USABLE'
                     </when>
-                    <when test="query.issueWay.code == 'USABLE'">
-                        and ci.end_time_ &gt;= unix_timestamp(now()) and ci.issue_way_ = 'USABLE'
+                    <when test="query.useState.code == 'WITHDRAW'">
+                        and ci.status_ = 0
                     </when>
                     <otherwise>
-                        and ci.issue_way_ = #{query.issueWay}
+                        and ci.use_state_ = #{query.useState}
                     </otherwise>
                 </choose>
             </if>
-            <if test="query.useState != null">
-                and #{query.useState} = ci.use_state_
+            <if test="query.issueWay != null">
+                and #{query.issueWay} = ci.issue_way_
             </if>
             <if test="query.issueStartTime != null">
                 and unix_timestamp( #{query.issueStartTime}) &lt;= ci.issue_time_

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -54,6 +54,7 @@
         </choose>
         left join sys_user su on su.id_ = t.user_id_
         <where>
+            t.lock_flag_ = 0
             <if test="keyword != null and keyword != ''">
                 and (
                 su.real_name_ like concat('%',#{keyword},'%')