BackRequirementsDao.xml(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDTO.java

@@ -60,4 +60,6 @@ public class ServiceOrderFormDTO {
     @ApiModelProperty(value = "更新时间", example = "")
     private String updateTime;
 
+    @ApiModelProperty(value = "状态", example = "100")
+    private String orderStatus;
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDetailsDTO.java

@@ -106,4 +106,7 @@ public class ServiceOrderFormDetailsDTO {
 
     @ApiModelProperty(value = "更新时间", example = "")
     private String updateTime;
+
+    @ApiModelProperty(value = "状态", example = "100")
+    private String orderStatus;
 }

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

@@ -67,6 +67,7 @@ public class ServiceRequirementsVO implements Serializable {
 
     @ApiModelProperty(value = "订单金额", example = "100", required = true)
     @NotNull(message = "订单金额", groups = {Insert.class})
+    // @DecimalMin(value = "100", message = "订单金额不小于100")
     private BigDecimal orderAmount;
 
     @ApiModelProperty(value = "飞手保险1飞手保险 2三者保险 3机身保险", example = "1,2,3", required = true)

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

@@ -63,6 +63,9 @@ public class ServiceOrderFormDO {
     @ApiModelProperty(value = "更新时间", example = "")
     private String updateTime;
 
+    @ApiModelProperty(value = "状态", example = "100")
+    private String orderStatus;
+
     public ServiceOrderFormDTO buildServiceOrderForm() {
         return ServiceOrderFormDTO.builder()
                 .id(this.id)
@@ -77,6 +80,7 @@ public class ServiceOrderFormDO {
                 .orderAttribute(this.orderAttribute)
                 .createTime(this.createTime)
                 .updateTime(this.updateTime)
+                .orderStatus(this.orderStatus)
                 .build();
     }
 

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

@@ -96,6 +96,9 @@ public class ServiceOrderFormDetailsDO {
     @ApiModelProperty(value = "更新时间", example = "")
     private String updateTime;
 
+    @ApiModelProperty(value = "状态", example = "100")
+    private String orderStatus;
+
 
     public ServiceOrderFormDetailsDTO buildOrderFormDetails() {
         return ServiceOrderFormDetailsDTO.builder()
@@ -121,6 +124,7 @@ public class ServiceOrderFormDetailsDO {
                 .orderEarningsDTO(this.orderEarningsDTO)
                 .createTime(this.createTime)
                 .updateTime(this.updateTime)
+                .orderStatus(this.orderStatus)
                 .build();
     }
 }

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

@@ -1247,6 +1247,8 @@ public class RequirementsServiceImpl implements RequirementsService {
             if (numberDTO != null) {
                 amountUpdateDO.setWechatPayOrderNumber(numberDTO.getPaymentOrderNumber());
             }
+            requirementsDao.updateScene(amountVO.getRequirementsInfoId(), 5);
+            requirementsDao.updateInfo(amountVO.getRequirementsInfoId(), 5);
             requirementsDao.requirementsAmountUpdate(amountUpdateDO);
             redisUtil.ins("order_" + requirementsInfoDO.getPublisherNumber(), String.valueOf(requirementsInfoDO), 1, TimeUnit.HOURS);
             return ResultBody.success();

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

@@ -18,7 +18,8 @@
         ri.service_flow_id,
         sf.doing,
         ri.service_id,
-        ri.service_name
+        ri.service_name,
+        sf.order_status
         FROM
         requirements_info ri
         LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
@@ -80,10 +81,13 @@
                rs.salary_amount       AS preemptSalaryAmount,
                rs.we_chat             AS preemptWeChat,
                ra.update_order_amount AS updateOrderAmount,
-               ri.require_description
+               ri.require_description,
+               sf.order_status,
+               sf.doing
         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 = ri.id
+                 LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE ri.id = #{requirementsInfoId}
     </select>