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,10 @@ public class AdminOrderHandlers {
                     if (adminOrderService.updateOrderStatusByOrderId(order)) {// 驳回退款
                         String payMoney = df.format((float)currentOrder.getSalesYetAmount()/100) + "元";
                         try {
-                            sendMessageUtil.orderApplyRefund("尊敬的朵粉，您的退款申请被退回。",payMoney,itemList.get(0).getItemProductName(),orderId,
-                                    "请确认您的退款申请信息填写无误。如有问题请致电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);
+                            sendMessageUtil.refundToDismiss("尊敬的朵粉，您的退款申请被退回。",payMoney,itemList.get(0).getItemProductName(),orderId,
+                                    "请确认您的退款申请信息填写无误。 如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单驳回退款，发送微信消息失败!");
                         }