浏览代码

终止判断

guoyong 4 年之前
父节点
当前提交
824b560276

+ 0 - 49
src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -38,65 +38,16 @@ public enum ErrCodeEnum {
      */
     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, "调用通联出错"),

+ 1 - 1
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 = "运单号")

+ 1 - 1
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 = "中止原因")

+ 1 - 1
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;