Merge remote-tracking branch 'origin/sit' into sit

alien-entity/src/main/java/shop/alien/entity/store/StoreIncomeDetailsRecord.java

@@ -34,7 +34,7 @@ public class StoreIncomeDetailsRecord extends Model<StoreIncomeDetailsRecord> {
     @TableField("cash_out_id")
     private Integer cashOutId;
 
-    @ApiModelProperty(value = "收入类型, 0:主页, 1:优惠券, 2:代金券, 3:套餐, 4:联名卡")
+    @ApiModelProperty(value = "收入类型, 0:全部, 1:代金, 2:团购")
     @TableField("income_type")
     private Integer incomeType;
 

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMainInfoVo.java

@@ -86,6 +86,9 @@ public class StoreMainInfoVo extends StoreInfo {
     @ApiModelProperty(value = "到期时间")
     private String expirationDate;
 
+    @ApiModelProperty(value = "合同是否到期 0已到期/1没到期")
+    private Integer expirationFlag;
+
     @ApiModelProperty(value = "门店注销中倒计时时间毫秒")
     private long countdown;
 

alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -20,7 +20,6 @@ import shop.alien.mapper.*;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.LifeCouponService;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
-import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.UniqueRandomNumGenerator;
 import shop.alien.util.common.constant.OrderStatusEnum;
 
@@ -451,25 +450,6 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
     public R<String> orderVerify(String orderCode) {
         OrderCouponMiddle orderCouponMiddle = orderCouponMiddleMapper.selectOne(new LambdaQueryWrapper<OrderCouponMiddle>().eq(OrderCouponMiddle::getCouponCode, orderCode));
         if (!StringUtils.isEmpty(orderCouponMiddle) && orderCouponMiddle.getStatus() == 1) {
-            LifeCoupon lifeCoupon = lifeCouponMapper.selectOne(new LambdaQueryWrapper<LifeCoupon>().eq(LifeCoupon::getId, orderCouponMiddle.getCouponId()));
-            //有效期到
-            Date date = DateUtils.calcDays(orderCouponMiddle.getCreatedTime(), lifeCoupon.getExpirationDate());
-            //开始时间段
-            int beginUseTime = Integer.parseInt(lifeCoupon.getBuyUseStartTime());
-            //结束时间段
-            int endUseTime = Integer.parseInt(lifeCoupon.getBuyUseEndTime());
-            if (new Date().after(date)) {
-                return R.fail("该劵已过期");
-            }
-            if (endUseTime < beginUseTime) {
-                if (!(LocalDateTime.now().getHour() >= beginUseTime || LocalDateTime.now().getHour() < endUseTime)) {
-                    return R.fail("该劵未到使用时间");
-                }
-            } else if (endUseTime > beginUseTime) {
-                if (LocalDateTime.now().getHour() < beginUseTime || LocalDateTime.now().getHour() >= endUseTime) {
-                    return R.fail("该劵未到使用时间");
-                }
-            }
             LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserOrder>().eq(LifeUserOrder::getId, orderCouponMiddle.getOrderId()));
             //类型为:1 代金券订单
             if (lifeUserOrder.getCouponType() == 1) {
@@ -641,6 +621,24 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
                 return R.fail("该劵在不可用日期内");
             }
         }
+    /*    //有效期到
+        Date date = DateUtils.calcDays(orderCouponMiddle.getCreatedTime(), lifeCoupon.getExpirationDate());
+        //开始时间段
+        int beginUseTime = Integer.parseInt(lifeCoupon.getBuyUseStartTime());
+        //结束时间段
+        int endUseTime = Integer.parseInt(lifeCoupon.getBuyUseEndTime());
+        if (new Date().after(date)) {
+            return R.fail("该劵已过期");
+        }
+        if (endUseTime < beginUseTime) {
+            if (!(LocalDateTime.now().getHour() >= beginUseTime || LocalDateTime.now().getHour() < endUseTime)) {
+                return R.fail("该劵未到使用时间");
+            }
+        } else if (endUseTime > beginUseTime) {
+            if (LocalDateTime.now().getHour() < beginUseTime || LocalDateTime.now().getHour() >= endUseTime) {
+                return R.fail("该劵未到使用时间");
+            }
+        }*/
         // 判断是否在使用时间内
         Integer buyUseStartTime = Integer.parseInt(lifeCoupon.getBuyUseStartTime());
         Integer buyUseEndTime = Integer.parseInt(lifeCoupon.getBuyUseEndTime());

alien-store/src/main/java/shop/alien/store/service/impl/StoreIncomeDetailsRecordServiceImpl.java

@@ -500,9 +500,10 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
         //当前时间-3天大于创建时间
         wrapper.between(StoreIncomeDetailsRecord::getCreatedTime, date + " 00:00:00", date + " 23:59:59")
                 //未绑定提现记录的
-                .isNull(StoreIncomeDetailsRecord::getCashOutId);
+                .isNull(StoreIncomeDetailsRecord::getCashOutId)
+                .eq(StoreIncomeDetailsRecord::getStoreId, storeId);
         if(null != incomeType && 0 == incomeType){
-            wrapper.in(StoreIncomeDetailsRecord::getIncomeType, "2","3");
+            wrapper.in(StoreIncomeDetailsRecord::getIncomeType, CouponTypeEnum.COUPON.getCode(),CouponTypeEnum.GROUP_BUY.getCode());
         } else {
             wrapper.eq(StoreIncomeDetailsRecord::getIncomeType, incomeType);
         }

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package shop.alien.store.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.util.DateUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -158,6 +159,18 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
              return null;
         }
         StoreMainInfoVo storeMainInfoVo = storeInfoMapper.getStoreInfo(id);
+
+        //判断门店是否到期
+        if (ObjectUtils.isNotEmpty(storeMainInfoVo.getExpirationTime())) {
+            if (new Date().after(storeMainInfoVo.getExpirationTime())) {
+                storeMainInfoVo.setExpirationFlag(0);
+            }else {
+                storeMainInfoVo.setExpirationFlag(1);
+            }
+        }else {
+            storeMainInfoVo.setExpirationFlag(1);
+        }
+
         //存入门店地址、
         storeMainInfoVo.setStoreAddress(storeInfo.getStoreAddress());
         //入口图