上朵

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

@@ -91,6 +91,7 @@
 		) chan ON O.sales_channel_type = chan.sales_channel_type AND O.sales_channel_id = chan.sales_channel_id
 		WHERE
 		O.SALES_ORDER_TYPE = 1
+		AND  O.sales_transportation_type != 2
 		<if test="salesStatus != null and salesStatus != -1">
 			AND O.SALES_STATUS = #{salesStatus}
 		</if>
@@ -126,8 +127,9 @@
 		TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U
 		ON O.SALES_OPENID = U.USER_OPENID
 		<where>
+				O.sales_transportation_type != 2
 			<if test="salesStatus != null and salesStatus != -1">
-				O.SALES_STATUS = #{salesStatus}
+				AND O.SALES_STATUS = #{salesStatus}
 			</if>
 			<if test="salesOrderid != null and salesOrderid!=''">
 				AND O.SALES_ORDERID LIKE CONCAT('%',#{salesOrderid},'%')
@@ -161,6 +163,7 @@
 		ON O.SALES_OPENID = U.USER_OPENID
 		WHERE
 		O.SALES_ORDER_TYPE = 1
+		AND O.sales_transportation_type != 2
 		<if test="salesStatus != null and salesStatus != -1">
 			AND O.SALES_STATUS = #{salesStatus}
 		</if>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -160,7 +160,7 @@ public class WeChatServiceImpl implements WeChatService {
 			} else if (msgType.equals(MessageUtil.REQ_MESSAGE_TYPE_VOICE)) {// 音频消息
 				return intxml;
 			} else if (msgType.equals(MessageUtil.REQ_MESSAGE_TYPE_EVENT)) {// 事件推送
-				
+
 				String eventType = requestMap.get("Event");// 事件类型
 				String eventKey = requestMap.get("EventKey");
 
@@ -219,6 +219,7 @@ public class WeChatServiceImpl implements WeChatService {
 						} else {
 							//未关注用户扫描二维码关注事件处理
 							Status status = scannQRcodeSub(requestMap, fromUserName);
+							Member member = refreshUserInfo(fromUserName);	//更新用户信息
 							if (status.isFlag()) {
 								return status.getCountext();
 							}
@@ -227,6 +228,7 @@ public class WeChatServiceImpl implements WeChatService {
 					} else {
 						// 搜索公众号关注
 						Status status = queryWechatSub(fromUserName, requestMap);
+						Member member = refreshUserInfo(fromUserName);	//更新用户信息
 						if (status.isFlag()) {
 							return status.getCountext();
 						}
@@ -240,6 +242,7 @@ public class WeChatServiceImpl implements WeChatService {
 				} else if (eventType.equals(MessageUtil.EVENT_TYPE_CLICK) || eventType.equals("VIEW")) {
 					// 自定义菜单点击事件
 					Status status = clickWechatMenuEnent(requestMap);
+					Member member = refreshUserInfo(fromUserName);	//更新用户信息
 					if (status.isFlag()) {
 						return status.getCountext();
 					}