修改

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

@@ -4,6 +4,7 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
 import com.steerinfo.dil.service.impl.BackgroundProcessingServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,8 +94,10 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @PostMapping("updateOrderStatus")
     public RESTfulResult updateOrderStatus(@RequestBody(required = false) Map<String,Object> map){
         if(map.get("orderNumber") != null){
-            int i = backgroundProcessingMapper.updateOrderStatus(map);
-            return success(i);
+            if(DataChange.dataToBigDecimal(map.get("orderStatus")).intValue() != 2) {
+                int i = backgroundProcessingMapper.updateOrderStatus(map);
+                return success(i);
+            }
         }
         return failed(0);
     }

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

@@ -209,7 +209,8 @@
     </update>
     <update id="updateOrderStatus" parameterType="java.util.Map">
         update OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = #{orderStatus}
+        SET OO.ORDER_STATUS = #{orderStatus},
+            OO.INSERT_UPDATE_REMARK = '管理员操作修改状态'
         WHERE OO.ORDER_NUMBER = #{orderNumber}
     </update>
 </mapper>

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

@@ -1432,7 +1432,8 @@
 
     <update id="updateStatusTwo">
         update OMSTRUCK_ORDER OO
-        set OO.ORDER_STATUS=2
+        set OO.ORDER_STATUS=2,
+            OO.INSERT_UPDATE_REMARK = '八点完成订单'
         WHERE OO.ORDER_ID=#{orderId}
     </update>