Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -18,228 +18,17 @@ public enum ErrCodeEnum {
      */
     CLOSED_ORDER(2223, "运单已终止"),
     /**
-     * token无效
-     */
-    TOKEN_ERROR(2001, "token无效"),
-    /**
      * 系统配置错误
      */
     BAD_SYSTEM_CONFIG(2003, "系统配置错误，请联系客服人员"),
     /**
-     * orgId
-     */
-    BAD_ORG_ID_PARAM(2002, "找不到对应的企业信息！"),
-    /**
-     * 参数错误
-     */
-    ORDER_UPDATE_ERROR(2003, "更新运单失败"),
-    /**
-     * 获取openid失败
-     */
-    OPENID_ERROR(2010, "获取openid失败"),
-    /**
-     * 微信统一下单失败
-     */
-    UNIFIEDORDER_ERROR(2011, "微信统一下单失败"),
-    /**
-     * 微信统一下单失败返回信息
-     */
-    WX_ORDER_ERROR(2012, "下单失败"),
-    /**
-     * 尚未实名认证
-     */
-    USER_NOT_AUTH_ERROR(3006, "尚未实名认证"),
-    /**
-     * 实名认证通过
-     */
-    USER_AUTH_PASSED(0, "实名认证成功"),
-    /**
-     * 已签协议
-     */
-    USER_CONTRACT_DONE(0, "已签协议"),
-    /**
-     * 会员账号信息不存在
-     */
-    TSY_NOT_EXIST_ERROR(3009, "信息不存在"),
-
-    /**
-     * 消费余额不足提示
-     */
-    BALANCE_NOT_ENOUGH(3010, "账户余额不足"),
-
-    /**
-     * 提现限额不足提示
-     */
-    WITHDRAW_QUOTA_NOT_ENOUGH(3017, "为保证业务正常进行，请确保提现后账户余额大于"),
-
-    /**
-     * 绑定openid失败
-     */
-    BIND_OPENID_FAIL(3011, "绑定openid失败"),
-
-    /**
-     * 注册用户失败
-     */
-    CREATE_MEMBER_FAIL(3016, "注册用户失败"),
-    /**
-     * 校验码错误
-     */
-    BAD_VERIFY_CODE(3012, "校验码错误"),
-
-    /**
-     * 获取签约协议失败
-     */
-    GET_SIGN_CONTRACT_CODE(3013, "获取签约协议失败"),
-
-    /**
-     * 调用通联出错
-     */
-    ALLINPAY_RESPONSE_NULL(3014, "调用通联返回空"),
-
-    /**
-     * 调用通联出错
-     */
-    ALLINPAY_ERROR(3015, "调用通联出错"),
-
-    /**
-     * 支付成功判断
-     */
-    GASORDER_PAY_SUCCESS(3018, "订单已支付，请不要重复支付"),
-
-    /**
-     * 大象平台支付失败
-     */
-    GASORDER_PAY_FAIL(3019, "大象平台支付失败，请联系客服人员"),
-
-    /**
-     * 下载电子回单失败
-     */
-    DOWNLOAD_WITHDRAW_RECEIPT_ERROR(3016, "下载电子回单失败"),
-
-    /**
-     * 下载电子回单失败
-     */
-    COM_PAY_TRANSFER_ERROR(3020, "组合支付，物流公司余额不足"),
-    /**
-     * 数据库错误
-     */
-    DB_PARAM(2201, "数据库错误！"),
-    /**
-     * 远程请求错误
-     */
-    REMOTE_PARAM(2202, "远程请求错误"),
-    /**
-     * 非法服务费率
-     */
-    INVALID_FREE(2210, "非法服务费率"),
-    /**
-     * 非法气价
-     */
-    INVALID_PRICE(2211, "非法气价"),
-    /**
      * 非法卡车
      */
     INVALID_TRUCK(2212, "非法卡车"),
     /**
-     * 非法加气站
-     */
-    INVALID_GASSTATION(2213, "非法加气站"),
-    /**
-     * 非法订单
-     */
-    INVALID_ORDER(2214, "非法订单"),
-    /**
-     * 司机和订单不匹配
-     */
-    NO_RELATION(2215, "司机和订单不匹配"),
-    /**
-     * 账户余额不足
-     */
-    NO_ENOUGH_MONEY(2216, "账户余额不足"),
-    /**
-     * 自动划账失败
-     */
-    AUTO_TRANSFER_FAIL(2217, "自动划账失败"),
-    /**
-     * 支付失败
-     */
-    PAY_FAIL(2218, "支付失败"),
-    /**
      * 订单状态不对
      */
     ORDER_STATUS_ERROR(2219, "订单状态不对"),
-    /**
-     * 审批人不对
-     */
-    ORDER_AUDIT_ERROR(2220, "审批人不对"),
-    /**
-     * 非法金额
-     */
-    INVALID_AMOUNT(2221, "非法金额"),
-    /**
-     * 卡车有未支付订单
-     */
-    UNPAY_ORDER(2222, "卡车有未支付订单"),
-
-    /**
-     * 订单已支付
-     */
-    PAY_ORDER(2224, "订单已支付"),
-    /**
-     * 卡车不属于该企业
-     */
-    INVALID_TRUCK_ORG(2225, "卡车不属于该企业"),
-
-    /**
-     * 收银员与加气站绑定关系异常
-     */
-    CASHIER_GASSTATION_ERROR(2226, "收银员与加气站绑定关系异常"),
-
-    /**
-     * 卡车与司机绑定关系异常
-     */
-    DRIVER_TRUCK_ERROR(2227, "卡车与司机绑定关系异常"),
-    /**
-     * 平台结算价格异常，小于等于0
-     */
-    PLATFORM_PRICE_ERROR(2228, "平台结算价格异常，小于等于0"),
-
-    /**
-     * 实际结算价格异常，小于等于0
-     */
-    ACTUAL_PRICE_ERROR(2229, "实际结算价格异常，小于等于0"),
-
-    /**
-     * 圈存金额需大于0
-     */
-    TRANSFER_AMOUNT_ERROR(2230, "圈存金额需大于0"),
-
-    /**
-     * 卡车已停用
-     */
-    TRUCK_IS_STOP(2231, "卡车已停用"),
-
-    /**
-     * 用户已停用
-     */
-    CASHIER_IS_STOP(2232, "收银员已停用"),
-    /**
-     * 司机已停用
-     */
-    DRIVER_IS_STOP(2233, "司机已停用"),
-    /**
-     * 订单价格计算错误
-     */
-    ORDER_SUM_ERROR(2234, "订单金额计算出错"),
-
-    /**
-     * 加气站没有通过认证
-     */
-    GASSTATION_UNAUTH(2235, "加气站没有认证"),
-    /**
-     * 物流公司没有通过认证
-     */
-    CARRIER_UNAUTH(2236, "物流公司没有认证"),
 
     /**
      * 用户不存在
@@ -256,76 +45,9 @@ public enum ErrCodeEnum {
      */
     GET_USER_FAIL(2239, "获取用户信息失败"),
 
-    /**
-     * 企业账户不匹配
-     */
-    ORG_ACCOUNT_ID_IS_WRONG(2239, "企业账户不匹配"),
-
-    /**
-     * 银行卡错误，查无此卡
-     */
-    BANK_CAR_NUMBER_IS_ERROR(2240, "银行卡错误，查无此卡"),
-
-    /**
-     * 申请绑卡失败，请联系运营人员
-     */
-    APPYL_BINK_CARD_FAIL_ERROR(2241, "申请绑卡失败，请联系运营人员"),
-    /**
-     * 确认绑卡失败，请联系运营人员
-     */
-    BINK_CARD_FAIL_ERROR(2242, "确认绑卡失败，请联系运营人员"),
-
-    /**
-     * 解绑银行卡失败，请联系运营人员
-     */
-    UNBINK_CARD_FAIL_ERROR(2243, "解绑银行卡失败，请联系管理员"),
-
-    /**
-     * 查询绑定银行卡失败，请联系运营人员
-     */
-    QUERY_BINK_CARD_FAIL_ERROR(2244, "解绑银行卡失败，请联系管理员"),
-
-    /**
-     * 查询订单是否已经完成返现失败, 请稍后再试
-     */
-    GAS_ORDER_CASHBACK_CHECK_ERROR(2301, "查询订单是否已经完成失败, 请稍后再试"),
-
-    /**
-     * 此订单已完成返现，不能再次返现了
-     */
-    GAS_ORDER_HAS_CASHBACK(2302, "此订单已完成返现，不能再次返现了"),
-
-    /**
-     * 查询营销组织信息失败
-     */
-    QUERY_MARKETING_ORG_ERROR(2303, "查询营销组织信息失败"),
-
-    /**
-     * 查询默认组织信息失败
-     */
-    QUERY_DEFAULT_ORG_ERROR(2304, "查询默认组织信息失败"),
-
-    /**
-     * 返现转账失败
-     */
-    CASHBACK_TRANSFER_ACCOUNT_ERROR(2305, "返现转账失败"),
-
-    /**
-     * 严重错误：散户首次消费返现，通联账户已划账完成，大象加气本地划账失败
-     */
-    CASHBACK_TRANSFER_ACCOUNT_ERROR_2(2306, "本地资金账户返现失败，请联系运营处理"),
 
     USERSERVER_ERROR(3301, "进入USER熔断"), USER_ADD_ERROR(2323, "新增司机失败"), DRIVER_MODIFY_FAIL(2323, "修改司机信息失败"),
 
-    /**
-     * 直销模式的卡车不能在经销模式加气站加气
-     */
-    DIRECT_TRUCK_CAN_NOT_GAS_IN_NODIRECTGASSTATION(2307, "该车辆已参加‘直销加气’，请在 直销加气站 加气 ！"),
-
-    /**
-     * 直销模式充值限额
-     */
-    DIRECT_RECHARGE_LIMIT(2308, "低于直销模式最小充值限额"),
 
     /**
      * 该部门下面存在卡车

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.common.TmsTruckStatus;
 import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.controller.param.UpSignParam;
 import com.aoyang.tms.controller.vo.LocationVO;
@@ -61,6 +62,8 @@ public class WorkerController {
     private WorkCycleService workCycleService;
     @Resource
     private TruckRepairInfoService truckRepairInfoService;
+    @Resource
+    private TruckService truckService;
 
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
@@ -327,12 +330,6 @@ public class WorkerController {
         if (truckCheckInfo == null || truckCheckInfo.getType() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        if(truckCheckInfo.getOrderId()!=null) {
-            WorkOrder workOrderCheck = workOrderService.getById(truckCheckInfo.getOrderId());
-            if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
-                return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
-            }
-        }
 
         //1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
 
@@ -364,6 +361,24 @@ public class WorkerController {
         } catch (UnsupportedEncodingException ignored) {
         }
 
+        //1.车辆进入出车前检车状态
+        Truck truck = truckService.getById(workOrder.getTruckId());
+        truck.setTmsStatus(TmsTruckStatus.WORKING);
+        truckService.updateById(truck);
+        //2.插入车辆检查数据
+        BeanUtils.copyProperties(workOrder, truckCheckInfo);
+        truckCheckInfo.setCreater(userId);
+        truckCheckInfo.setCreaterName(userName);
+        truckCheckInfo.setCreateDate(LocalDateTime.now());
+        truckCheckInfoService.save(truckCheckInfo);
+
+        if(truckCheckInfo.getOrderId()!=null) {
+            WorkOrder workOrderCheck = workOrderService.getById(truckCheckInfo.getOrderId());
+            if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
+                return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
+            }
+        }
+
         Boolean flag = workerService.starWork(userId, utf8Name, truckCheckInfo);
         return new Result<>(flag);
     }

src/main/java/com/aoyang/tms/controller/vo/AddWorkOrderVO.java

@@ -32,7 +32,7 @@ public class AddWorkOrderVO implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private String truckIds;
 
-    @ApiModelProperty(value = "运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已报废60")
+    @ApiModelProperty(value = "运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已中止60")
     private Integer orderStatus;
 
     @ApiModelProperty(value = "运单号")

src/main/java/com/aoyang/tms/controller/vo/WorkOrderPageListVO.java

@@ -47,7 +47,7 @@ public class WorkOrderPageListVO {
     @ApiModelProperty(value = "已读未读信息")
     private List<ReadInfo> readInfos;
 
-    @ApiModelProperty(value = "（操作可能需要此状态）运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已报废60")
+    @ApiModelProperty(value = "（操作可能需要此状态）运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已中止60")
     private Integer orderStatus;
 
     @ApiModelProperty(value = "中止原因")

src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -40,7 +40,7 @@ public class WorkOrder implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long cycleId;
 
-    @ApiModelProperty(value = "运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已报废60")
+    @ApiModelProperty(value = "运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已中止60")
     @TableField("order_status")
     private Integer orderStatus;
 

src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -163,9 +163,9 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
             log.info("workLogTplVO is null:{}");
             return null;
         }
-        byte driverOneSignUrl[] = getImageBytes(workLogTplVO.getWorkCycle().getDriverOneSignUrl());
-        byte driverTwoSignUrl[] = getImageBytes(workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
-        byte escortSignUrl[] = getImageBytes(workLogTplVO.getWorkCycle().getEscortSignUrl());
+        byte driverOneSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getDriverOneSignUrl());
+        byte driverTwoSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getDriverTwoSignUrl());
+        byte escortSignUrl[] = getImageBytes("https://dwx.auyen.com/" + workLogTplVO.getWorkCycle().getEscortSignUrl());
 
         // 获取模板文件
         String tplfileName = "work_log_tpl.xlsx";

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -277,6 +277,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         if (workOrderParam.getTrailerNumber() != null) {
             queryWrapper.like("trailer_number", workOrderParam.getTrailerNumber());
         }
+        if (workOrderParam.getOrderStatus() != null) {
+            queryWrapper.eq("order_status", workOrderParam.getOrderStatus());
+        }
 
         if (workOrderParam.getShipperName() != null) {
             queryWrapper.like("shipper_name", workOrderParam.getShipperName());

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -134,16 +134,6 @@ public class WorkerServiceImpl implements WorkerService {
         try {
             WorkOrder workOrder = workOrderService.getById(truckCheckInfo.getOrderId());
             if (workOrder != null) {
-                //1.车辆进入出车前检车状态
-                Truck truck = truckService.getById(workOrder.getTruckId());
-                truck.setTmsStatus(TmsTruckStatus.WORKING);
-                truckService.updateById(truck);
-                //2.插入车辆检查数据
-                BeanUtils.copyProperties(workOrder, truckCheckInfo);
-                truckCheckInfo.setCreater(userId);
-                truckCheckInfo.setCreaterName(userName);
-                truckCheckInfo.setCreateDate(LocalDateTime.now());
-                truckCheckInfoService.save(truckCheckInfo);
                 //3.更新订单,更新前往装车点时间
                 workOrder.setGotoSpotTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);