add

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -316,6 +316,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @ApiOperation(value = "司机接收、拒绝接单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),
     })
     @PostMapping("/driverReceiveOrRefuse")
     public RESTfulResult driverReceiveOrRefuse(@RequestBody Map<String, Object> map) {

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

@@ -262,4 +262,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //查看当前订单最大路段顺序号 与当前订单路段顺序号
     Map<String, Object> getMaxLineSeqByOrderId(BigDecimal orderId);
+
+    //通过订单查询趟次
+    Integer getSporadicOrderTimes(BigDecimal orderId);
+
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.mapper;
 
 import com.steerinfo.dil.model.OmstruckOrder;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -80,4 +81,6 @@ public interface OmstruckOrderSeparateMapper {
 
     //查询订单发货日期（订单类型为2）
     Integer getDeliveryDate(Object orderId);
+
+    int updateTimes(@Param("orderPlanId") BigDecimal orderPlanId, @Param("times")int times);
 }

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -2,6 +2,7 @@ package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.OmstruckOrder;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -18,7 +19,12 @@ public interface IOmstruckOrderSeparateService {
     //根据运输订单id修改运力id
     int updateOmstruckOrder(OmstruckOrder omstruckOrder);
 
+
     List<Map<String,Object>> getUnloadOrderMaterial(Map<String, Object> map);
+
     // 承运商销售分派运输订单给司机
     Integer addSaleTruckOrder(Map<String, Object> mapValue);
+
+    //更改趟次
+    int updateTimes(BigDecimal orderPlanId, int i);
 }

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

@@ -404,4 +404,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public List<Map<String, Object>> getCapacityAllOrder(String capacityNumber){
         return omstruckOrderSeparateMapper.getCapacityAllOrder(capacityNumber);
     }
+
+
+    @Override
+    public int updateTimes(BigDecimal orderPlanId, int times) {
+         return omstruckOrderSeparateMapper.updateTimes(orderPlanId,times);
+       }
 }

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

@@ -545,12 +545,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     @Override
     @Transactional
-    public int driverReceiveOrRefuse(Map<String, Object> map) {
+    public  synchronized int driverReceiveOrRefuse(Map<String, Object> map) {
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
-        if((Integer) map.get("orderReceiveStatus") == 1){
+        if((Integer) map.get("orderReceiveStatus") == 1) {
             List<Integer> orderIdList = omstruckOrderMapper.getReceiveOrderIdListByCapacityNum((String) map.get("capacityNumber"));
-            if(orderIdList.size() > 0){
+            if (orderIdList.size() > 0) {
                 return 0;
             }
             omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
@@ -558,7 +558,19 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
             //添加各个实绩
             omstruckOrderSeparateService.addAllSonResult(orderMessage);
-        }else { //其他状态都视为 拒绝接单
+
+            //判断订单是否是一车多单
+            BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
+            if (orderType.intValue()==15 || orderType.intValue()==16) {
+                //通过订单查询趟次
+                Integer sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
+                //生成作业实绩之后、更改订单数量
+                if (orderMessage.containsKey("orderPlanId") && sporadicOrderTimes > 0) {
+                    int state = omstruckOrderSeparateService.updateTimes(new BigDecimal(orderMessage.get("orderPlanId").toString()), sporadicOrderTimes - 1);
+                    System.out.println(state);
+                }
+            }
+        } else { //其他状态都视为 拒绝接单
             omstruckOrder.setOrderStatus(new BigDecimal(6));
             //添加拒绝原因
             omstruckOrder.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-DEV

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: DAL-OMS-API-PROD

src/main/resources/bootstrap.yml

@@ -49,9 +49,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.108:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:192.168.1.108:8079}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
 

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

@@ -2972,4 +2972,12 @@
             on RL.LINE_ID = OO.LINE_ID
         where OO.ORDER_ID = #{orderId}
     </select>
+
+
+    <select id="getSporadicOrderTimes" resultType="java.lang.Integer">
+           select aso.sporadic_order_times from OMSTRUCK_ORDER oo
+           left join  AMSTRUCK_SPORADIC_ORDER  aso
+           on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+           where oo.order_id= #{orderId}
+    </select>
 </mapper>

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

@@ -496,4 +496,10 @@
           and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
     </select>
 
+ <!--    修改运输订单趟次-->
+     <update id="updateTimes">
+          update AMSTRUCK_SPORADIC_ORDER  set sporadic_order_times =#{times}
+          where sporadic_order_id= #{orderPlanId}
+      </update>
+
 </mapper>