修改是否周末为适用星期

share-system/src/main/java/share/system/domain/SConsumerCoupon.java

@@ -156,10 +156,10 @@ public class SConsumerCoupon extends BaseEntity
     private Integer isDelete;
 
     /**
-     * 是否可叠加使用(0：不可叠加，1：可叠加)
+     * 适用星期列表(1:周一，2：周二，3：周三，4：周四，5：周五，6：周六，7：周日)
      */
-    @Excel(name = "是否周末可用(0：不可用，1：可用)")
-    private Integer isSunday;
+    @Excel(name = "适用星期列表")
+    private String sundays;
 
     /** 更新者 */
     @Excel(name = "更新者")

share-system/src/main/java/share/system/domain/SCoupon.java

@@ -112,10 +112,10 @@ public class SCoupon extends BaseEntity
     private Integer isOverlay;
 
     /**
-     * 是否可叠加使用(0：不可叠加，1：可叠加)
+     * 适用星期列表(1:周一，2：周二，3：周三，4：周四，5：周五，6：周六，7：周日)
      */
-    @Excel(name = "是否周末可用(0：不可用，1：可用)")
-    private Integer isSunday;
+    @Excel(name = "适用星期列表")
+    private String sundays;
 
     /**
      * 第三方平台类型(1：自营，2：美团)

share-system/src/main/java/share/system/service/impl/QPServiceImpl.java

@@ -175,7 +175,7 @@ public class QPServiceImpl implements QPService {
             sConsumerCoupon.setDealgroupId(sCoupon.getDealgroupId());
             sConsumerCoupon.setStoreIds(sCoupon.getStoreIds());
             sConsumerCoupon.setPackageId(sCoupon.getPackageId());
-            sConsumerCoupon.setIsSunday(sCoupon.getIsSunday());
+            sConsumerCoupon.setSundays(sCoupon.getSundays());
             sConsumerCoupon.setRemark(sCoupon.getRemark());
         }
         isConsumerCouponService.insertSConsumerCoupon(sConsumerCoupon);

share-system/src/main/java/share/system/service/impl/SConsumerCouponServiceImpl.java

@@ -207,13 +207,13 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
     }
 
     private Boolean chekcSunday(SConsumerCoupon item, CouponRequest couponRequest) {
-        if(Objects.nonNull(item.getIsSunday())&&item.getIsSunday().compareTo(YesNoEnum.yes.getIndex())==0){
-            if(!DateUtil.isWeekend(couponRequest.getPreStartDate())||DateUtil.isWeekend(couponRequest.getPreEndDate())){
-                item.setIsAvailable(AvailableEnum.UNAVAILABLE.getCode());
-                item.setReason("优惠卷周末可用");
-            }
-        }
-        return item.getIsAvailable()==0;
+//        if (Objects.nonNull(item.getSundays()) && item.getSundays().compareTo(YesNoEnum.yes.getIndex()) == 0) {
+//            if (!DateUtil.isWeekend(couponRequest.getPreStartDate()) || DateUtil.isWeekend(couponRequest.getPreEndDate())) {
+//                item.setIsAvailable(AvailableEnum.UNAVAILABLE.getCode());
+//                item.setReason("优惠卷周末可用");
+//            }
+//        }
+        return item.getIsAvailable() == 0;
     }
 
     private Boolean checkPack(SConsumerCoupon item, CouponRequest couponRequest, List<SPack> sPacks){
@@ -335,12 +335,12 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
         newSConsumerCoupon.setCouponTimeStart(sCoupon.getValidStartTime());
         newSConsumerCoupon.setCouponTimeEnd(sCoupon.getValidEndTime());
         newSConsumerCoupon.setCouponType(sCoupon.getCouponType());
-            newSConsumerCoupon.setMinPrice(new BigDecimal(0.00));
-            newSConsumerCoupon.setSubPrice(sCoupon.getSubPrice());
-        newSConsumerCoupon.setIsSunday(sCoupon.getIsSunday());
+        newSConsumerCoupon.setMinPrice(new BigDecimal(0.00));
+        newSConsumerCoupon.setSubPrice(sCoupon.getSubPrice());
+        newSConsumerCoupon.setSundays(sCoupon.getSundays());
         newSConsumerCoupon.setMinDuration(sCoupon.getMinDuration());
-            newSConsumerCoupon.setMaxDuration(sCoupon.getMaxDuration());
-            newSConsumerCoupon.setDuration(sCoupon.getDuration());
+        newSConsumerCoupon.setMaxDuration(sCoupon.getMaxDuration());
+        newSConsumerCoupon.setDuration(sCoupon.getDuration());
         newSConsumerCoupon.setOrderType(sCoupon.getOrderType());
         newSConsumerCoupon.setPackageId(sCoupon.getPackageId());
         newSConsumerCoupon.setSourceType(SourceTypeEnum.GIVE.getCode());

share-system/src/main/resources/mapper/system/SConsumerCouponMapper.xml

@@ -33,7 +33,7 @@
         <result property="useDate"    column="use_date"    />
         <result property="useStatus"    column="use_status"    />
         <result property="isDelete"    column="is_delete"    />
-        <result property="isSunday" column="is_sunday"/>
+        <result property="sundays" column="sundays"/>
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -68,7 +68,7 @@
                use_date,
                use_status,
                is_delete,
-               is_sunday,
+               sundays,
                create_by,
                create_time,
                update_by,
@@ -108,7 +108,7 @@
             <if test="endDate != null "> and end_date = #{endDate}</if>
             <if test="useDate != null "> and use_date = #{useDate}</if>
             <if test="useStatus != null  and useStatus != '' or useStatus==0">and use_status = #{useStatus}</if>
-            <if test="isSunday != null  and isSunday != '' or isSunday==0">and is_sunday = #{isSunday}</if>
+            <if test="sundays != null  and sundays != ''">and sundays = #{sundays}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="deleteBy != null  and deleteBy != ''"> and delete_by = #{deleteBy}</if>
             <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
@@ -158,7 +158,7 @@
             <if test="useDate != null">use_date,</if>
             <if test="useStatus != null">use_status,</if>
             <if test="isDelete != null">is_delete,</if>
-            <if test="isSunday != null">is_sunday,</if>
+            <if test="sundays != null">sundays,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -195,7 +195,7 @@
             <if test="useDate != null">#{useDate},</if>
             <if test="useStatus != null">#{useStatus},</if>
             <if test="isDelete != null">#{isDelete},</if>
-            <if test="isSunday != null">#{isSunday},</if>
+            <if test="sundays != null">#{sundays},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -236,7 +236,7 @@
             <if test="useDate != null">use_date = #{useDate},</if>
             <if test="useStatus != null">use_status = #{useStatus},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
-            <if test="isSunday != null">is_sunday = #{isSunday},</if>
+            <if test="sundays != null">sundays = #{sundays},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

share-system/src/main/resources/mapper/system/SCouponMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="minPrice"    column="min_price"    />
         <result property="subPrice"    column="sub_price"    />
         <result property="isOverlay"    column="is_overlay"    />
-        <result property="isSunday" column="is_sunday"/>
+        <result property="sundays" column="sundays"/>
         <result property="platformType"    column="platform_type"    />
         <result property="number"    column="number"    />
         <result property="createBy"    column="create_by"    />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                order_type,
                package_id,
                dealgroup_id,
-               is_sunday,
+               sundays,
                store_ids,
                duration,min_duration,max_duration,
                min_price,sub_price,is_overlay,
@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subPrice != null  and subPrice != ''"> and sub_price = #{subPrice}</if>
             <if test="isOverlay != null"> and is_overlay = #{isOverlay}</if>
             <if test="platformType != null"> and platform_type = #{platformType}</if>
-            <if test="isSunday != null or isSunday==0 ">and is_sunday = #{isSunday}</if>
+            <if test="sundays != null">and sundays = #{sundays}</if>
             <if test="number != null"> and number = #{number}</if>
             <if test="createBy != null"> and create_by = #{createBy}</if>
             <if test="createTime != null"> and create_time = #{createTime}</if>
@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="minPrice != null">min_price,</if>
             <if test="subPrice != null">sub_price,</if>
             <if test="isOverlay != null">is_overlay,</if>
-            <if test="isSunday != null">is_sunday,</if>
+            <if test="sundays != null">sundays,</if>
             <if test="platformType != null">platform_type,</if>
             <if test="number != null">number,</if>
             <if test="createBy != null">create_by,</if>
@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="minPrice != null">#{minPrice},</if>
             <if test="subPrice != null">#{subPrice},</if>
             <if test="isOverlay != null">#{isOverlay},</if>
-            <if test="isSunday != null">#{isSunday},</if>
+            <if test="sundays != null">#{sundays},</if>
             <if test="platformType != null">#{platformType},</if>
             <if test="number != null">#{number},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="duration != null and duration != ''">duration = #{duration},</if>
             <if test="minDuration != null  and minDuration != ''">min_duration = #{minDuration},</if>
             <if test="maxDuration != null  and maxDuration != ''">max_duration = #{maxDuration},</if>
-            <if test="isSunday != null or isSunday==0">is_sunday = #{isSunday},</if>
+            <if test="sundays != null">sundays = #{sundays},</if>
             <if test="minPrice != null  and minPrice != ''">min_price = #{minPrice},</if>
             <if test="subPrice != null  and subPrice != ''">sub_price = #{subPrice},</if>
             <if test="isOverlay != null">is_overlay = #{isOverlay},</if>