das

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

@@ -800,10 +800,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderId", value = "运单主键", required = false, dataType = "Integer"),
     })
     @PostMapping("/closeOmstruckOrder")
-    public RESTfulResult closeOmstruckOrder(@RequestParam Integer orderId) {
+    public RESTfulResult closeOmstruckOrder(@RequestBody Map<String,Object> map) {
         int result = 0;
         try {
-            result = omstruckOrderService.closeOmstruckOrder(new BigDecimal(orderId));
+            result = omstruckOrderService.closeOmstruckOrder(map);
         } catch (Exception e) {
             return failed(e.getMessage());
         }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.OmstruckOrder;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -143,7 +144,7 @@ public interface IOmstruckOrderService {
     int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber,Integer carrierId);
 
     // 根据运单id关闭订单
-    int closeOmstruckOrder(BigDecimal orderId) throws Exception;
+    int closeOmstruckOrder( Map<String,Object> map) throws Exception;
 
     // 查询所有车牌号和司机
     List<Map<String, Object>> getCapacityAndDriverList(Map<String, Object> mapValue);

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

@@ -17,7 +17,9 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -1519,17 +1521,22 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 
     /**
      * 根据运单id关闭订单
-     * @param orderId
+     * @param map
      * @return
      */
     @Override
-    public int closeOmstruckOrder(BigDecimal orderId) throws Exception {
+    public int closeOmstruckOrder(Map<String,Object> map) throws Exception {
+        //获取订单id
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        String operationUserId = (String) map.get("userId");
         BigDecimal i = omstruckOrderSeparateMapper.getWeightTask(orderId);
         if(i != null){
             throw new Exception("存在计量实绩,无法删除");
         }
         OmstruckOrder omstruckOrder = omstruckOrderMapper.selectByPrimaryKey(orderId);
         omstruckOrder.setOrderStatus(new BigDecimal(7));
+        omstruckOrder.setInsertUpdateRemark("用户:" + operationUserId + "操作删除");
+        omstruckOrder.setUpdateTime(new Date());
         int result = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         return result;
     }