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

# Conflicts:
#	tooth-wechat-web/src/main/java/com/iamberry/wechat/filters/WechatFilter.java

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

@@ -379,7 +379,7 @@ public class CartServiceImpl implements CartService {
 						List<OrderItem> itemList = adminOrderService.getShopOrderItemByOrderId(orderId);
 						try {
 							sendMessageUtil.orderApplyBarter("尊敬的朵粉，已收到您的【换货申请】，我们正在确认换货信息。",orderId,itemList.get(0).getItemProductName(),
-									"对此结果，soodo上朵深表歉意，我们会继续提升，期待下一次相遇！如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
+									"请确认您的换货申请信息填写无误！如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！",order2.getSalesOpenid(),ResultInfo.ORDER_DETAIL+orderId);
 						} catch (Exception e) {
 							logger.info("订单号："+ orderId +"的订单申请换货，发送微信消息失败!");
 						}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -68,7 +68,7 @@
 		FROM tb_iamberry_product_info PI
 		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
 		WHERE PI.PRODUCT_TYPE=#{productType} AND PC.COLOR_STATUS=1
-		ORDER BY PI.product_sort_num
+		ORDER BY PI.product_sort_num,PC.color_id
 		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
 			limit ${page.recordBegin},${page.pageSize}
 		</if>

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

@@ -923,7 +923,7 @@ public class AdminOrderHandlers {
 
                         try {
                             sendMessageUtil.orderApplyBarter("尊敬的朵粉，您的【换货申请】没有通过。",orderId,itemList.get(0).getItemProductName(),
-                                    "请确认您的退货申请信息填写无误。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
+                                    "请确认您的换货申请信息填写无误。如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）",currentOrder.getSalesOpenid(),ResultInfo.ORDER_DETAIL + orderId);
                         } catch (Exception e) {
                             logger.info("订单号："+ orderId +"的订单驳回换货，发送微信消息失败!");
                         }