”修改零星退货“

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

@@ -319,7 +319,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return null;
     }
 
-    @ApiOperation(value = "司机接收、拒绝接单")
+    @ApiOperation(value = "司u机接收、拒绝接单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),

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

@@ -547,13 +547,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         addMapSporadicOrder.put("mapList",mapList);
         switch (orderType) {
             case 13:
+            case 19:
             case 12:
-            case 20:
                 if (transStatus.intValue()==1){
                     amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
                 }
                 break;
-            //内转零星
+            //普通零星
             case  15:
             case  16:
                 if (sporadicOrderTimes.intValue() > 0) {
@@ -609,6 +609,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 //            case 13:
 //            case 20:
             case 15:
+            case 19:
             case 16:
                     Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(new BigDecimal(orderId));
                     BigDecimal orderTimes =(BigDecimal)sporadicOrderTimes.get("orderTimes");
@@ -826,7 +827,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
             }
             //判断订单是否是一车多单
-            if (orderType.intValue()==15 || orderType.intValue()==16 ) {
+            if (orderType.intValue()==15 || orderType.intValue()==16 || orderType.intValue()==19) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 BigDecimal orderTimes = DataChange.dataToBigDecimal(sporadicOrderTimes.get("orderTimes"));
@@ -1915,6 +1916,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public Map<String, Object> getMessageToApp(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         Integer orderType;
+        String type="";
         //获取订单类型
         if(map.get("orderType") == null){
             orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
@@ -1962,6 +1964,15 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 15:
             case 16:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
+                break;
+            case 19:
+                 mesMap=omstruckOrderMapper.getSporadicOrder(map);
+                 if (orderType==19) {
+                     type += "零星退货";
+                     mesMap.put("type", type);
+                 }
+
+
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
 

src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}