GetOrderNumberDTO(update)

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

@@ -38,5 +38,8 @@ public class GetOrderNumberDTO implements Serializable {
     @ApiModelProperty(value = "用户id", example = "100", hidden = true)
     private Integer userAccountId;
 
+    @ApiModelProperty(value = "服务id")
+    private Integer requirementsInfoId;
+
 
 }

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

@@ -124,6 +124,7 @@ public interface RequirementsDao {
 
     void updateInfo(Integer requirementsInfoId, Integer serviceFlowId);
 
+    void updateFlow(Integer requirementsInfoId, Integer serviceFlowId);
 
     int myPublishcount(MyPublishQO param);
 

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

@@ -428,6 +428,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         if (rushAndTop.compareTo(BigDecimal.ZERO) == 0) {
             if (getOrderNumberVO.getOrderMode() == 2) {
                 Integer requirementsInfoId = getOrderNumberVO.getRequirementsInfoId();
+                orderNumberDTO.setRequirementsInfoId(requirementsInfoId);
                 RequirementsInfoDO requirementsInfoDO1 = requirementsDao.detailPublish(requirementsInfoId);
                 BigDecimal orderAmount1 = requirementsInfoDO1.getOrderAmount();
                 BigDecimal bigDecimal = new BigDecimal(0.3);
@@ -753,6 +754,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         flyerCancel(walletFlowVO, request.getHeader("token"));
         requirementsDao.updateScene(requirementsInfoId, 7);
         requirementsDao.updateInfo(requirementsInfoId, 7);
+        requirementsDao.updateFlow(requirementsInfoId, 7);
         this.sendMsgPublishInfoAuth(requirementsServiceDO);
         return ResultBody.success(ResultEnum.PAYMENT_SUCCESS.getResultMsg());
     }
@@ -971,6 +973,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 applyRefund(applyRefundVO, request.getHeader("token"));
             }
             requirementsDao.updateInfo(requirementsInfoId, 7);
+            requirementsDao.updateFlow(requirementsInfoId, 7);
             return ResultBody.success(ResultEnum.THE_AMOUNT_OF_THE_MISSION_WILL_BE_RETURNED.getResultMsg());
         }
         if (serviceFlowId != 2 && serviceFlowId != 1) {
@@ -1041,6 +1044,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             //给飞手发送短信
             this.sendMsgFlyerInfoAuth(requirementsInfoDO);
             requirementsDao.updateInfo(requirementsInfoId, 7);
+            requirementsDao.updateFlow(requirementsInfoId, 7);
             return ResultBody.success(ResultEnum.REFUND_PERCENTAGE.getResultMsg());
         }
 

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

@@ -303,6 +303,7 @@
                            on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id
         WHERE NOT EXISTS(
                 SELECT rs.requirements_info_id FROM requirements_service rs WHERE ri.id = rs.requirements_info_id)
+          AND ri.service_flow = 0
         ORDER BY ri.order_level_amount DESC,
                  ri.id DESC
     </select>
@@ -441,6 +442,12 @@
         where id = #{requirementsInfoId}
     </update>
 
+    <update id="updateFlow">
+        UPDATE requirements_info
+        set service_flow=#{serviceFlowId}
+        where id = #{requirementsInfoId}
+    </update>
+
     <select id="arriveAtTheSceneDetails" resultType="com.mmc.csf.release.entity.requirements.ServiceArriveSceneDO">
         select id,
                longitude,
@@ -551,8 +558,7 @@
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
-        ORDER BY ri.order_level_amount desc,
-        ri.id desc
+        ORDER BY ri.id desc
         limit #{pageNo}, #{pageSize}
     </select>
 
@@ -605,8 +611,7 @@
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
-        ORDER BY ri.order_level_amount desc,
-        ra.id desc
+        ORDER BY ri.id desc
         limit #{pageNo}, #{pageSize}
     </select>