接口测试修改

tooth-common-core/src/main/java/com/iamberry/wechat/tools/SendMessageUtil.java

@@ -92,6 +92,9 @@ public class SendMessageUtil {
 			case 16:  //16、退款申请驳回
 				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.refund_to_dismiss, date, url);
 				break;
+			case 17:  //17、退款申请通知
+				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.refund_application_notice, date, url);
+				break;
 			default: 
 				break;
 			}
@@ -351,4 +354,24 @@ public class SendMessageUtil {
 				.replaceFirst("remarkValue",remark);
 		sendTemplateMessageToOpenid(temp, openId, url,16);
 	}
+
+	/**
+	 * 退款申请通知
+	 * @param first
+	 * @param keyword1
+	 * @param keyword2
+	 * @param remark
+	 * @param openId
+	 * @param url
+	 */
+	public void refundApplicationNotice(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
+		String temp = ResultInfo.APPLYREFUND;
+		temp = temp.replaceFirst("firstValueIamberry", first)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
+				.replaceFirst("keyword3Value",keyword3)
+				.replaceFirst("colorValue","#1C86EE")
+				.replaceFirst("remarkValue",remark);
+		sendTemplateMessageToOpenid(temp, openId, url,17);
+	}
 }

tooth-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -181,6 +181,11 @@ public class ResultInfo {
 	public static String refund_to_dismiss="";
 
 	/**
+	 * 退款申请通知
+	 */
+	public static String refund_application_notice="";
+
+	/**
 	 * 返现到账通知消息模版
 	 */
 	public static String REWARDSREMINDTEMP =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, order:{'color':'#173177','value':'orderValueIamberry'}, 'money':{'color':'#173177', 'value':'moneyValueIamberry'}, 'remark':{'color':'#173177','value':'remarkValueIamberry'}}";

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -317,8 +317,8 @@ public class CartServiceImpl implements CartService {
 						//获取当前订单订单项
 						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
 						try {
-							sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请被退回：",payMoney,itemList.get(0).getItemProductName(),orderId,
-									"请确认您的退款申请信息填写无误。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order2.getSalesOrderid());
+							sendMessageUtil.refundApplicationNotice("尊敬的朵粉，我们已收到您的退款申请，我们正在积极处理：",payMoney,itemList.get(0).getItemProductName(),orderId,
+									"如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
 						} catch (Exception e) {
 							logger.info("订单号："+ orderId +"的订单驳回退款，发送微信消息失败!");
 						}
@@ -361,7 +361,7 @@ public class CartServiceImpl implements CartService {
 						}
 						try {
 							sendMessageUtil.orderApplyReturn("尊敬的朵粉，已收到您的【退货申请】",orderId,payMoney,productNum+"件",order2.getSalesReturnDes(),
-									"点击查看退款退货详情。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order2.getSalesOrderid());
+									"点击查看退款退货详情。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+order2.getSalesOrderid());
 						} catch (Exception e) {
 							logger.info("订单号："+ orderId +"的订单申请退货，发送微信消息失败!");
 						}
@@ -379,7 +379,7 @@ public class CartServiceImpl implements CartService {
 						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
 						try {
 							sendMessageUtil.orderApplyBarter("尊敬的朵粉，已收到您的【换货申请】，我们正在确认换货信息。",orderId,itemList.get(0).getItemProductName(),
-									"对此结果，soodo上朵深表歉意，我们会继续提升，期待下一次相遇！\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
+									"对此结果，soodo上朵深表歉意，我们会继续提升，期待下一次相遇！如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
 						} catch (Exception e) {
 							logger.info("订单号："+ orderId +"的订单申请换货，发送微信消息失败!");
 						}

tooth-wechat-web/src/main/resources/ResultInfo.properties

@@ -73,4 +73,5 @@ order_apply_return=rypqDnrOLbEjTsFJFBa35jOSsFG_-A1i9hB6OjI8zQY
 order_apply_refund=ySwst_myzaUGRm3T56308QISvPIiP4ZXG2SqjD9qlEw
 order_send_success=eMk2Cu5IUPTIUVlNK5MdHNo6-QFiax3p85VBJXJfbTM
 refund_to_dismiss=uevo2BouTPCuBWDSPQMHuhBUbrz-NjlqzfIeyIqZhJ8
+refund_application_notice=d_dWYOK2p16B0Qow_D8cbJW0PFtqMB6Jng9-7Vsk0ro