productDev/gtzxinglijicun.git

			@@ -82,6 +82,8 @@
			public static final String OP_INSURANCE_RATE = "INSURANCE_RATE";
			public static final String OP_ORDER_ACCEPT_LIMIT = "ORDER_ACCEPT_LIMIT";
			public static final String OP_AUTO_CONFIRM_RECEIPT = "AUTO_CONFIRM_RECEIPT";
			public static final String OP_NO_GRAB_NOTIFY_TIME = "NO_GRAB_NOTIFY_TIME";
			public static final String OP_NO_GRAB_NOTIFY_USERS = "NO_GRAB_NOTIFY_USERS";
			public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
			public static boolean DEALING_COMPANY_SYNC = false ;
			public static boolean DEALING_MEMBER_SYNC = false ;
			@@ -298,8 +300,8 @@
			LABOR_CONTRACT(11, "有效劳动合同"),
			ORDER_FILE(12,"下单图片"),
			STORE_OUT(13,"门店出库图片"),
			REFUND_TAKE(14,"退款取件图片")

			REFUND_TAKE(14,"退款取件图片"),
			COMMENT_ATTACH(15,"评价附件图片")
			;

			private final int key;
			@@ -350,9 +352,6 @@
			arrived(5, "已到店/已送达/待取件"),
			overdue(6, "存在逾期"), //弃用
			finished(7, "已完成"),
			closed(96, "订单关闭（退款）"),
			cancelOverdue(97, "取消逾期"), //弃用
			cancelling(98, "取消中"),
			cancelled(99, "已取消")
			;
			private final int status;
			@@ -398,7 +397,7 @@
			waitDeliver(2, "待配送", new int[]{OrderStatus.accepted.status}),
			waitReceive(3, "待收货", new int[]{ OrderStatus.delivering.status, OrderStatus.arrived.status}),
			finished(4, "已完成", new int[]{OrderStatus.finished.status}),
			refund(5, "退款", new int[]{OrderStatus.closed.status, OrderStatus.cancelling.status}),
			refund(5, "退款", new int[]{OrderStatus.cancelled.status}),
			home(6, "首页查询", new int[]{OrderStatus.waitPay.status, OrderStatus.waitDeposit.status, OrderStatus.deposited.status
			, OrderStatus.accepted.status, OrderStatus.delivering.status, OrderStatus.arrived.status})
			;
			@@ -458,8 +457,8 @@
			WAIT_PAY("waitPay", "订单待支付", "您的行李订单：{orderNo}已创建，请在{timeout}分钟内完成支付，超时将自动取消"),
			WAIT_VERIFY("waitVerify", "订单待核验", "您的行李订单：{orderNo}已提交，等待门店核验物品信息，存件码{storeCode}"),
			WAIT_GRAB("waitGrab", "订单待抢单", "您的行李订单：{orderNo}已核验，正在为您安排取件司机"),
			WAIT_PICKUP_REMIND("waitPickupRemind", "订单待取件", "订单{orderNo}行李已寄存，请记得在预约取件时间凭取件码前往指定门店取回"),
			WAIT_PICKUP_GRABBED("waitPickupGrabbed", "订单已抢单", "您的行李订单：已有司机{driverName}抢单，正前往取件地点"),
			WAIT_PICKUP_REMIND("waitPickupRemind", "订单待取件", "您的行李订单：{orderNo}已寄存，请记得在预约取件时间凭取件码前往{shopName}门店取回"),
			WAIT_PICKUP_GRABBED("waitPickupGrabbed", "订单已抢单", "您的行李订单：{orderNo}已有司机{driverName}抢单，正前往取件地点"),
			DELIVERING("delivering", "订单配送中", "您的行李订单：{orderNo}已由司机{driverName}取件，正运往目的地"),
			ARRIVED_NO_SHOP("arrivedNoShop", "订单已送达", "您的行李订单：{orderNo}已送达{destination},请及时确认收货"),
			ARRIVED_HAS_SHOP("arrivedHasShop", "订单已送达", "您的行李订单：{orderNo}已送达{destination},请及时取件，取件码{pickupCode}"),
			@@ -500,7 +499,7 @@
			WAIT_PICKUP("waitPickup", "订单待取件", "行李订单：{orderNo}已抢单，等待{name}取件"),
			REFUNDING("refunding", "订单退款中", "行李订单：{orderNo}用户提交退款申请，请知悉"),
			DELIVERING("delivering", "订单配送中", "行李订单：{orderNo}已由司机{driverName}取件，正在配送中"),
			ARRIVED("arrived", "已送达", "行李订单：{orderNo}已送达{destination},请联系用户确认签收"),
			ARRIVED("arrived", "订单已送达", "行李订单：{orderNo}已送达{destination},请联系用户确认签收"),
			FINISHED("finished", "订单已完成", "行李订单：{orderNo}已完成，相关订单结算会在{settleDays}个工作日内完成"),
			EVALUATED("evaluated", "订单已评价", "行李订单：{orderNo}用户已完成评价，可查看评价内容"),
			SETTLED("settled", "订单结算", "行李订单：{orderNo}平台已完成结算，金额为{amount}元，请注意查收。")
			@@ -531,12 +530,12 @@
			@Getter
			@AllArgsConstructor
			public enum DriverOrderNotify {
			WAIT_DELIVER("waitDeliver", "订单待配送", "您已抢单成功，订单：{orderNo}请按时到{shopName}取件"),
			DELIVERING("delivering", "配送中", "行李订单：{orderNo}已取件，正在配送中，请按时送达"),
			ARRIVED("arrived", "已送达", "行李订单：{orderNo}已送达{destination},请联系用户确认签收"),
			WAIT_DELIVER("waitDeliver", "订单待配送", "您已抢单成功，行李订单：{orderNo}请按时到{shopName}取件"),
			DELIVERING("delivering", "订单配送中", "行李订单：{orderNo}已取件，正在配送中，请按时送达"),
			ARRIVED("arrived", "订单已送达", "行李订单：{orderNo}已送达{destination},请联系用户确认签收"),
			FINISHED("finished", "订单已完成", "行李订单：{orderNo}已完成，相关订单结算会在{settleDays}个工作日内结算"),
			EVALUATED("evaluated", "订单已评价", "行李订单：{orderNo}用户已完成评价，可前往订单查看评价内容"),
			REFUNDING("refunding", "退款中", "行李订单：{orderNo}用户已提交退款申请，该订单任务已取消，请勿前往。"),
			REFUNDING("refunding", "订单退款中", "行李订单：{orderNo}用户已提交退款申请，该订单任务已取消，请勿前往。"),
			SETTLED("settled", "订单已结算", "行李订单：{orderNo}平台已完成结算，金额为{amount}元，请注意查收。"),
			CANCELLED("cancelled", "订单取消成功", "行李订单：{orderNo}已帮您取消，您今日还可主动取消{cancelLimit}次订单，请合理安排接单。")
			;
			@@ -559,6 +558,39 @@
			}

			/**
			* 短信通知模板枚举
			* templateCode: 阿里云短信模板Code
			* content: 短信文案模板，占位符用 {xxx} 表示
			*/
			@Getter
			@AllArgsConstructor
			public enum SmsNotify {
			PLATFORM_WAIT_GRAB("SMS_505790009", "平台端-待抢单", "您好，订单：{orderNo}已超过{time}分钟无司机抢单，请尽快加急派单，避免客户过久等待。"),
			SHOP_REFUNDING("SMS_505900008", "门店端-退款中", "行李订单：{orderNo}客户已提交退款申请，请尽快处理。"),
			SHOP_WAIT_VERIFY("SMS_505925004", "门店端-待核验", "新行李订单：{orderNo}客户已支付，请尽快核验用户物品信息。"),
			DRIVER_REFUNDING("SMS_505795005", "司机端-退款中", "行李订单：{orderNo}用户已提交退款申请，该订单任务已取消，请勿前往。"),
			DRIVER_WAIT_PICKUP("SMS_505650038", "司机端-待取件", "您已抢单成功，订单{orderNo}，请按时到{address}取件。"),
			MEMBER_CANCELLED("SMS_505605028", "会员端-已取消", "您的行李订单：{orderNo}已取消，感谢您的支持，欢迎下次再会。"),
			MEMBER_REFUNDED("SMS_505920002", "会员端-已退款", "您的行李订单：{orderNo}退款已完成，金额{money}元将原路退回，请注意查收。"),
			MEMBER_ARRIVED("SMS_505875004", "会员端-已送达", "您的行李订单：{orderNo}已送到{address}，请及时取件，取件码：{code}。"),
			MEMBER_DELIVERING("SMS_505935002", "会员端-配送中", "您的行李订单：{orderNo}已由司机{name}取件，正运往目的地。"),
			VERIFY_CODE("SMS_333770877", "验证码短信", "您的验证码为：{code}，请勿泄露于他人！"),
			;

			private final String templateCode;
			private final String title;
			private final String content;

			public String format(String... params) {
			String result = this.content;
			for (int i = 0; i < params.length - 1; i += 2) {
			result = result.replace("{" + params[i] + "}", params[i + 1]);
			}
			return result;
			}
			}

			/**
			* 得到request对象
			*
			* @return