提交 4ea438a2 作者: 张小凤

FlowDictionaryAndTimeDTO(update)

上级 9c4343ce
package com.mmc.csf.infomation.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author small
* @Date 2023/8/25 18:45
* @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public class FlowDictionaryAndTimeDTO implements Serializable {
//抢单
@ApiModelProperty(value = "抢单", example = "抢单")
private RequirementsServiceDTO requirementsServiceDTO;
//抵达现场地址
// service_arrive_scene
@ApiModelProperty(value = "抵达现场", example = "抵达现场")
private ServiceArriveSceneDTO serviceArriveSceneDTO;
//完成任务
// service_fulfil_a_task
@ApiModelProperty(value = "完成任务", example = "完成任务")
private ServiceFulfilATaskDTO serviceFulfilATaskDTO;
//结算
//service_settle_accounts
@ApiModelProperty(value = "结算", example = "结算")
private ServiceSettleAccountsDTO serviceSettleAccountsDTO;
//评价
// service_evaluate
@ApiModelProperty(value = "评价", example = "评价")
private ServiceEvaluateDTO serviceEvaluateDTO;
}
package com.mmc.csf.infomation.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author small
* @Date 2023/8/25 19:40
* @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public class RequirementsServiceDTO {
/**
* 抢单时间
*/
@ApiModelProperty(value = "抢单时间", example = "抢单时间")
private String createTime;
/**
* 修改时间
*/
@ApiModelProperty(value = "抢单时间", example = "抢单时间")
private String updateTime;
@ApiModelProperty(value = "服务id", example = "服务id")
private Integer requirementsInfoId;
@ApiModelProperty(value = "流程id", hidden = true)
private Integer serviceFlowId;
@ApiModelProperty(value = "流程字典", example = "流程字典")
private FlowDictionaryDTO flowDictionaryDTO;
}
...@@ -40,4 +40,13 @@ public class ServiceArriveSceneDTO { ...@@ -40,4 +40,13 @@ public class ServiceArriveSceneDTO {
@ApiModelProperty(value = "服务需求id", required = true) @ApiModelProperty(value = "服务需求id", required = true)
private Integer requirementsInfoId; private Integer requirementsInfoId;
@ApiModelProperty(value = "到达现场时间")
private String createTime;
private String updateTime;
@ApiModelProperty(value = "流程id", hidden = true)
private Integer serviceFlowId;
private FlowDictionaryDTO flowDictionaryDTO;
} }
...@@ -44,4 +44,8 @@ public class ServiceEvaluateDTO { ...@@ -44,4 +44,8 @@ public class ServiceEvaluateDTO {
@JSONField(format = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
private FlowDictionaryDTO flowDictionaryDTO;
@ApiModelProperty(value = "", hidden = true)
private Integer serviceFlowId;
} }
...@@ -39,4 +39,9 @@ public class ServiceFulfilATaskDTO { ...@@ -39,4 +39,9 @@ public class ServiceFulfilATaskDTO {
@JSONField(format = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
@ApiModelProperty(value = "", hidden = true)
private Integer serviceFlowId;
private FlowDictionaryDTO flowDictionaryDTO;
} }
...@@ -41,4 +41,9 @@ public class ServiceSettleAccountsDTO { ...@@ -41,4 +41,9 @@ public class ServiceSettleAccountsDTO {
@JSONField(format = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
private FlowDictionaryDTO flowDictionaryDTO;
@ApiModelProperty(value = "", hidden = true)
private Integer serviceFlowId;
} }
package com.mmc.csf.infomation.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* @Author small
* @Date 2023/8/25 13:23
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class GetOrderNumberUpdateVO {
@ApiModelProperty(value = "订单金额", example = "100.00", required = true)
//@NotNull(message = "订单金额", groups = {Insert.class})
//@DecimalMin(value = "100.00", message = "amount格式不正确")
private BigDecimal orderAmount;
@ApiModelProperty(value = "云享金", example = "10", hidden = true)
private BigDecimal cashAmount;
@ApiModelProperty(value = "佣金", example = "10", hidden = true)
private BigDecimal salaryAmount;
@ApiModelProperty(value = "微信金额", example = "10", hidden = true)
private BigDecimal weChatPay;
@ApiModelProperty(value = "用户id", example = "10", hidden = true)
private Integer userAccountId;
@ApiModelProperty(value = "支付方式,云享金:1,佣金:2,微信支付:3", example = "1,2,3", required = true)
private String paymentType;
@ApiModelProperty(value = "抢单时需要知道抢单的那个订单", example = "1", required = true)
private Integer requirementsInfoId;
}
package com.mmc.csf.infomation.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mmc.csf.release.model.group.Insert;
import com.mmc.csf.release.model.group.Update;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Author small
* @Date 2023/8/25 10:53
* @Version 1.0
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ServiceRequirementsEditVO implements Serializable {
private static final long serialVersionUID = -447951390213113317L;
@ApiModelProperty(value = "id")
@NotNull(message = "requirementsInfoId不能为空", groups = {Update.class})
private Integer requirementsInfoId;
@ApiModelProperty(value = "id", example = "1")
private Integer serviceId;
@ApiModelProperty(value = "飞行日期——任务开始时间", example = "2023-07-25", required = true)
@NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class})
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
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 String taskEndTime;
@ApiModelProperty(value = "飞行位置——任务地址", example = "广东省深圳市", required = true)
@NotBlank(message = "任务地址不能为空", groups = {Insert.class, Update.class})
private String taskAddress;
@ApiModelProperty(value = "飞行位置——任务经度", example = "23.344324", required = true)
@NotNull(message = "任务经度不能为空", groups = {Insert.class, Update.class})
private Double longitude;
@ApiModelProperty(value = "飞行位置——任务纬度", example = "44.344324", required = true)
@NotNull(message = "任务纬度不能为空", groups = {Insert.class, Update.class})
private Double latitude;
@ApiModelProperty(value = "任务需求描述", example = "描述一下", required = true)
@NotNull(message = "任务需求描述不能为空", groups = {Insert.class})
@Length(max = 300, message = "字符过长")
private String requireDescription;
@ApiModelProperty(value = "订单金额", example = "100", required = true)
@NotNull(message = "订单金额", groups = {Insert.class})
private BigDecimal orderAmount;
@ApiModelProperty(value = "飞手保险1飞手保险 2三者保险 3机身保险", example = "1,2,3", required = true)
@NotNull(message = "飞手保险", groups = {Insert.class})
private String insurance;
/* @ApiModelProperty(value = "订单级别 todo:前端传英文,后台自己获取金额 订单级别(REGULAR_ORDER,RUSH_ORDER,TOP_ORDER)", example = "REGULAR_ORDER", required = true)
@NotNull(message = "订单级别", groups = {Insert.class})
private OrderLevelEnum orderLevelEnum;*/
@ApiModelProperty(value = "后台获取token里面的用户id", hidden = true)
private Integer userAccountId;
@ApiModelProperty(value = "发布者姓名", example = "张三")
private String publishName;
@ApiModelProperty(value = "发布者电话", example = "1892994543", required = true)
@NotNull(message = "发布者电话不能为空", groups = {Insert.class})
private String publishPhone;
@ApiModelProperty(value = "云享金", example = "10", hidden = true)
private BigDecimal cashAmount;
@ApiModelProperty(value = "佣金", example = "10", hidden = true)
private BigDecimal salaryAmount;
@ApiModelProperty(value = "微信支付订单编号", example = "R202308191657303116170")
private String wechatPayOrderNumber;
@ApiModelProperty(value = "支付方式,云享金:1,佣金:2,微信支付:3", example = "1,2,3")
private String paymentType;
@ApiModelProperty(value = "微信金额", example = "10", hidden = true)
private BigDecimal weChat;
@ApiModelProperty(value = "地区编码", example = "307013")
private String adcode;
}
...@@ -4,16 +4,19 @@ import org.springframework.boot.SpringApplication; ...@@ -4,16 +4,19 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
/** /**
* @Author LW * @Author LW
* @date 2023/5/13 10:39 * @date 2023/5/13 10:39
* 概要: * 概要:
// */ * //
*/
@EnableFeignClients(basePackages = "com.mmc.csf.release.feign") // 所有FeignClient放在client-feign-springboot-starter里面进行管理 @EnableFeignClients(basePackages = "com.mmc.csf.release.feign") // 所有FeignClient放在client-feign-springboot-starter里面进行管理
//@EnableCircuitBreaker //@EnableCircuitBreaker
//@EnableEurekaClient //@EnableEurekaClient
@EnableScheduling
@SpringBootApplication @SpringBootApplication
public class ReleaseApplication { public class ReleaseApplication {
public static void main(String[] args) { public static void main(String[] args) {
...@@ -21,7 +24,7 @@ public class ReleaseApplication { ...@@ -21,7 +24,7 @@ public class ReleaseApplication {
} }
@Bean @Bean
public RestTemplate restTemplate(){ public RestTemplate restTemplate() {
return new RestTemplate(); return new RestTemplate();
} }
} }
...@@ -41,10 +41,20 @@ public class RequirementsController extends BaseController { ...@@ -41,10 +41,20 @@ public class RequirementsController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = RequirementsTypeVO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = RequirementsTypeVO.class)})
@GetMapping("flowDictionary") @GetMapping("flowDictionary")
public ResultBody<FlowDictionaryDTO> flowDictionary() { public ResultBody<FlowDictionaryDTO> flowDictionary() {
return requirementsService.flowDictionary(); return requirementsService.flowDictionary();
} }
@ApiOperation(value = "流程字典(包含流程时间)")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = RequirementsTypeVO.class)})
@GetMapping("flowDictionaryAndTime")
public ResultBody<FlowDictionaryAndTimeDTO> flowDictionaryAndTime(HttpServletRequest request,
@ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
return requirementsService.flowDictionaryAndTime(requirementsInfoId);
}
@ApiOperation(value = "小程序——发布需求信息") @ApiOperation(value = "小程序——发布需求信息")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("publish") @PostMapping("publish")
...@@ -91,6 +101,26 @@ public class RequirementsController extends BaseController { ...@@ -91,6 +101,26 @@ public class RequirementsController extends BaseController {
return requirementsService.updatePublish(requirementsInfoVO, request); return requirementsService.updatePublish(requirementsInfoVO, request);
} }
@ApiOperation(value = "小程序——修改发布服务需求订单编号单独接口")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("updatePublisherNumber")
public ResultBody<GetOrderNumberDTO> updatePublisherNumber(@RequestBody GetOrderNumberUpdateVO getOrderNumberUpdateVO, HttpServletRequest request) {
Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
getOrderNumberUpdateVO.setUserAccountId(userAccountId);
return requirementsService.updatePublisherNumber(getOrderNumberUpdateVO, request);
}
@ApiOperation(value = "小程序-编辑——服务需求发布")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("updateServicePublish")
public ResultBody updateServicePublish(@RequestBody @Validated(value = {Update.class}) ServiceRequirementsEditVO requirementsInfoVO, HttpServletRequest request) {
requirementsInfoVO.setUserAccountId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
return requirementsService.updateServicePublish(requirementsInfoVO, request);
}
@ApiOperation(value = "小程序-删除——需求发布") @ApiOperation(value = "小程序-删除——需求发布")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@GetMapping("deletePublish") @GetMapping("deletePublish")
...@@ -113,7 +143,6 @@ public class RequirementsController extends BaseController { ...@@ -113,7 +143,6 @@ public class RequirementsController extends BaseController {
return requirementsService.detailPublish(id, request, this.getUserLoginInfoFromRedis(request).getUserAccountId()); return requirementsService.detailPublish(id, request, this.getUserLoginInfoFromRedis(request).getUserAccountId());
} }
@ApiOperation(value = "new——小程序-—服务订单--我的发布") @ApiOperation(value = "new——小程序-—服务订单--我的发布")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("myPublish") @PostMapping("myPublish")
......
package com.mmc.csf.release.dao; package com.mmc.csf.release.dao;
import com.mmc.csf.infomation.dto.*;
import com.mmc.csf.infomation.qo.IndustryCaseQO; import com.mmc.csf.infomation.qo.IndustryCaseQO;
import com.mmc.csf.infomation.qo.MyPreemptQO; import com.mmc.csf.infomation.qo.MyPreemptQO;
import com.mmc.csf.infomation.qo.MyPublishQO; import com.mmc.csf.infomation.qo.MyPublishQO;
...@@ -128,4 +129,22 @@ public interface RequirementsDao { ...@@ -128,4 +129,22 @@ public interface RequirementsDao {
int myPreemptCount(MyPreemptQO param); int myPreemptCount(MyPreemptQO param);
List<RequirementsInfoDO> orderRequirements(String format); List<RequirementsInfoDO> orderRequirements(String format);
void updateServiceAmount(Integer id);
void InsertRequirementsAmountLog(RequirementsInfoDO requirementsInfoDO);
void updateAmount(RequirementsAmountDO amountDO);
void updateRequirementsInfo(RequirementsInfoDO infoDO);
RequirementsServiceDTO requirementsServiceDTO(Integer requirementsInfoId);
ServiceArriveSceneDTO serviceArriveSceneDTO(Integer requirementsInfoId);
ServiceFulfilATaskDTO serviceFulfilATaskDTO(Integer requirementsInfoId);
ServiceSettleAccountsDTO settleAccountsDTO(Integer requirementsInfoId);
ServiceEvaluateDTO serviceEvaluateDTO(Integer requirementsInfoId);
} }
package com.mmc.csf.release.entity.requirements; package com.mmc.csf.release.entity.requirements;
import com.mmc.csf.config.IsNullConvertZero; import com.mmc.csf.config.IsNullConvertZero;
import com.mmc.csf.infomation.vo.ServiceRequirementsEditVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -98,4 +99,10 @@ public class RequirementsAmountDO implements Serializable { ...@@ -98,4 +99,10 @@ public class RequirementsAmountDO implements Serializable {
this.levelCashAmount = requirementsInfoDO.getLevelCashAmount(); this.levelCashAmount = requirementsInfoDO.getLevelCashAmount();
} }
public RequirementsAmountDO(ServiceRequirementsEditVO requirementsEditVO) {
this.orderAmount = requirementsEditVO.getOrderAmount();
this.wechatPayOrderNumber = requirementsEditVO.getWechatPayOrderNumber();
this.requirementsInfoId = requirementsEditVO.getRequirementsInfoId();
}
} }
package com.mmc.csf.release.entity.requirements; package com.mmc.csf.release.entity.requirements;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mmc.csf.config.IsNullConvertZero;
import com.mmc.csf.infomation.vo.RequirementsInfoVO; import com.mmc.csf.infomation.vo.RequirementsInfoVO;
import com.mmc.csf.infomation.vo.ServiceRequirementsEditVO;
import com.mmc.csf.release.model.group.Insert; import com.mmc.csf.release.model.group.Insert;
import com.mmc.csf.release.model.group.Update; import com.mmc.csf.release.model.group.Update;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -86,6 +88,7 @@ public class RequirementsInfoDO implements Serializable { ...@@ -86,6 +88,7 @@ public class RequirementsInfoDO implements Serializable {
@ApiModelProperty(value = "服务名称", example = "服务名称") @ApiModelProperty(value = "服务名称", example = "服务名称")
private String serviceName; private String serviceName;
@ApiModelProperty(value = "发布者支付总金额", example = "发布者支付总金额") @ApiModelProperty(value = "发布者支付总金额", example = "发布者支付总金额")
@IsNullConvertZero
private BigDecimal totalAmount; private BigDecimal totalAmount;
@ApiModelProperty(value = "允许几人抢单", example = "允许几人抢单") @ApiModelProperty(value = "允许几人抢单", example = "允许几人抢单")
private Integer repertory; private Integer repertory;
...@@ -103,14 +106,15 @@ public class RequirementsInfoDO implements Serializable { ...@@ -103,14 +106,15 @@ public class RequirementsInfoDO implements Serializable {
private String orderStatus; private String orderStatus;
private Integer publish; private Integer publish;
@IsNullConvertZero
private BigDecimal preemptTotalAmount; private BigDecimal preemptTotalAmount;
@IsNullConvertZero
private BigDecimal orderAmount; private BigDecimal orderAmount;
private Integer serviceFlowId; private Integer serviceFlowId;
@ApiModelProperty(value = "修格后的任务佣金") @ApiModelProperty(value = "修格后的任务佣金")
@IsNullConvertZero
private BigDecimal updateOrderAmount; private BigDecimal updateOrderAmount;
@ApiModelProperty(value = "原因") @ApiModelProperty(value = "原因")
...@@ -124,12 +128,13 @@ public class RequirementsInfoDO implements Serializable { ...@@ -124,12 +128,13 @@ public class RequirementsInfoDO implements Serializable {
@ApiModelProperty(value = "发布者支付任务佣金 佣金金额") @ApiModelProperty(value = "发布者支付任务佣金 佣金金额")
@IsNullConvertZero
private BigDecimal cashAmount; private BigDecimal cashAmount;
@IsNullConvertZero
private BigDecimal weChat; private BigDecimal weChat;
@IsNullConvertZero
private BigDecimal salaryAmount; private BigDecimal salaryAmount;
@ApiModelProperty(value = "抢单飞手用户id ") @ApiModelProperty(value = "抢单飞手用户id ")
private Integer pilotCertificationUserId; private Integer pilotCertificationUserId;
...@@ -137,8 +142,21 @@ public class RequirementsInfoDO implements Serializable { ...@@ -137,8 +142,21 @@ public class RequirementsInfoDO implements Serializable {
private String flyerOpenid; private String flyerOpenid;
@ApiModelProperty(value = "飞手获得任务佣金") @ApiModelProperty(value = "飞手获得任务佣金")
@IsNullConvertZero
private BigDecimal receiveSalaryAmount; private BigDecimal receiveSalaryAmount;
@ApiModelProperty(value = "地区编码", example = "307013")
private String adcode;
@ApiModelProperty(value = "抢单级别金额")
@IsNullConvertZero
private BigDecimal orderLevelAmount;
@IsNullConvertZero
private BigDecimal levelCashAmount;
@IsNullConvertZero
private BigDecimal levelWeChatAmount;
@IsNullConvertZero
private BigDecimal levelSalaryAmount;
public RequirementsInfoVO buildRequirementsInfoVO() { public RequirementsInfoVO buildRequirementsInfoVO() {
return RequirementsInfoVO.builder().id(this.id).requirementTypeId(this.requirementTypeId).userAccountId(this.userAccountId).publishName(this.publishName) return RequirementsInfoVO.builder().id(this.id).requirementTypeId(this.requirementTypeId).userAccountId(this.userAccountId).publishName(this.publishName)
...@@ -189,4 +207,18 @@ public class RequirementsInfoDO implements Serializable { ...@@ -189,4 +207,18 @@ public class RequirementsInfoDO implements Serializable {
this.requireUrl = requirementsInfoVO.getRequireUrl(); this.requireUrl = requirementsInfoVO.getRequireUrl();
} }
public RequirementsInfoDO(ServiceRequirementsEditVO requirementsEditVO) {
this.id = requirementsEditVO.getRequirementsInfoId();
this.taskEndTime = requirementsEditVO.getTaskEndTime();
this.taskStartTime = requirementsEditVO.getTaskStartTime();
this.serviceId = requirementsEditVO.getServiceId();
this.requireDescription = requirementsEditVO.getRequireDescription();
this.taskAddress = requirementsEditVO.getTaskAddress();
this.longitude = requirementsEditVO.getLongitude();
this.latitude = requirementsEditVO.getLatitude();
this.adcode = requirementsEditVO.getAdcode();
this.orderAmount = requirementsEditVO.getOrderAmount();
}
} }
...@@ -68,8 +68,10 @@ public class RequirementsServiceDO implements Serializable { ...@@ -68,8 +68,10 @@ public class RequirementsServiceDO implements Serializable {
@JSONField(format = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "任务佣金") @ApiModelProperty(value = "任务佣金")
@IsNullConvertZero
private BigDecimal percentagePenaltyOfOrder; private BigDecimal percentagePenaltyOfOrder;
@ApiModelProperty(value = "发布者订单的任务佣金") @ApiModelProperty(value = "发布者订单的任务佣金")
@IsNullConvertZero
private BigDecimal orderAmount; private BigDecimal orderAmount;
@ApiModelProperty(value = "抢单者openid") @ApiModelProperty(value = "抢单者openid")
private String openid; private String openid;
...@@ -79,4 +81,6 @@ public class RequirementsServiceDO implements Serializable { ...@@ -79,4 +81,6 @@ public class RequirementsServiceDO implements Serializable {
this.pilotCertificationUserId = pilot.getUserAccountId(); this.pilotCertificationUserId = pilot.getUserAccountId();
this.requirementsInfoId = requirementsInfoDO.getId(); this.requirementsInfoId = requirementsInfoDO.getId();
} }
} }
...@@ -2,10 +2,7 @@ package com.mmc.csf.release.service; ...@@ -2,10 +2,7 @@ package com.mmc.csf.release.service;
import com.mmc.csf.common.util.page.PageResult; import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody; import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.infomation.dto.FlowDictionaryDTO; import com.mmc.csf.infomation.dto.*;
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.IndustryCaseQO;
import com.mmc.csf.infomation.qo.MyPreemptQO; import com.mmc.csf.infomation.qo.MyPreemptQO;
import com.mmc.csf.infomation.qo.MyPublishQO; import com.mmc.csf.infomation.qo.MyPublishQO;
...@@ -96,6 +93,8 @@ public interface RequirementsService { ...@@ -96,6 +93,8 @@ public interface RequirementsService {
ResultBody publisherNumber(GetOrderNumberVO getOrderNumberVO, HttpServletRequest request); ResultBody publisherNumber(GetOrderNumberVO getOrderNumberVO, HttpServletRequest request);
ResultBody updatePublisherNumber(GetOrderNumberUpdateVO getOrderNumberUpdateVO, HttpServletRequest request);
PageResult myPreempt(Integer userAccountId, MyPreemptQO param); PageResult myPreempt(Integer userAccountId, MyPreemptQO param);
ResultBody droneFlyerCancel(Integer requirementsInfoId, Integer userAccountId, HttpServletRequest request); ResultBody droneFlyerCancel(Integer requirementsInfoId, Integer userAccountId, HttpServletRequest request);
...@@ -112,4 +111,8 @@ public interface RequirementsService { ...@@ -112,4 +111,8 @@ public interface RequirementsService {
ResultBody confirmSettlement(Integer userAccountId, Integer requirementsInfoId); ResultBody confirmSettlement(Integer userAccountId, Integer requirementsInfoId);
ResultBody orderRequirements(String format); ResultBody orderRequirements(String format);
ResultBody updateServicePublish(ServiceRequirementsEditVO requirementsInfoVO, HttpServletRequest request);
ResultBody<FlowDictionaryAndTimeDTO> flowDictionaryAndTime(Integer requirementsInfoId);
} }
package com.mmc.csf.release.timerTask; package com.mmc.csf.release.timerTask;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.release.service.RequirementsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
/** /**
* @Author small * @Author small
* @Date 2023/8/24 20:59 * @Date 2023/8/24 20:59
* @Version 1.0 * @Version 1.0
*/ */
/*@EnableScheduling //@EnableScheduling
@Component @Component
public class ServiceTakeDownTask { public class ServiceTakeDownTask {
@Autowired @Autowired
private RequirementsService requirementsService; private RequirementsService requirementsService;
//0 30 0 * * ? * //0 30 0 * * ?
//* * * * * ? //* * * * * ?
@Scheduled(cron = "0 30 0 * * ? *") @Scheduled(cron = "0 30 0 * * ?")
public void orderCheck() { public void orderCheck() {
String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
...@@ -22,4 +31,4 @@ public class ServiceTakeDownTask { ...@@ -22,4 +31,4 @@ public class ServiceTakeDownTask {
System.out.println(resultBody); System.out.println(resultBody);
System.out.println("查询订单失效"); System.out.println("查询订单失效");
} }
}*/ }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论