活动问题修改

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/AdminFeignService.java

@@ -78,4 +78,7 @@ public interface AdminFeignService {
     @GetMapping("/open/userOrder/contractRecord")
     HttpResponseResult<Boolean> contractRecord(@RequestBody ContractDto contract);
 
+    //老师课酬
+    @PostMapping(value = "/task/activityState")
+    HttpResponseResult activityState();
 }

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/ActivityStateTask.java

@@ -0,0 +1,19 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.api.feign.AdminFeignService;
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ActivityStateTask extends BaseTask {
+
+    @Autowired
+    private AdminFeignService adminFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        Object o = adminFeignService.activityState();
+    }
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/task/TaskController.java

@@ -1,13 +1,9 @@
 package com.yonge.cooleshow.admin.task;
 
-import com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord;
 import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.wordfilter.WordContext;
-import com.yonge.cooleshow.biz.dal.wordfilter.WordFilter;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import io.swagger.annotations.Api;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -144,14 +144,20 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
             if (detail.getActivityStart().before(now)) {
                 activityPlan.setActivityStart(now);
             }
+            activityPlan.setActivityState(activityState);
+        }else{
+            activityPlan.setActivityState(2);
+            //取消活动所有订单
+            cancelActivityOrder(activityPlan);
         }
 
         activityPlan.setId(activityId);
-        activityPlan.setActivityState(activityState);
         activityPlan.setUpdateBy(id);
         activityPlan.setUpdateTime(new Date());
 
         baseMapper.updateById(activityPlan);
+
+
         return true;
     }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanMapper.xml

@@ -41,7 +41,7 @@
         , t.registration_price_ as registrationPrice
         , t.share_rate_ as shareRate
         , t.draft_flag_ as draftFlag
-        , t.activity_state_ as activityState
+        , if(t.activity_state_ = 1, 1, 0) as activityState
         , t.create_time_ as createTime
         , t.create_by_ as createBy
         , t.update_time_ as updateTime
@@ -70,7 +70,12 @@
                 and t.draft_flag_ = #{param.draftFlag}
             </if>
             <if test="param.activityState != null">
-                and t.activity_state_ = #{param.activityState}
+                <if test="param.activityState == 0">
+                    and (t.activity_state_ = 0 or t.activity_state_ = 2)
+                </if>
+                <if test="param.activityState == 1">
+                    and t.activity_state_ = 1
+                </if>
             </if>
             <if test="param.startTime !=null or param.endTime !=null">
                 and NOT (