yudao-admin-vue3/.env

@@ -14,7 +14,7 @@ VITE_APP_TENANT_ENABLE=true
 VITE_APP_CAPTCHA_ENABLE=true
 
 # 文档地址的开关
-VITE_APP_DOCALERT_ENABLE=true
+VITE_APP_DOCALERT_ENABLE=false
 
 # 百度统计
 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/circle/AppCircleController.java

@@ -23,6 +23,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 
 @Tag(name = "用户 APP - 商城动态") // 用于提供跨多个活动的 HTTP 接口
 @RestController
@@ -77,12 +78,29 @@ public class AppCircleController {
         return success(true);
     }
 
-    @GetMapping("/doReview")
+    @PostMapping("/doReview")
     @Operation(summary = "评论/回复")
     @PreAuthenticated
     public CommonResult<Boolean> doReview(@RequestBody CircleReviewSaveReqVO createReqVO){
+        createReqVO.setUserId(getLoginUserId());
         circleReviewService.createCircleReview(createReqVO);
         return success(true);
     }
 
+    @GetMapping("/doReviewDelete")
+    @Operation(summary = "删除评论")
+    @PreAuthenticated
+    public CommonResult<Boolean> doReviewDelete(@RequestParam("id") Long lookId){
+        circleReviewService.deleteCircleReview(lookId);
+        return success(true);
+    }
+
+    @GetMapping("/doCircleDelete")
+    @Operation(summary = "删除动态")
+    @PreAuthenticated
+    public CommonResult<Boolean> doCircleDelete(@RequestParam("id") Long lookId){
+        circleService.deleteCircle(lookId);
+        return success(true);
+    }
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java

@@ -44,7 +44,8 @@ public class RewardActivityServiceImpl implements RewardActivityService {
 
         // 插入
         RewardActivityDO rewardActivity = RewardActivityConvert.INSTANCE.convert(createReqVO)
-                .setStatus(PromotionUtils.calculateActivityStatus(createReqVO.getEndTime()));
+                .setStatus(PromotionUtils.calculateRewardActivityStatus(createReqVO.getStartTime(),
+                        createReqVO.getEndTime()));
         rewardActivityMapper.insert(rewardActivity);
         // 返回
         return rewardActivity.getId();

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/util/PromotionUtils.java

@@ -2,8 +2,10 @@ package cn.iocoder.yudao.module.promotion.util;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionActivityStatusEnum;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * 活动工具类
@@ -22,4 +24,17 @@ public class PromotionUtils {
         return LocalDateTimeUtils.beforeNow(endTime) ? CommonStatusEnum.DISABLE.getStatus() : CommonStatusEnum.ENABLE.getStatus();
     }
 
+    public static Integer calculateRewardActivityStatus(LocalDateTime starTime, LocalDateTime endTime) {
+        if (LocalDateTimeUtils.afterNow(starTime)){
+            return PromotionActivityStatusEnum.WAIT.getStatus();
+        }
+        if (LocalDateTimeUtils.beforeNow(starTime) && LocalDateTimeUtils.afterNow(endTime)){
+            return PromotionActivityStatusEnum.RUN.getStatus();
+        }
+        if (LocalDateTimeUtils.beforeNow(endTime)){
+            return PromotionActivityStatusEnum.END.getStatus();
+        }
+        return PromotionActivityStatusEnum.CLOSE.getStatus();
+    }
+
 }