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

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

@@ -705,6 +705,7 @@ PUBLIC
 	<select id="selectShopOrderByPolaById" parameterType="String" resultType="Order">
 		SELECT
 			O.SALES_ORDERID salesOrderid,
+			O.sales_openid salesOpenid,
 			O.SALES_ADDRESS_NAME salesAddressName,
 			U.USER_NICKNAME userNickname,
 			O.SALES_ADDRESS_TEL salesAddressTel,

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/polyapi/ExternalDockPolyApiHandler.java

@@ -312,8 +312,8 @@ public class ExternalDockPolyApiHandler {
                 );
             } catch (Exception e) {
                 logger.info("订单号："+ order.getSalesOrderid() +"的订单已发货，发送微信消息失败!");
+                logger.info("失败原因：订单编号"+order.getSalesOrderid() + "快递公司:"+SendMessageUtil.hashmap.get(firm) +"快递单号"+num+"地址" +order.getSalesAddressInfo()+"openid:"+order.getSalesOpenid()+"remark:"+ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
             }
-
         }
         if(flag){
             map.put("code","10000");