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,8 +395,10 @@
 		FROM
 			tb_iamberry_shop_sales_order o
 		WHERE
-			o.sales_post_num is null
+			o.sales_status = '5'
 		AND
+			o.sales_post_num is null
+		OR
 			o.sales_post_firm is null
 	</select>
 
@@ -405,7 +407,8 @@
 		update  tb_iamberry_shop_sales_order
 		set
 		sales_post_num= #{salesPostNum},
-		sales_post_firm= #{salesPostFirm}
+		sales_post_firm= #{salesPostFirm},
+		sales_send_date= #{salesSendDate}
 		where
 		sales_orderid = #{salesOrderid}
 	</update>

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

@@ -175,10 +175,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);
 						probationShopOrderService.updateProbationShopOrder(order);
 					}
 				}

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

@@ -384,6 +384,7 @@
 	<resultMap type="com.iamberry.wechat.core.entity.order.Order" id="selectProbationShopOrderListResult">
 		<result property="salesOrderid" column="sales_orderid" />
 		<result property="salesPostFirm" column="sales_post_firm" />
+		<result property="salesPostFirm" column="sales_post_firm" />
 		<result property="salesPostNum" column="sales_post_num" />
 	</resultMap>
 	<select id="selectWateroPFOrderList" resultMap="selectProbationShopOrderListResult">
@@ -394,9 +395,12 @@
 		FROM
 		tb_iamberry_shop_sales_order o
 		WHERE
-		o.sales_post_num is null
+		o.sales_status = '5'
 		AND
+		o.sales_post_num is null
+		OR
 		o.sales_post_firm is null
+
 	</select>
 
 	<!-- 更新拉取成功的订单 -->
@@ -404,7 +408,8 @@
 		update  tb_iamberry_shop_sales_order
 		set
 		sales_post_num= #{salesPostNum},
-		sales_post_firm= #{salesPostFirm}
+		sales_post_firm= #{salesPostFirm},
+		sales_send_date = #{salesSendDate}
 		where
 		sales_orderid = #{salesOrderid}
 	</update>

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

@@ -177,10 +177,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);
 						probationShopOrderService.updateWateroPFOrder(order);
 					}
 				}