处理同步物流状态和隐藏列表的查询物流接口

src/main/java/com/uas/platform/b2c/logistics/dao/AddressTakeSelfDao.java

@@ -18,11 +18,11 @@ public interface AddressTakeSelfDao
 		extends JpaSpecificationExecutor<AddressTakeSelf>, JpaRepository<AddressTakeSelf, Long> {
 
 	/**
-	 * 根据企业enuu来获取自提点地址信息，按创建时间排序
+	 * 根据企业enuu和启用状态来获取自提点地址信息，按创建时间排序
 	 * @param enuu
 	 * @return
 	 */
-	List<AddressTakeSelf> findByEnuuOrderByCreatetimeDesc(Long enuu);
+	List<AddressTakeSelf> findByEnuuAndActiveOrderByCreatetimeDesc(Long enuu, Short active);
 
 	/**
 	 * 根据企业enuu获取所有的自提点地址名称

src/main/java/com/uas/platform/b2c/logistics/service/impl/AddressTakeSelfServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.logistics.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2c.core.constant.ShortConstant;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.logistics.dao.AddressTakeSelfDao;
 import com.uas.platform.b2c.logistics.model.AddressTakeSelf;
@@ -101,7 +102,7 @@ public class AddressTakeSelfServiceImpl implements AddressTakeSelfService {
 				throw new IllegalOperatorException("店铺信息丢失，请刷新后重试");
 			}
 			Long enuu = store.getEnUU();
-			List<AddressTakeSelf> list = addressTakeSelfDao.findByEnuuOrderByCreatetimeDesc(enuu);
+			List<AddressTakeSelf> list = addressTakeSelfDao.findByEnuuAndActiveOrderByCreatetimeDesc(enuu, ShortConstant.YES_SHORT);
 			map.put(object.getString("uuid"), list);
 		}
 		return map;

src/main/webapp/resources/js/vendor/controllers/forstore/query_logistics_ctrl.js

@@ -58,7 +58,7 @@ define(['app/app', 'calendar'], function(app) {
                 str.indexOf("发出")!=-1||str.indexOf("收入")!=-1||str.indexOf("扫描")!=-1||str.indexOf("到达")!=-1){
                 $scope.status = "transit";
             }
-            if(str.indexOf("派送")!=-1){
+            if(str.indexOf("派送")!=-1 || str.indexOf("派件")!=-1){
                 $scope.status = "send";
             }
             if(str.indexOf("签收")!=-1){

src/main/webapp/resources/view/admin/trade/trade_invoicefromorder.html

@@ -234,32 +234,32 @@ input[type="radio"]:checked+label:after, input[type="checkbox"]:checked+label:af
 								</a>
 							</td>
 							<td class="text-center" ng-show="active=='inbound'">
-								<a ng-show="active=='inbound'" ng-click="queryLogistics(invoice)">
-									<div class="btn-group">
-										<button type="button" class="btn btn-default btn-sm  dropdown-toggle" data-toggle="dropdown">查看物流</button>
-										<div class="dropdown-menu" role="menu">
-											<p style="text-align: center">物流信息</p>
-											<table class="table table-bordered">
-												<tr>
-													<th>订单号</th>
-													<th ng-bind="logisticsInfo.ddhm"></th>
-												</tr>
-												<tr>
-													<th>邮件号</th>
-													<th ng-bind="logisticsInfo.yjhm"></th>
-												</tr>
-												<tr>
-													<th>处理时间</th>
-													<th ng-bind="logisticsInfo.clsj"></th>
-												</tr>
-												<tr>
-													<th>物流信息</th>
-													<th ng-bind="logisticsInfo.wlxx"></th>
-												</tr>
-											</table>
-										</div>
-									</div>				
-								</a>
+								<!--<a ng-show="active=='inbound'" ng-click="queryLogistics(invoice)">-->
+									<!--<div class="btn-group">-->
+										<!--<button type="button" class="btn btn-default btn-sm  dropdown-toggle" data-toggle="dropdown">查看物流</button>-->
+										<!--<div class="dropdown-menu" role="menu">-->
+											<!--<p style="text-align: center">物流信息</p>-->
+											<!--<table class="table table-bordered">-->
+												<!--<tr>-->
+													<!--<th>订单号</th>-->
+													<!--<th ng-bind="logisticsInfo.ddhm"></th>-->
+												<!--</tr>-->
+												<!--<tr>-->
+													<!--<th>邮件号</th>-->
+													<!--<th ng-bind="logisticsInfo.yjhm"></th>-->
+												<!--</tr>-->
+												<!--<tr>-->
+													<!--<th>处理时间</th>-->
+													<!--<th ng-bind="logisticsInfo.clsj"></th>-->
+												<!--</tr>-->
+												<!--<tr>-->
+													<!--<th>物流信息</th>-->
+													<!--<th ng-bind="logisticsInfo.wlxx"></th>-->
+												<!--</tr>-->
+											<!--</table>-->
+										<!--</div>-->
+									<!--</div>-->
+								<!--</a>-->
 							</td>
 						</tr>
 					</tbody>