辅料退货

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

@@ -44,7 +44,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     IMFeign imFeign;
 
     //通过线路子表路线图生成各实绩
-    public int addAllSonResult(Integer resultTotalId, Integer lineId){
+    public int addAllSonResult(Map<String, Object> map){
+        Integer resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId")).intValue();
+        Integer lineId = DataChange.dataToBigDecimal(map.get("lineId")).intValue();
         int result = 0;
         //通过总实绩Id 查询关联的线路子表顺序
         List<Map<String, Object>> segmentList = omstruckOrderSeparateMapper.getLineMesByOrderId(lineId);
@@ -121,6 +123,8 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             }
             // 退货
             if (linkName.equals("退货")) {
+                totalIdMap.put("returnReason", map.get("returnReason")); //退货原因 仅退货有用
+                totalIdMap.put("orderId", map.get("orderId")); //添加新订单ID
                 tmsTruckFeign.addReturnGoodsResult(totalIdMap);
                 result++;
             }
@@ -134,6 +138,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
      * @param map
      * @return
      */
+    @Transactional
     public int returnOrderCloseOrder(Map<String, Object> map){
         //通过运输订单ID关闭运输订单(修改状态为退货关闭：9)
         map.put("orderStatus", 9);
@@ -152,7 +157,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         omstruckOrder.setOrderType(DataChange.dataToBigDecimal(orderMessaggeMap.get("orderType")));
         omstruckOrder.setLineId(DataChange.dataToBigDecimal(map.get("lineId")));
         omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(orderMessaggeMap.get("orderPlanId")));
-        omstruckOrder.setOrderStatus(new BigDecimal(1)); //执行中
+        omstruckOrder.setOrderStatus(new BigDecimal(5)); //执行中(已接收)
         omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(orderMessaggeMap.get("capacityId")));
         omstruckOrder.setOrderNumber(orderMessaggeMap.get("orderNumber") + "-1");
         omstruckOrder.setOrderIssueTime(new Date());
@@ -168,12 +173,12 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         //添加总实绩
         Integer totalId = tmsTruckFeign.addTotalResult(mesMap);
         // 添加各种实绩
-        int result = addAllSonResult(totalId, (Integer) map.get("lineId"));
+        mesMap.put("resultTotalId", totalId);
+        mesMap.put("lineId", map.get("lineId"));
+        mesMap.put("returnReason", map.get("returnResult"));
+        int result = addAllSonResult(mesMap);
         // 推送消息给司机
-        Map<String, Object> newMap = new HashMap<>();
-        newMap.put("orderId",orderId);
-        newMap.put("newOrderId",newOrderId);
-        pushMesToWebsocket(newMap);
+        pushMesToWebsocket(mesMap);
         return result;
     }
 
@@ -184,18 +189,12 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
      */
     public String pushMesToWebsocket(Map<String, Object> map) {
         Map<String, Object> mesMap = omstruckOrderMapper.pushMesToWebsocket(map);
-        BigDecimal newOrderId = (BigDecimal) map.get("newOrderId");
-        if (newOrderId != null) {
-            String orderNumber = (String) mesMap.get("orderNumber");
-            String newOrderNumber = orderNumber + "-1";
-            mesMap.put("orderNumber",newOrderNumber);
-        }
         //添加消息实体
         HashMap<Object, Object> mapp = new HashMap<>();
         mapp.put("messageType", 3);
         mapp.put("sendPerson", "system");
         mapp.put("receivePerson", mesMap.get("capacityNumber"));
-        mapp.put("messageContent", mesMap);
+        mapp.put("messageContent",(String) mesMap.get("orderNumber") + new Date());
         mapp.put("createTime", new Date());
         ArrayList<Object> list = new ArrayList<>();
         list.add(mapp);

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

@@ -545,9 +545,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             //添加各个实绩
             //通过订单ID查询信息
             Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
-            BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMessage.get("resultTotalId"));
-            BigDecimal lineId = DataChange.dataToBigDecimal(orderMessage.get("lineId"));
-            omstruckOrderSeparateService.addAllSonResult(resultTotalId.intValue(), lineId.intValue());
+            omstruckOrderSeparateService.addAllSonResult(orderMessage);
         }else { //其他状态都视为 拒绝接单
             omstruckOrder.setOrderStatus(new BigDecimal(6));
             //添加拒绝原因