Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml

@@ -395,11 +395,13 @@
 		FROM
 			tb_iamberry_shop_sales_order o
 		WHERE
-			o.sales_status = '5'
+			o.sales_status = '2'
 		AND
+		(
 			o.sales_post_num is null
 		OR
 			o.sales_post_firm is null
+		)
 	</select>
 
 	<!-- 更新拉取成功的订单 -->
@@ -408,7 +410,8 @@
 		set
 		sales_post_num= #{salesPostNum},
 		sales_post_firm= #{salesPostFirm},
-		sales_send_date= #{salesSendDate}
+		sales_send_date= #{salesSendDate},
+		sales_send_date= '5'
 		where
 		sales_orderid = #{salesOrderid}
 	</update>

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml

@@ -395,12 +395,13 @@
 		FROM
 		tb_iamberry_shop_sales_order o
 		WHERE
-		o.sales_status = '5'
+		o.sales_status = '2'
 		AND
+		(
 		o.sales_post_num is null
 		OR
 		o.sales_post_firm is null
-
+		)
 	</select>
 
 	<!-- 更新拉取成功的订单 -->
@@ -409,7 +410,8 @@
 		set
 		sales_post_num= #{salesPostNum},
 		sales_post_firm= #{salesPostFirm},
-		sales_send_date = #{salesSendDate}
+		sales_send_date = #{salesSendDate},
+		sales_status = '5'
 		where
 		sales_orderid = #{salesOrderid}
 	</update>