as

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -310,4 +310,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
 
+    //根据运输订单号查找需要用车时长
+    Map<String,Object> selectInwardTimeByOrderId(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -622,8 +622,20 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
 
     @Override
     public int closeInwardOrder(Integer orderId) {
-
-      return  omstruckOrderSeparateMapper.closeInwardOrder(orderId);
-
+      int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
+        //判断是否需要重新推单
+        //根据运输订单id查找需求日期是否超过一个月
+        Map<String, Object> map1 = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
+        Date dueTime =(Date) map1.get("dueTime");
+        //当前时间小于截至时间
+        long DueTime = dueTime.getTime();
+        //获取当前时间
+        Date date=new Date();
+        long nowTime = date.getTime();
+        if (nowTime < DueTime){
+            //推送
+           i+=addNewTransportOrder(new BigDecimal(orderId));
+        }
+      return i;
     }
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -162,6 +162,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         int count = 0;
         for (Map<String, Object> capacityMap : driverCapacityIdList) {
+            map.put("carrierId",capacityMap.get("carrierId"));
+            map.put("priceId",capacityMap.get("priceId"));
             //添加运输订单
             OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
             omstruckOrder.setOrderPlanId(purchaseOrderId);

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -728,7 +728,7 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         <if test="carrierSSOId != null">
             left join RMS_CARRIER RCA
-            on RCA.CARRIER_ID = RC.CARRIER_ID
+            on RCA.CARRIER_ID = OO.CARRIER_ID
         </if>
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
@@ -984,6 +984,7 @@
             RC.CAPACITY_NUMBER = #{capacityNumber}
         </if>
     </update>
+
     <update id="refuseCtrlZ">
         UPDATE OMSTRUCK_ORDER OO
         SET OO.ORDER_STATUS = 4
@@ -3232,5 +3233,16 @@
             AND OO.ORDER_STATUS in (2, 4, 5, 6)
         </if>
     </select>
-
+<!-- 根据运输订单id查找需求日期 -->
+ <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+   select AIR.DUE_DATE  "dueTime"
+   from OMSTRUCK_ORDER OO
+   left join AMSTRUCK_INWARD_PLAN AIP
+   on AIP.PLAN_ID=OO.ORDER_PLAN_ID
+   left join AMSTRUCK_REQUIREMENT_PLAN ARP
+   on ARP.PLAN_ID=AIP.PLAN_ID
+   left join AMSTRUCK_INWARD_REQUIREMENT AIR
+   on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+   where OO.ORDER_ID=#{orderId}
+ </select>
 </mapper>