Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -617,8 +617,8 @@ public class AdminOrderHandlers {
                     if (adminOrderService.updateOrderStatusByOrderId(order)) {// 驳回退款
                         String payMoney = df.format((float)currentOrder.getSalesYetAmount()/100) + "元";
                         try {
-                            sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请被退回：",payMoney,itemList.get(0).getItemProductName(),orderId,
-                                    "请确认您的退款申请信息填写无误。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
+                            sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请被退回。",payMoney,itemList.get(0).getItemProductName(),orderId,
+                                    "请确认您的退款申请信息填写无误。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单驳回退款，发送微信消息失败!");
                         }
@@ -665,8 +665,8 @@ public class AdminOrderHandlers {
 
                         String payMoney = df.format((float)currentOrder.getSalesYetAmount()/100) + "元";
                         try {
-                            sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请已通过：",payMoney,itemList.get(0).getItemProductName(),orderId,
-                                    "退款金额将在三个工作日内退款到您的支付账户。\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
+                            sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请已通过。",payMoney,itemList.get(0).getItemProductName(),orderId,
+                                    "退款金额将在三个工作日内退款到您的支付账户。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单同意退款，发送微信消息失败!");
                         }
@@ -714,7 +714,7 @@ public class AdminOrderHandlers {
                         }
                         try {
                             sendMessageUtil.orderApplyReturn("尊敬的朵粉，soodo上朵已通过您的【退货申请】",orderId,payMoney,productNum+"件",currentOrder.getSalesReturnDes(),
-                                    "请您尽快联系客服人员处理，根据客服人员指引将机器寄回。\\r\\n对此结果，soodo上朵深表歉意，我们会继续提升，期待下一次相遇！",currentOrder.getSalesOpenid(),null);
+                                    "请您尽快联系客服人员处理，根据客服人员指引将机器寄回。对此结果，soodo上朵深表歉意，我们会继续提升，期待下一次相遇！",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单同意退货，发送微信消息失败!");
                         }
@@ -726,8 +726,8 @@ public class AdminOrderHandlers {
                             productNum += item.getItemNum();
                         }
                         try {
-                            sendMessageUtil.orderApplyReturn("尊敬的朵粉，您的【退货申请】没有通过",orderId,payMoney,productNum+"件",currentOrder.getSalesReturnDes(),
-                                    "请确认您的退货申请信息填写无误。\\r\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",currentOrder.getSalesOpenid(),null);
+                            sendMessageUtil.orderApplyReturn("尊敬的朵粉，您的【退货申请】没有通过。",orderId,payMoney,productNum+"件",currentOrder.getSalesReturnDes(),
+                                    "请确认您的退货申请信息填写无误。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单驳回退货，发送微信消息失败!");
                         }
@@ -823,18 +823,17 @@ public class AdminOrderHandlers {
                                 break;
                         }
 
-                        /*try {
-                            //发送消息
-                            String temp = ResultInfo.INCOMEREMINDTEMP;
-                            temp = temp.replaceFirst("firstValueIamberry", ResultInfo.NEXTUSERTUIHUOMESSAGE)
-                                    .replaceFirst("accountValueIamberry", URLDecoder.decode(member.getUserNickname(), "UTF-8"))
-                                    .replaceFirst("timeValueIamberry", DateTimeUtil.format(new Date(), NameUtils.getConfig("DATE_TIME_FORMAT")))
-                                    .replaceFirst("typeValueIamberry", "用户退货")
-                                    .replaceFirst("remarkValueIamberry", ResultInfo.INTOSHOP);
-                            sendMessageUtil.sendTemplateMessageToOpenid(temp, toopenid, ResultInfo.TUIHUI_SHIPMENT, 3);
+                        String payMoney = df.format((float)currentOrder.getSalesYetAmount()/100) + "元";
+                        int productNum = 0;
+                        for (OrderItem item : itemList) {
+                            productNum += item.getItemNum();
+                        }
+                        try {
+                            sendMessageUtil.orderApplyReturn("尊敬的朵粉，soodo上朵已收到您寄回的产品",orderId,payMoney,productNum+"件",currentOrder.getSalesReturnDes(),
+                                    "退款金额将在三个工作日内退款到您的支付账户。对此结果，soodo上朵深表歉意，我们会继续提升，期待下一次相遇！",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
-
-                        }*/
+                            logger.info("订单号："+ orderId +"的订单退货，后台确认收货，发送微信消息失败!");
+                        }
 
                     }
 
@@ -912,7 +911,7 @@ public class AdminOrderHandlers {
 
                         try {
                             sendMessageUtil.orderApplyBarter("尊敬的朵粉，您的【换货申请】通过。",orderId,itemList.get(0).getItemProductName(),
-                                    "退款金额将在三个工作日内退款到您的支付账户。\\r\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),null);
+                                    "如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单同意换货，发送微信消息失败!");
                         }
@@ -922,7 +921,7 @@ public class AdminOrderHandlers {
 
                         try {
                             sendMessageUtil.orderApplyBarter("尊敬的朵粉，您的【换货申请】没有通过。",orderId,itemList.get(0).getItemProductName(),
-                                    "退款金额将在三个工作日内退款到您的支付账户。\\r\\n如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),null);
+                                    "请确认您的退货申请信息填写无误。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单驳回换货，发送微信消息失败!");
                         }