productDev/jinkuai.git

			@@ -76,6 +76,12 @@
			public static final String WORKORDER_LOG_FILE_PATH ="WORKORDER_LOG_FILE_PATH" ;

			public static final String REDIS_TOKEN_KEY = "token_";

			public static final String SUCCESS = "SUCCESS";
			public static final String FAIL = "FAIL";
			public static final String CANCELLED = "CANCELLED";


			public interface uploadType{
			String blob = "blob";
			String ftp = "ftp";
			@@ -136,6 +142,12 @@
			d = 0L;
			}
			return d.longValue();
			}
			public static BigDecimal formatBigDecimal(BigDecimal d) {
			if (d == null) {
			new BigDecimal(0);
			}
			return d;
			}

			/**
			@@ -433,6 +445,8 @@
			AUTO_COMMENT(13, "系统-自动评价","超出7日未评价，系统已自动评价",2),
			AUTO_AGREE(14, "系统-自动同意","接单方超时未处理，已自动同意",2),

			FEE_CONFIRM(15, "接单方-确认费用","{userName}已确认费用",1),

			;
			// 成员变量
			private String name;
			@@ -552,6 +566,7 @@
			accept(2, "已接单"),
			doing(3, "进行中"),
			done(4, "已完成"),
			feeconfirm(5, "已确认费用"),
			cancel(99, "已取消"),
			;
			// 成员变量
			@@ -641,7 +656,7 @@


			public enum smsContent {
			accept(0, "SMS_491325122","您的{order}订单已被接单！时间：{time1}-{time2}，接单方：{name}。"),
			accept(0, "SMS_491325122","您的{order}订单已被接单！时间：{time1}-{time2}，可进入小程序联系接单方。"),
			receiveCancel(1, "SMS_491055243","您的{order}订单，时间：{time1}-{time2}，已被接单方取消，订单已重新进入接单大厅。"),
			platformCancel(2, "SMS_491375152","您的{order}订单，时间：{time1}-{time2},已由平台取消。如有疑问请联系客服。"),
			agreeUpd(3, "SMS_491190259","接单方已同意您将{order}的订单时间修改为{time1}至{time2}。"),