web-中台 套餐详情

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

@@ -247,4 +247,8 @@ public class LifeGroupBuyMain {
     @ApiModelProperty(value = "修改人ID")
     @TableField("updated_user_id")
     private Integer updatedUserId;
+
+    @ApiModelProperty(value = "评论意见")
+    @TableField("comment")
+    private String comment;
 }

alien-store/src/main/java/shop/alien/store/controller/LifeGroupBuyController.java

@@ -64,9 +64,9 @@ public class LifeGroupBuyController {
 
     @ApiOperation("修改团购状态")
     @GetMapping("/updateStatus")
-    private R updateStatus(@RequestParam("id") String id, @RequestParam("status") String status) {
-        log.info("LifeGroupBuyController.updateStatus?id={},status={}", id, status);
-        if (lifeGroupBuyService.updateStatus(id, status)) {
+    private R updateStatus(@RequestParam("id") String id, @RequestParam("status") String status, @RequestParam("comment") String comment) {
+        log.info("LifeGroupBuyController.updateStatus?id={},status={},comment={}", id, status, comment);
+        if (lifeGroupBuyService.updateStatus(id, status, comment)) {
             return R.success("成功");
         }
         return R.fail("失败");

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

@@ -19,7 +19,7 @@ public interface LifeGroupBuyService extends IService<LifeGroupBuyMain> {
 
     LifeGroupBuyThaliVo getThaliById(String id);
 
-    boolean updateStatus(String id,String status);
+    boolean updateStatus(String id,String status, String comment);
 
     boolean delThaliById(String id,String groupType);
 

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

@@ -135,8 +135,8 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
     }
 
     @Override
-    public boolean updateStatus(String id, String status) {
-        lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>().eq(LifeGroupBuyMain::getId, id).set(LifeGroupBuyMain::getStatus, status));
+    public boolean updateStatus(String id, String status, String comment) {
+        lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>().eq(LifeGroupBuyMain::getId, id).set(LifeGroupBuyMain::getStatus, status).set(LifeGroupBuyMain::getComment, comment));
         return true;
     }
 

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

@@ -530,12 +530,14 @@ public class PlatformStoreCouponServiceImpl implements PlatformStoreCouponServic
             lifeGroupBuyMainVo.setExpiredState("1"); // 当前时间超过 endDate → 已到期
         }
         // 不可用日期
-        String afterSemicolon = lifeGroupBuyMain.getDisableDateValue().split(";")[1];
-        if (StringUtils.isNotEmpty(afterSemicolon)) {
-            List<String> collectUnavailableDate = Arrays.stream(afterSemicolon.split(",")).map(String::trim).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(collectUnavailableDate)) {
-                List<EssentialHolidayComparison> essentialHolidayComparisons = essentialHolidayComparisonMapper.selectList(new LambdaQueryWrapper<EssentialHolidayComparison>().in(EssentialHolidayComparison::getId, collectUnavailableDate));
-                lifeGroupBuyMainVo.setEssentialHolidayComparisonList(essentialHolidayComparisons);
+        if(lifeGroupBuyMainVo.getDisableDateType()==1){
+            String afterSemicolon = lifeGroupBuyMain.getDisableDateValue().split(";")[1];
+            if (StringUtils.isNotEmpty(afterSemicolon)) {
+                List<String> collectUnavailableDate = Arrays.stream(afterSemicolon.split(",")).map(String::trim).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(collectUnavailableDate)) {
+                    List<EssentialHolidayComparison> essentialHolidayComparisons = essentialHolidayComparisonMapper.selectList(new LambdaQueryWrapper<EssentialHolidayComparison>().in(EssentialHolidayComparison::getId, collectUnavailableDate));
+                    lifeGroupBuyMainVo.setEssentialHolidayComparisonList(essentialHolidayComparisons);
+                }
             }
         }
         return lifeGroupBuyMainVo;