增加周末可用字段

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

@@ -155,6 +155,12 @@ public class SConsumerCoupon extends BaseEntity
     @TableField(select = false)
     private Integer isDelete;
 
+    /**
+     * 是否可叠加使用(0：不可叠加，1：可叠加)
+     */
+    @Excel(name = "是否周末可用(0：不可用，1：可用)")
+    private Integer isSunday;
+
     /** 更新者 */
     @Excel(name = "更新者")
     private String deleteBy;

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

@@ -112,6 +112,12 @@ public class SCoupon extends BaseEntity
     private Integer isOverlay;
 
     /**
+     * 是否可叠加使用(0：不可叠加，1：可叠加)
+     */
+    @Excel(name = "是否周末可用(0：不可用，1：可用)")
+    private Integer isSunday;
+
+    /**
      * 第三方平台类型(1：自营，2：美团)
      */
     @Excel(name = "第三方平台类型(1：自营，2：美团)")

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

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

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

@@ -325,7 +325,7 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
         newSConsumerCoupon.setCouponType(sCoupon.getCouponType());
             newSConsumerCoupon.setMinPrice(new BigDecimal(0.00));
             newSConsumerCoupon.setSubPrice(sCoupon.getSubPrice());
-
+        newSConsumerCoupon.setIsSunday(sCoupon.getIsSunday());
         newSConsumerCoupon.setMinDuration(sCoupon.getMinDuration());
             newSConsumerCoupon.setMaxDuration(sCoupon.getMaxDuration());
             newSConsumerCoupon.setDuration(sCoupon.getDuration());

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

@@ -47,6 +47,8 @@ public class SCouponServiceImpl implements ISCouponService {
     //默认优惠结束（有效）时段
     private static final String DEFAULT_END_TIME = "23:00";
 
+    private static final String TWO = "2";
+
 
     /**
      * 查询优惠券
@@ -169,37 +171,39 @@ public class SCouponServiceImpl implements ISCouponService {
             List<TuangouDealQueryShopDealResponseEntity> queryshopdeal = qpService.queryshopdeal(openShopUuid);
             if (!CollectionUtils.isEmpty(queryshopdeal)) {
                 queryshopdeal.stream().forEach(item -> {
-                    SCoupon sCoupon1 = sCouponList.get(item.getDealgroup_id());
-                    if (ObjectUtils.isEmpty(sCoupon1)) {
-                        SCoupon sCoupon = new SCoupon();
-                        //添加团购id
-                        sCoupon.setDealgroupId(item.getDealgroup_id());
-                        //套餐名称
-                        sCoupon.setName(item.getTitle());
-                        //套餐原价
-                        sCoupon.setSubPrice(BigDecimal.valueOf(item.getMarketprice()));
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-                        try {
-                            Date receiptEndDate = sdf.parse(item.getReceipt_end_date());
-                            Date receiptBeginDate = sdf.parse(item.getReceipt_begin_date());
-                            sCoupon.setStartDate(receiptBeginDate);
-                            sCoupon.setEndDate(receiptEndDate);
-                        } catch (ParseException e) {
-                            throw new RuntimeException(e);
+                    if (TWO.equals(item.getSale_status())) {
+                        SCoupon sCoupon1 = sCouponList.get(item.getDealgroup_id());
+                        if (ObjectUtils.isEmpty(sCoupon1)) {
+                            SCoupon sCoupon = new SCoupon();
+                            //添加团购id
+                            sCoupon.setDealgroupId(item.getDealgroup_id());
+                            //套餐名称
+                            sCoupon.setName(item.getTitle());
+                            //套餐原价
+                            sCoupon.setSubPrice(BigDecimal.valueOf(item.getMarketprice()));
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                            try {
+                                Date receiptEndDate = sdf.parse(item.getReceipt_end_date());
+                                Date receiptBeginDate = sdf.parse(item.getReceipt_begin_date());
+                                sCoupon.setStartDate(receiptBeginDate);
+                                sCoupon.setEndDate(receiptEndDate);
+                            } catch (ParseException e) {
+                                throw new RuntimeException(e);
+                            }
+                            sCoupon.setRoomType(RoomType.getCodeList());
+                            sCoupon.setStoreType(StoreType.getCodeList());
+                            sCoupon.setValidStartTime(DEFAULT_START_TIME);
+                            sCoupon.setValidEndTime(DEFAULT_END_TIME);
+                            sCoupon.setMinDuration(DEFAULT_DURATION);
+                            sCoupon.setMaxDuration(DEFAULT_MAX_DURATION);
+                            sCoupon.setMinPrice(new BigDecimal("0.00"));
+                            sCoupon.setCouponType(CouponTypeEnum.CASH.getCode());
+                            sCouponList.put(item.getDealgroup_id(), sCoupon);
+                            //从门店列表中获取门店id
+                            sCoupon.setStoreIds(String.valueOf(sStores.stream().filter(store -> store.getOpenShopUuid().equals(openShopUuid)).findFirst().get().getId()));
+                        } else {
+                            sCoupon1.setStoreIds(sCoupon1.getStoreIds() + "," + sStores.stream().filter(store -> store.getOpenShopUuid().equals(openShopUuid)).findFirst().get().getId());
                         }
-                        sCoupon.setRoomType(RoomType.getCodeList());
-                        sCoupon.setStoreType(StoreType.getCodeList());
-                        sCoupon.setValidStartTime(DEFAULT_START_TIME);
-                        sCoupon.setValidEndTime(DEFAULT_END_TIME);
-                        sCoupon.setMinDuration(DEFAULT_DURATION);
-                        sCoupon.setMaxDuration(DEFAULT_MAX_DURATION);
-                        sCoupon.setMinPrice(new BigDecimal("0.00"));
-                        sCoupon.setCouponType(CouponTypeEnum.CASH.getCode());
-                        sCouponList.put(item.getDealgroup_id(), sCoupon);
-                        //从门店列表中获取门店id
-                        sCoupon.setStoreIds(String.valueOf(sStores.stream().filter(store -> store.getOpenShopUuid().equals(openShopUuid)).findFirst().get().getId()));
-                    } else {
-                        sCoupon1.setStoreIds(sCoupon1.getStoreIds() + "," + sStores.stream().filter(store -> store.getOpenShopUuid().equals(openShopUuid)).findFirst().get().getId());
                     }
                 });
             }

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

@@ -33,6 +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="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -67,6 +68,7 @@
                use_date,
                use_status,
                is_delete,
+               is_sunday,
                create_by,
                create_time,
                update_by,
@@ -106,6 +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="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>
@@ -155,6 +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="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -191,6 +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="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -231,6 +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="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,6 +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="platformType"    column="platform_type"    />
         <result property="number"    column="number"    />
         <result property="createBy"    column="create_by"    />
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                order_type,
                package_id,
                dealgroup_id,
+               is_sunday,
                store_ids,
                duration,min_duration,max_duration,
                min_price,sub_price,is_overlay,
@@ -72,6 +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="number != null"> and number = #{number}</if>
             <if test="createBy != null"> and create_by = #{createBy}</if>
             <if test="createTime != null"> and create_time = #{createTime}</if>
@@ -127,6 +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="platformType != null">platform_type,</if>
             <if test="number != null">number,</if>
             <if test="createBy != null">create_by,</if>
@@ -152,6 +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="platformType != null">#{platformType},</if>
             <if test="number != null">#{number},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -182,6 +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="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>