Requirements(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -15,7 +15,6 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @author: zj
@@ -46,12 +45,12 @@ public class RequirementsInfoVO implements Serializable {
     @ApiModelProperty(value = "任务开始时间", example = "2023-07-25", required = true)
     @NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class})
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date taskStartTime;
+    private String taskStartTime;
 
     @ApiModelProperty(value = "任务结束时间", example = "2023-07-26", required = true)
     @NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class})
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date taskEndTime;
+    private String taskEndTime;
 
     @ApiModelProperty(value = "任务地址", example = "广东省深圳市", required = true)
     @NotBlank(message = "任务地址不能为空", groups = {Insert.class, Update.class})

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -203,7 +203,7 @@ public class RequirementsController extends BaseController {
 
     @ApiOperation(value = "new——小程序-—发布者对飞手--评价详情")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @PostMapping("evaluateDetails")
+    @GetMapping("evaluateDetails")
     public ResultBody<ServiceEvaluateDTO> evaluateDetails(HttpServletRequest request, @ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
         Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
         return requirementsService.evaluateDetails(requirementsInfoId, userAccountId);
@@ -237,7 +237,7 @@ public class RequirementsController extends BaseController {
 
     @ApiOperation(value = "new——后台管理取消订单(取消发布者与飞手共同建立的订单)")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @PostMapping("cancelAll")
+    @GetMapping("cancelAll")
     public ResultBody cancelAll(HttpServletRequest request, @ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
         Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
         return requirementsService.cancelAll(requirementsInfoId, userAccountId);

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -126,4 +126,6 @@ public interface RequirementsDao {
     int myPublishcount(MyPublishQO param);
 
     int myPreemptCount(MyPreemptQO param);
+
+    List<RequirementsInfoDO> orderRequirements(String format);
 }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -47,12 +47,12 @@ public class RequirementsInfoDO implements Serializable {
     @ApiModelProperty(value = "任务开始时间", example = "2023-07-25", required = true)
     @NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class})
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date taskStartTime;
+    private String taskStartTime;
 
     @ApiModelProperty(value = "任务结束时间", example = "2023-07-26", required = true)
     @NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class})
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date taskEndTime;
+    private String taskEndTime;
 
     @ApiModelProperty(value = "任务地址", example = "广东省深圳市", required = true)
     @NotBlank(message = "任务地址不能为空", groups = {Insert.class, Update.class})

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -2,7 +2,10 @@ package com.mmc.csf.release.service;
 
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
-import com.mmc.csf.infomation.dto.*;
+import com.mmc.csf.infomation.dto.FlowDictionaryDTO;
+import com.mmc.csf.infomation.dto.ServiceArriveSceneDTO;
+import com.mmc.csf.infomation.dto.ServiceFulfilATaskDTO;
+import com.mmc.csf.infomation.dto.ServiceSettleAccountsDTO;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.qo.MyPreemptQO;
 import com.mmc.csf.infomation.qo.MyPublishQO;
@@ -89,7 +92,7 @@ public interface RequirementsService {
 
     ResultBody evaluate(ServiceEvaluateVO evaluateVO);
 
-    ResultBody<ServiceEvaluateDTO> evaluateDetails(Integer requirementsInfoId, Integer userAccountId);
+    ResultBody evaluateDetails(Integer requirementsInfoId, Integer userAccountId);
 
     ResultBody publisherNumber(GetOrderNumberVO getOrderNumberVO, HttpServletRequest request);
 
@@ -107,4 +110,6 @@ public interface RequirementsService {
     ResultBody<FlowDictionaryDTO> flowDictionary();
 
     ResultBody confirmSettlement(Integer userAccountId, Integer requirementsInfoId);
+
+    ResultBody orderRequirements(String format);
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -496,7 +496,14 @@ public class RequirementsServiceImpl implements RequirementsService {
         int count = requirementsDao.myPreemptCount(param);
         List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.myPreempt(param);
         List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
-
+        List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
+        for (RequirementsInfoVO requirementsInfoVO : collect) {
+            for (IndustryTypeDTO industryTypeDTO : industryTypeDTOS) {
+                if (requirementsInfoVO.getServiceId() != null && requirementsInfoVO.getServiceId().equals(industryTypeDTO.getId())) {
+                    requirementsInfoVO.setServiceName(industryTypeDTO.getTypeName());
+                }
+            }
+        }
         return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
     }
 
@@ -730,6 +737,8 @@ public class RequirementsServiceImpl implements RequirementsService {
                 publisherWalletFlowVO.setModeOfPayment(200);
                 publisherWalletFlowVO.setUserAccountId(userAccountId);
                 publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
+                publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
+                publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
                 walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
                 flyerCancel(walletFlowVO, request.getHeader("token"));
             }
@@ -743,6 +752,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 applyRefundVO.setReason("退发布者微信支付的任务佣金");
                 applyRefund(applyRefundVO, request.getHeader("token"));
             }
+            requirementsDao.updateInfo(requirementsInfoId, 7);
             return ResultBody.success(ResultEnum.THE_AMOUNT_OF_THE_MISSION_WILL_BE_RETURNED.getResultMsg());
         }
         if (serviceFlowId != 2 && serviceFlowId != 1) {
@@ -812,8 +822,10 @@ public class RequirementsServiceImpl implements RequirementsService {
             requirementsInfoDO.setReceiveSalaryAmount(receiveSalaryAmount);
             //给飞手发送短信
             this.sendMsgFlyerInfoAuth(requirementsInfoDO);
+            requirementsDao.updateInfo(requirementsInfoId, 7);
             return ResultBody.success(ResultEnum.REFUND_PERCENTAGE.getResultMsg());
         }
+
         return ResultBody.success();
     }
 
@@ -860,9 +872,27 @@ public class RequirementsServiceImpl implements RequirementsService {
         if (requirementsInfoDO == null) {
             return ResultBody.error("结算失败");
         }
+        requirementsDao.updateInfo(requirementsInfoId, 5);
+        requirementsDao.updateScene(requirementsInfoId, 5);
         return ResultBody.success();
     }
 
+    @Override
+    public ResultBody orderRequirements(String format) {
+        List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.orderRequirements(format);
+        for (RequirementsInfoDO requirementsInfoDO : requirementsInfoDOS) {
+            BigDecimal cashAmount = requirementsInfoDO.getCashAmount();
+            BigDecimal salaryAmount = requirementsInfoDO.getSalaryAmount();
+            BigDecimal weChat = requirementsInfoDO.getWeChat();
+            String wechatPayOrderNumber = requirementsInfoDO.getWechatPayOrderNumber();
+
+
+        }
+
+
+        return ResultBody.success(requirementsInfoDOS);
+    }
+
 
     @Override
     public ResultBody publishService(ServiceRequirementsVO serviceRequirementsVO, HttpServletRequest request) {
@@ -1172,6 +1202,14 @@ public class RequirementsServiceImpl implements RequirementsService {
         int count = requirementsDao.myPublishcount(param);
         List<RequirementsInfoDO> requirementsInfoDOS = requirementsDao.myPublish(param);
         List<RequirementsInfoVO> collect = requirementsInfoDOS.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
+        List<IndustryTypeDTO> industryTypeDTOS = listIndustry();
+        for (RequirementsInfoVO requirementsInfoVO : collect) {
+            for (IndustryTypeDTO industryTypeDTO : industryTypeDTOS) {
+                if (requirementsInfoVO.getServiceId() != null && requirementsInfoVO.getServiceId().equals(industryTypeDTO.getId())) {
+                    requirementsInfoVO.setServiceName(industryTypeDTO.getTypeName());
+                }
+            }
+        }
         return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
 
     }
@@ -1380,7 +1418,7 @@ public class RequirementsServiceImpl implements RequirementsService {
     }
 
     @Override
-    public ResultBody<ServiceEvaluateDTO> evaluateDetails(Integer requirementsInfoId, Integer userAccountId) {
+    public ResultBody evaluateDetails(Integer requirementsInfoId, Integer userAccountId) {
         ServiceEvaluateDO serviceEvaluateDO = requirementsDao.evaluateDetails(requirementsInfoId, userAccountId);
         ServiceEvaluateDTO serviceEvaluateDTO = serviceEvaluateDO.buildServiceEvaluateDTO();
         return ResultBody.success(serviceEvaluateDTO);

release-service/src/main/java/com/mmc/csf/release/timerTask/ServiceTakeDownTask.java

+package com.mmc.csf.release.timerTask;
+
+/**
+ * @Author small
+ * @Date 2023/8/24 20:59
+ * @Version 1.0
+ */
+/*@EnableScheduling
+@Component
+public class ServiceTakeDownTask {
+
+    @Autowired
+    private RequirementsService requirementsService;
+
+    //0 30 0 * * ? *
+    //* * * * * ?
+    @Scheduled(cron = "0 30 0 * * ? *")
+    public void orderCheck() {
+
+        String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        ResultBody resultBody = requirementsService.orderRequirements(format);
+        System.out.println(resultBody);
+        System.out.println("查询订单失效");
+    }
+}*/

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -394,7 +394,6 @@
                requirements_info_id
         from service_arrive_scene
         where requirements_info_id = #{requirementsInfoId}
-          and user_account_id = #{userAccountId}
     </select>
 
     <insert id="fulfilATask" parameterType="com.mmc.csf.release.entity.requirements.ServiceFulfilATaskDO"
@@ -409,7 +408,6 @@
         select id, task_describe, task_url, create_time, update_time, requirements_info_id, user_account_id
         from service_fulfil_a_task
         where requirements_info_id = #{requirementsInfoId}
-          and user_account_id = #{userAccountId}
     </select>
 
     <insert id="settleAccounts" parameterType="com.mmc.csf.release.entity.requirements.ServiceSettleAccountsDO"
@@ -423,7 +421,6 @@
         select id, order_amount, requirements_info_id, remark, create_time, update_time
         from service_settle_accounts
         where requirements_info_id = #{requirementsInfoId}
-          and user_account_id = #{userAccountId}
     </select>
     <insert id="evaluate" parameterType="com.mmc.csf.release.entity.requirements.ServiceEvaluateDO"
             keyProperty="id" useGeneratedKeys="true">
@@ -444,7 +441,6 @@
                user_account_id
         from service_evaluate
         where requirements_info_id = #{requirementsInfoId}
-          and user_account_id = #{userAccountId}
     </select>
 
     <select id="myPublishcount" resultType="java.lang.Integer">
@@ -544,6 +540,46 @@
             limit #{pageNo}, #{pageSize}
     </select>
 
+    <select id="orderRequirements" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
+        SELECT ri.id,
+               ri.task_title,
+               ri.task_start_time,
+               ri.task_end_time,
+               ri.task_address,
+               ri.longitude,
+               ri.latitude,
+               ri.require_url,
+               ri.require_description,
+               ri.requirement_type_id,
+               ri.user_account_id,
+               rt.type_name AS requirementTypeName,
+               ri.publish_phone,
+               ri.publisher_number,
+               ri.service_id,
+               ra.total_amount,
+               ri.insurance,
+               sf.doing,
+               sf.waiting,
+               sf.user_port,
+               sf.flyer_port,
+               sf.order_status,
+               ri.publish,
+               rs.preempt_total_amount,
+               ra.order_level,
+               ra.order_amount,
+               ri.service_flow_id,
+               ra.cash_amount,
+               ra.salary_amount,
+               ra.we_chat,
+               ra.wechat_pay_order_number
+        FROM requirements_info ri
+                 LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
+                 LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
+                 LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
+                 INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
+        WHERE ri.service_flow_id = 1
+          and ri.task_end_time &lt; #{format}
+    </select>
     <select id="droneFlyerCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsServiceDO">
         SELECT ri.id,
                ri.task_title,