Quellcode durchsuchen

更新运单接口

guoyong vor 4 Jahren
Ursprung
Commit
8f4560644f

+ 1 - 29
src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -28,7 +28,7 @@ public enum ErrCodeEnum {
     /**
      * 参数错误
      */
-    ORG_UPDATE_ERROR(2003, "操作成功,更新组织信息错误!"),
+    ORDER_UPDATE_ERROR(2003, "更新运单失败"),
     /**
      * 获取openid失败
      */
@@ -42,34 +42,6 @@ public enum ErrCodeEnum {
      */
     WX_ORDER_ERROR(2012, "下单失败"),
     /**
-     * 加气订单支付中
-     */
-    GAS_ORDER_PAYING(2013, "订单支付中"),
-    /**
-     * 调用通商云失败
-     */
-    TSY_METHOD_ERROR(3000, "调用通商云失败"),
-    /**
-     * 通商云失败返回信息
-     */
-    TSY_ERROR(3001, "实名认证失败"),
-    /**
-     * 通商云认证中返回信息
-     */
-    TSY_AUTH_WAITING(0, "认证信息提交成功,正在认证中"),
-    /**
-     * 获取企业账号失败
-     */
-    USER_ACCOUNT_ERROR(3003, "获取账号失败"),
-    /**
-     * 通商云绑定电话
-     */
-    TSY_PHONE_BIND_ERROR(3004, "绑定电话失败"),
-    /**
-     * 获取企业账号失败
-     */
-    USER_NOT_CREATE_ERROR(3005, "尚未创建账号"),
-    /**
      * 尚未实名认证
      */
     USER_NOT_AUTH_ERROR(3006, "尚未实名认证"),

+ 6 - 2
src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -80,7 +80,11 @@ public class WorkerController {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         Boolean flag = workOrderService.saveOrUpdate(workOrder);
-        return new Result<>(flag);
+        if (flag) {
+            WorkOrder workOrderUpdate = workOrderService.getById(workOrder.getId());
+            return new Result<>(workOrderUpdate);
+        }
+        return new Result(ErrCodeEnum.ORDER_UPDATE_ERROR.getCode(), ErrCodeEnum.ORDER_UPDATE_ERROR.getMessage());
     }
 
     @ApiOperation(value = "运单列表", notes = "卡车id必传,未完成的(待执行、前往、等待、成果报备中)运单")
@@ -98,7 +102,7 @@ public class WorkerController {
     @ApiOperation(value = "当前行车周期内运单列表", notes = "卡车id必传,当前行车周期内运单列表")
     @PostMapping("/find_cycle_order_list")
     public Result<List<WorkOrderVO>> findCycleOrderList(@RequestHeader(value = "orgId") Long orgId,
-                                                       @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
+                                                        @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
         log.info("当前行车周期内运单列表,/tms/worker/find_cycle_order_list,参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getTruckId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());