处理订单详情物流信息

src/main/webapp/resources/js/common/query/purchase.js

@@ -12,7 +12,7 @@ define([ 'ngResource' ], function() {
 			},
             // 获取当个发货单的信息
             getSendOrderInfo: {
-                url: 'trade/order/invoiceid',
+                url: '/trade/invoice/:invoiceid/code',
                 method : 'GET'
             },
 

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

@@ -45,6 +45,7 @@ define(['app/app', 'calendar'], function(app) {
               KdnLogistics.kdnQuery(params, {}, function(response){
                 if(!response.errorInfo) {
                   $scope.logisticsInfo = eval ("(" + response.traces + ")");
+                  statusOfLogistics($scope.logisticsInfo[$scope.logisticsInfo.length - 1].AcceptStation);
                   if($scope.logisticsInfo.length != 0) {
                     $scope.hasInfo = true;
                   }

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

@@ -26,14 +26,14 @@ define(['app/app', 'calendar'], function(app) {
         // 获取当前收货单所对应的物品信息
         function getReceiveInfo() {
             Purchase.getSendOrderInfo(
-                {id: $scope.purchase.id, invoiceid: $scope.ChooseItem}, {},
+                // {id: $scope.purchase.id, invoiceid: enIdFilter($scope.ChooseItem)}, {},
+                {invoiceid: enIdFilter($scope.ChooseItem)}, {},
                 function (data) {
                     var params = {};
-                    $scope.purchase.logistics = data.data.logistics
-                    $scope.logistics = data.data.logistics
+                    $scope.purchase.logistics = data.logistics
+                    $scope.logistics = data.logistics
                     params.companyName = $scope.logistics.companyName;
                     KdnLogistics.kdnQueryCompany({companyName:$scope.logistics.companyName}, function(response){
-                        console.log(response);
                         if (response.code){
                             $scope.canShowInfo = true;
                         }else{
@@ -46,6 +46,7 @@ define(['app/app', 'calendar'], function(app) {
                     KdnLogistics.kdnQuery(params, {}, function(response){
                         if(!response.errorInfo) {
                             $scope.logisticsInfo = eval ("(" + response.traces + ")");
+                            statusOfLogistics($scope.logisticsInfo[$scope.logisticsInfo.length - 1].AcceptStation);
                             if($scope.logisticsInfo.length != 0) {
                                 $scope.hasInfo = true;
                             }
@@ -74,7 +75,6 @@ define(['app/app', 'calendar'], function(app) {
                 }else {
                     $scope.purchase = data.data;
                     $scope.address = JSON.parse($scope.purchase.jsonAddress);
-                    console.log($scope.purchase)
                     $scope.sendGoodsList = $scope.purchase.inids.split(',')
                     $scope.CheckId = 'autoMonth0';
                     $scope.ChooseItem = $scope.sendGoodsList[0];

src/main/webapp/resources/view/vendor/forstore/query_logistics.html

@@ -249,25 +249,43 @@
                         <span style="margin-right: 0;">订单号：</span>
                         <span style="margin-left: 0;" ng-bind="purchase.orderid"></span>
                         <!--<span><img src="static/img/vendor/images/seller.png"/><a href="#" class="contact_btn">联系买家</a></span>-->
+                        <span style="margin-right: 0px;"><img src="static/img/user/images/shop_home.png" />&nbsp;<a ng-bind="purchase.buyentername || purchase.buyername" style="margin-left: 0;margin-right: 20px;" href="store/{{::purchase.storeid}}" target="_blank"></a></span>
+                        <span><img src="static/img/common/songguo.png"/><a href="#" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(!purchase.buyerenuu ? purchase.buyPhone : null, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
+                            <!--<a class="contact_btn" ng-click="contactSeller()">联系卖家</a>-->
+                            <div class="contact-box" ng-if="contactBNox">
+								<div class="title"><i class="fa fa-close fa-lg" ng-click="closeBox()"></i></div>
+								<div class="content">
+									<div class="company-title" ng-bind="::purchase.buyername || '买家姓名没获取到'">深圳市优软科技</div>
+									<div class="list">
+										<em>手机：<em ng-bind="::purchase.buyPhone || '暂无联系电话'">45413413131313</em></em>
+										<em style="margin-left: 60px;">邮箱：<em ng-bind="::purchase.buyEmail || '暂无电子邮箱'">45413413131313</em></em>
+									</div>
+									<!--<div class="list">地址：-->
+										<!--<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>-->
+									<!--</div>-->
+								</div>
+							</div>
+                        </span>
                     </div>
                     <div class="logistics-content">
                         <div class="img"><img src="static/img/icon/member.png"  alt=""/></div>
                         <div class="content" style="position: relative;">
-                            <p><span ng-bind="purchase.buyername"></span> &nbsp;<em ng-show="purchase.buyentername">|</em>&nbsp; <em class="name" ng-bind="purchase.buyentername"></em><img src="static/img/common/songguo.png" />
-                                <a href="#" class="contact-btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
+                            <p><span ng-bind="purchase.buyername"></span> &nbsp;<em ng-show="purchase.buyentername">|</em>&nbsp; <em class="name" ng-bind="purchase.buyentername"></em>
+                                <!--<img src="static/img/common/songguo.png" />-->
+                                <!--<a href="#" class="contact-btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
                             <!--<a class="contact_btn" ng-click="contactSeller()">联系买家</a>-->
-                            <div class="contact-box" ng-if="contactBNox">
-                                <div class="title"><i class="fa fa-close fa-lg" ng-click="closeBox()"></i></div>
-                                <div class="content">
-                                    <div class="company-title" ng-bind="::purchase.buyername || '买家姓名没获取到'">深圳市优软科技</div>
-                                    <div class="list">
-                                        <em>手机：<em ng-bind="::purchase.buyPhone || '暂无联系电话'">45413413131313</em></em>
-                                        <em style="margin-left: 60px;">邮箱：<em ng-bind="::purchase.buyEmail || '暂无电子邮箱'">45413413131313</em></em>
-                                    </div>
-                                </div>
-                            </div>
+                            <!--<div class="contact-box" ng-if="contactBNox">-->
+                                <!--<div class="title"><i class="fa fa-close fa-lg" ng-click="closeBox()"></i></div>-->
+                                <!--<div class="content">-->
+                                    <!--<div class="company-title" ng-bind="">深圳市优软科技</div>-->
+                                    <!--<div class="list">-->
+                                        <!--<em>手机：<em ng-bind="::purchase.buyPhone || '暂无联系电话'">45413413131313</em></em>-->
+                                        <!--<em style="margin-left: 60px;">邮箱：<em ng-bind="::purchase.buyEmail || '暂无电子邮箱'">45413413131313</em></em>-->
+                                    <!--</div>-->
+                                <!--</div>-->
+                            <!--</div>-->
                             </p>
-                            <p ng-bind="purchase.buyPhone"></p>
+                            <p>联系电话：<em ng-bind="purchase.buyPhone"></em></p>
                             <p>收货地址：<em ng-bind="address.area"></em></p>
                         </div>
                     </div>