提交 d55802eb 作者: 张小凤

BackRequirementsController(update)

上级 c4e9d491
...@@ -43,4 +43,6 @@ public class FlowDictionaryAndTimeDTO implements Serializable { ...@@ -43,4 +43,6 @@ public class FlowDictionaryAndTimeDTO implements Serializable {
@ApiModelProperty(value = "评价", example = "评价") @ApiModelProperty(value = "评价", example = "评价")
private ServiceEvaluateDTO serviceEvaluateDTO; private ServiceEvaluateDTO serviceEvaluateDTO;
@ApiModelProperty(value = "修改任务佣金", example = "修改任务佣金")
private RequirementsAmountUpdateDTO amountUpdate;
} }
package com.mmc.csf.infomation.dto;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author small
* @Date 2023/8/29 9:37
* @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public class RequirementsAmountUpdateDTO {
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
private FlowDictionaryDTO flowDictionaryDTO;
@ApiModelProperty(value = "", hidden = true)
private Integer serviceFlowId;
@ApiModelProperty(value = "服务需求id", required = true)
private Integer requirementsInfoId;
}
package com.mmc.csf.infomation.dto;
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 javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @Author small
* @Date 2023/8/29 10:31
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ServiceOrderFormDTO {
private static final long serialVersionUID = -447951390213113317L;
@ApiModelProperty(value = "id")
@NotNull(message = "id不能为空", groups = {Update.class})
private Integer id;
@ApiModelProperty(value = "服务类型id", example = "1")
@NotBlank(message = "服务类型id不能为空", groups = {Insert.class, Update.class})
private Integer serviceId;
@ApiModelProperty(value = "服务类型名称", example = "航拍摄影")
private String serviceName;
@ApiModelProperty(value = "订单级别 REGULAR_ORDER,RUSH_ORDER,TOP_ORDER", example = "TOP_ORDER")
private String orderLevel;
@ApiModelProperty(value = "发布者订单编号", example = "R3123132132132131")
private String publisherNumber;
@ApiModelProperty(value = "发布者电话", example = "1892994543", required = false)
private String publishPhone;
@ApiModelProperty(value = "抢单者电话", example = "13134311231")
private String preemptPhone;
@ApiModelProperty(value = "订单当前状态", example = "进行中")
private String doing;
@ApiModelProperty(value = "1正常 2争议订单", example = "1")
private Integer orderAttribute;
@ApiModelProperty(value = "平台总收益", example = "100")
private BigDecimal orderEarnings;
}
package com.mmc.csf.infomation.dto;
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 javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @Author small
* @Date 2023/8/29 11:31
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ServiceOrderFormDetailsDTO {
private static final long serialVersionUID = -447951390213113317L;
@ApiModelProperty(value = "id")
@NotNull(message = "id不能为空", groups = {Update.class})
private Integer id;
@ApiModelProperty(value = "发单时间", example = "2023-07-26 16:50:12")
private String createTime;
@ApiModelProperty(value = "服务类型id", example = "1")
@NotBlank(message = "服务类型id不能为空", groups = {Insert.class, Update.class})
private Integer serviceId;
@ApiModelProperty(value = "服务类型名称", example = "航拍摄影")
private String serviceName;
@ApiModelProperty(value = "发布者订单编号", example = "R3123132132132131")
private String publisherNumber;
@ApiModelProperty(value = "订单金额", example = "100")
private BigDecimal orderAmount;
@ApiModelProperty(value = "任务开始时间", example = "2023-07-26")
private String taskStartTime;
@ApiModelProperty(value = "任务结束时间", example = "2023-07-27")
private String taskEndTime;
@ApiModelProperty(value = "任务经度", example = "113.934559")
private Double longitude;
@ApiModelProperty(value = "任务纬度", example = "22.540366")
private Double latitude;
@ApiModelProperty(value = "任务详细地址", example = "任务详细地址")
private String taskAddress;
@ApiModelProperty(value = "冻结云享金", example = "100")
private BigDecimal cashAmount;
// @ApiModelProperty(value = "", example = "200")
@ApiModelProperty(value = "订单调整后金额", example = "100")
private BigDecimal updateOrderAmount;
@ApiModelProperty(value = "发布者电话", example = "1892994543", required = false)
private String publishPhone;
@ApiModelProperty(value = "抢单者电话", example = "13134311231")
private String preemptPhone;
@ApiModelProperty(value = "订单当前状态", example = "进行中")
private String doing;
@ApiModelProperty(value = "1正常 2争议订单", example = "1")
private Integer orderAttribute;
@ApiModelProperty(value = "平台总收益", example = "100")
private BigDecimal orderEarnings;
}
package com.mmc.csf.infomation.qo;
import com.mmc.csf.release.model.group.Freeze;
import com.mmc.csf.release.model.group.Page;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* @Author small
* @Date 2023/8/29 10:25
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ServiceOrderQO {
@ApiModelProperty(value = "发单手机号", required = false, example = "189213123213")
private String publishPhone;
@ApiModelProperty(value = "抢单手机号", required = false, example = "18923131321")
private String preemptPhone;
@ApiModelProperty(value = "1:正常 2:争议订单", required = false, example = "1")
private Integer orderAttribute;
@ApiModelProperty(value = "页码", required = true, example = "1")
@NotNull(message = "页码不能为空", groups = {Page.class, Freeze.class})
@Min(value = 1, groups = Page.class)
private Integer pageNo;
@ApiModelProperty(value = "每页显示数", required = true, example = "10")
@NotNull(message = "每页显示数不能为空", groups = {Page.class, Freeze.class})
@Min(value = 1, groups = Page.class)
private Integer pageSize;
public void buildCurrentPage() {
this.pageNo = (pageNo - 1) * pageSize;
}
}
...@@ -34,7 +34,7 @@ public class ServiceRequirementsVO implements Serializable { ...@@ -34,7 +34,7 @@ public class ServiceRequirementsVO implements Serializable {
@ApiModelProperty(value = "id", example = "1") @ApiModelProperty(value = "id", example = "1")
@NotBlank(message = "服务类型名称不能为空", groups = {Insert.class, Update.class}) @NotBlank(message = "服务类型名称不能为空", groups = {Insert.class, Update.class})
private String serviceId; private Integer serviceId;
@ApiModelProperty(value = "飞行日期——任务开始时间", example = "2023-07-25", required = true) @ApiModelProperty(value = "飞行日期——任务开始时间", example = "2023-07-25", required = true)
@NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class}) @NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class})
......
package com.mmc.csf.release.controller;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.infomation.dto.ServiceOrderFormDTO;
import com.mmc.csf.infomation.qo.ServiceOrderQO;
import com.mmc.csf.release.model.group.Page;
import com.mmc.csf.release.service.BackRequirementsService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/**
* @Author small
* @Date 2023/8/29 10:18
* @Version 1.0
*/
@Api(tags = {"服务需求订单后台相关"})
@RestController
@RequestMapping("/backRequirements/")
public class BackRequirementsController extends BaseController {
@Autowired
private BackRequirementsService backRequirementsService;
@ApiOperation(value = "后台管理——服务订单分页")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ServiceOrderFormDTO.class)})
@PostMapping("serviceOrderFormList")
public ResultBody<ServiceOrderFormDTO> serviceOrderFormList(HttpServletRequest request,
@Validated(value = {Page.class}) @ApiParam(value = "角色查询QO", required = true) @RequestBody ServiceOrderQO param) {
return ResultBody.success(backRequirementsService.serviceOrderFormList(param, this.getUserLoginInfoFromRedis(request)));
}
@ApiOperation(value = "后台管理——服务订单详情")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ServiceOrderFormDTO.class)})
@GetMapping("serviceOrderFormDetails")
public ResultBody<ServiceOrderFormDTO> serviceOrderFormDetails(HttpServletRequest request, @ApiParam(value = "需求发布id", required = true) @RequestParam Integer requirementsInfoId) {
return ResultBody.success(backRequirementsService.serviceOrderFormDetails(requirementsInfoId, this.getUserLoginInfoFromRedis(request)));
}
}
...@@ -336,6 +336,6 @@ public class RequirementsController extends BaseController { ...@@ -336,6 +336,6 @@ public class RequirementsController extends BaseController {
public ResultBody deleteRequire(@RequestParam Integer requirementsInfoId, HttpServletRequest request) { public ResultBody deleteRequire(@RequestParam Integer requirementsInfoId, HttpServletRequest request) {
return requirementsService.deleteRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId()); return requirementsService.deleteRequire(requirementsInfoId, this.getUserLoginInfoFromRedis(request).getUserAccountId());
} }
} }
package com.mmc.csf.release.controller.test; package com.mmc.csf.release.controller.countDown;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
package com.mmc.csf.release.controller.test; package com.mmc.csf.release.controller.countDown;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mmc.csf.common.util.web.ResultBody; import com.mmc.csf.common.util.web.ResultBody;
......
package com.mmc.csf.release.controller.test; package com.mmc.csf.release.controller.countDown;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
......
package com.mmc.csf.release.dao;
import com.mmc.csf.infomation.qo.ServiceOrderQO;
import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @Author small
* @Date 2023/8/29 10:21
* @Version 1.0
*/
@Mapper
public interface BackRequirementsDao {
List<ServiceOrderFormDO> serviceOrderFormList(ServiceOrderQO param);
int countService(ServiceOrderQO param);
}
...@@ -168,4 +168,6 @@ public interface RequirementsDao { ...@@ -168,4 +168,6 @@ public interface RequirementsDao {
void requirementsAmountUpdate(RequirementsAmountUpdateDO amountUpdateDO); void requirementsAmountUpdate(RequirementsAmountUpdateDO amountUpdateDO);
RequirementsAmountUpdateDO selectAmountUpdate(Integer requirementsInfoId); RequirementsAmountUpdateDO selectAmountUpdate(Integer requirementsInfoId);
RequirementsAmountUpdateDTO amountUpdateDTO(Integer requirementsInfoId);
} }
package com.mmc.csf.release.entity.requirements;
import com.mmc.csf.infomation.dto.ServiceOrderFormDTO;
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 javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @Author small
* @Date 2023/8/29 10:59
* @Version 1.0
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ServiceOrderFormDO {
private static final long serialVersionUID = -447951390213113317L;
@ApiModelProperty(value = "id")
@NotNull(message = "id不能为空", groups = {Update.class})
private Integer id;
@ApiModelProperty(value = "服务类型id", example = "1")
@NotBlank(message = "服务类型id不能为空", groups = {Insert.class, Update.class})
private Integer serviceId;
@ApiModelProperty(value = "服务类型名称", example = "航拍摄影")
private String serviceName;
@ApiModelProperty(value = "订单级别 REGULAR_ORDER,RUSH_ORDER,TOP_ORDER", example = "TOP_ORDER")
private String orderLevel;
@ApiModelProperty(value = "发布者订单编号", example = "R3123132132132131")
private String publisherNumber;
@ApiModelProperty(value = "发布者电话", example = "1892994543", required = false)
private String publishPhone;
@ApiModelProperty(value = "抢单者电话", example = "13134311231")
private String preemptPhone;
@ApiModelProperty(value = "订单当前状态", example = "进行中")
private String doing;
@ApiModelProperty(value = "1正常 2争议订单", example = "1")
private Integer orderAttribute;
@ApiModelProperty(value = "平台总收益", example = "100")
private BigDecimal orderEarnings;
public ServiceOrderFormDTO buildServiceOrderForm() {
return ServiceOrderFormDTO.builder()
.id(this.id)
.serviceName(this.serviceName)
.serviceId(this.serviceId)
.orderLevel(this.orderLevel)
.publisherNumber(this.publisherNumber)
.publishPhone(this.publishPhone)
.preemptPhone(this.preemptPhone)
.doing(this.doing)
.orderEarnings(this.orderEarnings)
.orderAttribute(this.orderAttribute)
.build();
}
}
...@@ -33,7 +33,7 @@ public class ServiceRequirementsDO { ...@@ -33,7 +33,7 @@ public class ServiceRequirementsDO {
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
@NotBlank(message = "服务类型id不能为空", groups = {Insert.class, Update.class}) @NotBlank(message = "服务类型id不能为空", groups = {Insert.class, Update.class})
private String serviceId; private Integer serviceId;
@ApiModelProperty(value = "飞行日期——任务开始时间", example = "2023-07-25", required = true) @ApiModelProperty(value = "飞行日期——任务开始时间", example = "2023-07-25", required = true)
@NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class}) @NotNull(message = "任务开始时间不能为空", groups = {Insert.class, Update.class})
......
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.qo.ServiceOrderQO;
import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
/**
* @Author small
* @Date 2023/8/29 10:19
* @Version 1.0
*/
public interface BackRequirementsService {
PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis);
ResultBody serviceOrderFormDetails(Integer requirementsInfoId, LoginSuccessDTO userLoginInfoFromRedis);
}
package com.mmc.csf.release.service.impl;
import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.infomation.dto.ServiceOrderFormDTO;
import com.mmc.csf.infomation.qo.ServiceOrderQO;
import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
import com.mmc.csf.release.dao.BackRequirementsDao;
import com.mmc.csf.release.entity.requirements.ServiceOrderFormDO;
import com.mmc.csf.release.service.BackRequirementsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author small
* @Date 2023/8/29 10:20
* @Version 1.0
*/
@Service
public class BackRequirementsServiceImpl implements BackRequirementsService {
@Autowired
private BackRequirementsDao backRequirementsDao;
@Override
public PageResult serviceOrderFormList(ServiceOrderQO param, LoginSuccessDTO userLoginInfoFromRedis) {
int count = backRequirementsDao.countService(param);
if (count == 0) {
return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
}
Integer pageNo = param.getPageNo();
param.buildCurrentPage();
List<ServiceOrderFormDO> serviceOrderFormDOS = backRequirementsDao.serviceOrderFormList(param);
List<ServiceOrderFormDTO> collect = serviceOrderFormDOS.stream().map(ServiceOrderFormDO::buildServiceOrderForm).collect(Collectors.toList());
return PageResult.buildPage(pageNo, param.getPageSize(), count, collect);
}
@Override
public ResultBody serviceOrderFormDetails(Integer requirementsInfoId, LoginSuccessDTO userLoginInfoFromRedis) {
return null;
}
}
...@@ -14,7 +14,7 @@ import com.mmc.csf.infomation.qo.MyPreemptQO; ...@@ -14,7 +14,7 @@ import com.mmc.csf.infomation.qo.MyPreemptQO;
import com.mmc.csf.infomation.qo.MyPublishQO; import com.mmc.csf.infomation.qo.MyPublishQO;
import com.mmc.csf.infomation.vo.*; import com.mmc.csf.infomation.vo.*;
import com.mmc.csf.release.constant.*; import com.mmc.csf.release.constant.*;
import com.mmc.csf.release.controller.test.RedisUtil; import com.mmc.csf.release.controller.countDown.RedisUtil;
import com.mmc.csf.release.dao.RequirementsDao; import com.mmc.csf.release.dao.RequirementsDao;
import com.mmc.csf.release.entity.requirements.*; import com.mmc.csf.release.entity.requirements.*;
import com.mmc.csf.release.feign.PmsAppApi; import com.mmc.csf.release.feign.PmsAppApi;
...@@ -1426,6 +1426,9 @@ public class RequirementsServiceImpl implements RequirementsService { ...@@ -1426,6 +1426,9 @@ public class RequirementsServiceImpl implements RequirementsService {
ServiceEvaluateDTO serviceEvaluateDTO = requirementsDao.serviceEvaluateDTO(requirementsInfoId); ServiceEvaluateDTO serviceEvaluateDTO = requirementsDao.serviceEvaluateDTO(requirementsInfoId);
flowDictionaryAndTimeDTO.setServiceEvaluateDTO(serviceEvaluateDTO); flowDictionaryAndTimeDTO.setServiceEvaluateDTO(serviceEvaluateDTO);
RequirementsAmountUpdateDTO amountUpdateDTO = requirementsDao.amountUpdateDTO(requirementsInfoId);
flowDictionaryAndTimeDTO.setAmountUpdate(amountUpdateDTO);
return ResultBody.success(flowDictionaryAndTimeDTO); return ResultBody.success(flowDictionaryAndTimeDTO);
} }
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.csf.release.dao.BackRequirementsDao">
<select id="serviceOrderFormList" resultType="com.mmc.csf.release.entity.requirements.ServiceOrderFormDO">
SELECT
ri.id,
ri.create_time,
ri.update_time,
ri.publisher_number,
ri.publish_phone,
ri.order_attribute,
ra.order_earnings,
ra.order_level,
rs.preempt_phone,
ri.service_flow_id,
sf.doing,
ri.service_id,
ri.service_name
FROM
requirements_info ri
LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
LEFT JOIN requirements_service rs ON rs.requirements_info_id = ra.id
LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
WHERE
ri.publish =1
<if test=" publishPhone != null and publishPhone!='' ">
and ri.publish_phone = #{publishPhone}
</if>
<if test=" preemptPhone != null and preemptPhone!='' ">
and rs.preempt_phone = #{preemptPhone}
</if>
<if test=" orderAttribute != null and orderAttribute!='' ">
and ri.order_attribute = #{orderAttribute}
</if>
order by ri.id desc
limit #{pageNo},#{pageSize}
</select>
<select id="countService" resultType="java.lang.Integer">
SELECT
count(*)
FROM
requirements_info ri
LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
LEFT JOIN requirements_service rs ON rs.requirements_info_id = ra.id
LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
WHERE
ri.publish =1
<if test=" publishPhone != null and publishPhone!='' ">
and ri.publish_phone = #{publishPhone}
</if>
<if test=" preemptPhone != null and preemptPhone!='' ">
and rs.preempt_phone = #{preemptPhone}
</if>
<if test=" orderAttribute != null and orderAttribute!='' ">
and ri.order_attribute = #{orderAttribute}
</if>
</select>
</mapper>
...@@ -79,6 +79,20 @@ ...@@ -79,6 +79,20 @@
WHERE requirements_info_id = #{requirementsInfoId} WHERE requirements_info_id = #{requirementsInfoId}
</select> </select>
<select id="amountUpdateDTO" resultMap="amountUpdateMap">
SELECT id,
requirements_info_id,
order_amount,
cash_amount,
create_time,
update_time,
reason,
url,
service_flow_id
FROM requirements_amount_update
WHERE requirements_info_id = #{requirementsInfoId}
</select>
<update id="solveRequire"> <update id="solveRequire">
update requirements_info update requirements_info
set is_solved = 1 set is_solved = 1
...@@ -895,6 +909,18 @@ ...@@ -895,6 +909,18 @@
</resultMap> </resultMap>
<resultMap id="amountUpdateMap" type="com.mmc.csf.infomation.dto.RequirementsAmountUpdateDTO">
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="requirementsInfoId" column="requirements_info_id"/>
<result property="serviceFlowId" column="service_flow_id"/>
<collection property="flowDictionaryDTO" ofType="com.mmc.csf.infomation.dto.FlowDictionaryDTO"
select="selectServiceFlow"
column="{serviceFlowId=service_flow_id}">
</collection>
</resultMap>
<resultMap id="serviceEvaluateMap" type="com.mmc.csf.infomation.dto.ServiceEvaluateDTO"> <resultMap id="serviceEvaluateMap" type="com.mmc.csf.infomation.dto.ServiceEvaluateDTO">
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论