Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-aiberle

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

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

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -168,10 +168,12 @@ public class MQTask implements InitializingBean {
 					String msg = jsonObject.getString("msg");
 					logger.info("---------"+msg+"---------");
 					if ("success".equals(msg)) {
+						Date date = new Date();
 						String salesPostFirm = jsonObject.getString("salesPostFirm");
 						String salesPostNum = jsonObject.getString("salesPostNum");
 						order.setSalesPostFirm(salesPostFirm);
 						order.setSalesPostNum(salesPostNum);
+						order.setSalesSendDate(date);
 						wechatTaskService.updateAiberleShopOrder(order);
 					}
 				}