Merge remote-tracking branch 'origin/master'

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

@@ -151,6 +151,9 @@ public class LifeUserOrderVo {
     @ApiModelProperty(value = "营业状态")
     private String businessStatus;
 
+    @ApiModelProperty(value = "营业状态")
+    private String storeStatus;
+
     @ApiModelProperty(value = "商户状态")
     private String abnormalStateFlag;
 

alien-entity/src/main/java/shop/alien/mapper/LifeUserOrderMapper.java

@@ -43,7 +43,7 @@ public interface LifeUserOrderMapper extends BaseMapper<LifeUserOrder> {
             "from life_coupon lc where lc.delete_flag = 0\n" +
             ")\n" +
             "select luo.id,luo.buy_time,luo.status,luo.price,luo.final_price,luo.user_id,luo.store_id,luo.order_no,luo.pay_time,luo.cancel_time,luo.finish_time,\n" +
-            "si.store_name,si.commission_rate,si.business_section store_type,si.business_status,\n" +
+            "si.store_name,si.commission_rate,si.business_section store_type,si.store_status,si.business_status,\n" +
             "count(ocm.coupon_code) coupon_count,\n" +
             "simg.img_url,\n" +
             "lu.user_phone,\n" +

alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -50,6 +51,11 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
 
     private final StoreCommentMapper storeCommentMapper;
 
+    @Value("${store.income-freeze.freeze-switch}")
+    private String freezeSwitch;
+    @Value("${store.income-freeze.freeze-day}")
+    private String freezeDay;
+
     public int addLiulanCount(String id) {
         LambdaUpdateWrapper<LifeUserDynamics> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.eq(LifeUserDynamics::getId, id);
@@ -91,6 +97,12 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
             store.setCreatedTime(new java.sql.Timestamp(nowDate.getTime()));
             return lifeUserDynamicsMapper.insert(store);
         } else {
+            //如果发布，则将创建时间修改为当前时间
+            LifeUserDynamics lifeUserDynamics = lifeUserDynamicsMapper.selectById(store.getId());
+            int draft = lifeUserDynamics.getDraft();
+            if(draft == 1 && store.getDraft() == 0){
+                store.setCreatedTime(new Date());
+            }
             return lifeUserDynamicsMapper.updateById(store);
         }
     }
@@ -487,6 +499,9 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
     }
 
     public LifeUserDynamicsVo getDynamicsDetail(Integer id) {
+        System.out.println("-----------------------------:"+freezeSwitch);
+        System.out.println("-----------------------------:"+freezeDay);
+
         // 查询动态数据并按类型过滤
         LifeUserDynamicsVo lifeUserDynamicsVo = new LifeUserDynamicsVo();
         List<LifeUserDynamicsVo> lifeUserDynamicsVoList = lifeUserDynamicsMapper.getDynamicsDetail(id);