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

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -129,11 +129,12 @@
             <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>-
             <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
-            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 导出</button>
-            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button>
-            <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel(仅支持XLS类型)</button>
-            <button onClick="upFiles2();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传物流信息(仅支持XLS类型)</button>
-            <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>
+            <#--<button onClick="downloadOrder();" &lt;#&ndash;onMouseOver="showDownloadOrderInfo();" onMouseOut="hideDownloadOrderInfo();"&ndash;&gt; class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>-->
+            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 下载订单</button>
+            <#--<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button>-->
+            <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel(仅支持XLS类型)</button>
+            <button onClick="upFiles2();"  class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传物流信息(仅支持XLS类型)</button>
+            <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>
 
             </div>
         </form>
@@ -265,6 +266,13 @@
     function sales_order_detail(orderSaleId) {
         window.location.href= "${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId;
     }
+    /*onMouseOver="showDownloadOrderInfo();" onMouseOut="hideDownloadOrderInfo();"*/
+    function showDownloadOrderInfo() {
+        
+    }
+    function hideDownloadOrderInfo() {
+
+    }
     /*$(function () {
         /!*初始化店铺*!/
         initEfastStoreName();

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -117,7 +117,7 @@
         <tbody id="tbody">
         </tbody>
     </table>
-    <button style="margin-left: 40%;margin-top: 10px;" onClick="sub();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 提交保存，并推送Efast</button>
+    <button style="margin-left: 40%;margin-top: 10px;" onClick="sub();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 提交保存，并推送Efast</button><span style="height: 30px;">上传成功后请下载订单excel上传到efast</span>
 
     <!-- 推送结果 -->
     <div id="modal-demo" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

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

@@ -395,9 +395,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>
 
 	<!-- 更新拉取成功的订单 -->
@@ -405,7 +409,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_send_date= '5'
 		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,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>
 
 	<!-- 更新拉取成功的订单 -->
@@ -404,7 +409,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>

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);
 					}
 				}