前端添加订单数据传值

src/main/java/com/uas/platform/b2c/trade/rate/controller/RateController.java

@@ -3,6 +3,9 @@ package com.uas.platform.b2c.trade.rate.controller;
 
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import com.uas.platform.b2c.trade.order.dao.OrderDao;
+import com.uas.platform.b2c.trade.order.model.Order;
+import com.uas.platform.b2c.trade.order.model.OrderDetail;
 import com.uas.platform.b2c.trade.rate.model.RateBuyer;
 import com.uas.platform.b2c.trade.rate.model.RateGoods;
 import com.uas.platform.b2c.trade.rate.model.RateTemplate;
@@ -11,6 +14,7 @@ import com.uas.platform.b2c.trade.rate.service.RateService;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
+import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +32,9 @@ public class RateController {
     @Autowired
     private RateService rateService;
 
+    @Autowired
+    private OrderDao   orderDao;
+
     /**
      * 买家评价卖家店铺
      *
@@ -45,8 +52,7 @@ public class RateController {
             return  new ResultMap(CodeType.ERROR_STATE.code(),"参数有误");
         }
         RateVendor result = rateService.saveRateVendor(rateVendor);
-        //订单状态变更
-        //TODO
+
         return new ResultMap(CodeType.OK.code(), "评价成功", result);
 
     }
@@ -71,6 +77,12 @@ public class RateController {
 
         }
         rateService.saveRateGoods(rateGoodsList);
+        //订单状态变更
+        Order order = orderDao.findByOrderid(orderId);
+        if (order.getStatus().intValue() != Status.COMPLETED.value()) {
+            throw new IllegalOperatorException("当前订单不在已完成状态，不能收货！");
+        }
+        order.setStatusToBeAfterReviewed(SystemSession.getUser().getUserUU());
 
         return new ResultMap(CodeType.OK.code(), "评价成功");
 
@@ -94,6 +106,12 @@ public class RateController {
 
         }
         rateService.saveAfterRateGoods(rateGoodsList);
+        //订单状态变更
+        Order order = orderDao.findByOrderid(orderId);
+        if (order.getStatus().intValue() != Status.TO_BE_AFTERREVIEWED.value()) {
+            throw new IllegalOperatorException("当前订单未完成初评，不能追评！");
+        }
+        order.setStatusReviewed(SystemSession.getUser().getUserUU());
 
         return new ResultMap(CodeType.OK.code(), "追评成功");
 

src/main/webapp/resources/js/usercenter/app.js

@@ -380,18 +380,21 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 		})).state('firstRate', angularAMD.route({
 			// 初次评价
 			url : '/rate/firstRate',
+			params : {'order' : null},
 			templateUrl : 'static/view/usercenter/forstore/first_rate.html',
 			controller : 'firstRateCtrl',
 			controllerUrl : 'app/controllers/forstore/first_rate_ctrl'
 		})).state('addRate', angularAMD.route({
 			// 追加评价
 			url : '/rate/addRate',
+			params : {'order' : null},
 			templateUrl : 'static/view/usercenter/forstore/add_rate.html',
 			controller : 'addRateCtrl',
 			controllerUrl : 'app/controllers/forstore/add_rate_ctrl'
 		})).state('showRate', angularAMD.route({
 			// 查看评价
 			url : '/rate/showRate',
+			params : {'order' : null},
 			templateUrl : 'static/view/usercenter/forstore/show_rate.html',
 			controller : 'showRateCtrl',
 			controllerUrl : 'app/controllers/forstore/show_rate_ctrl'

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

@@ -1,5 +1,9 @@
 define(['app/app'], function(app) {
     app.register.controller('firstRateCtrl', ['$scope', '$rootScope', '$stateParams', function ($scope, $rootScope, $stateParams) {
         $scope.text = 'first rate page';
+
+
+
+        console.log($stateParams.order);
     }]);
 });

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -741,13 +741,13 @@
 						</span>
 						<span class="oder_deal" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length -1 || $index==2}">
                             <div ng-if="$index == 0">
-								<a class="operate-height" href="user#/rate/showRate" style="display: block;">
+								<a ng-if="order.status == 522" class="operate-height" ui-sref="showRate({order: order})" style="display: block;">
                                   <em class="order-operation">已评价</em>
                               	</a>
-								<a class="operate-height" href="user#/rate/addRate" style="display: block;">
+								<a ng-if="order.status == 523" class="operate-height" ui-sref="addRate({order: order})" style="display: block;">
                                   <em class="order-operation">追加评价</em>
                               	</a>
-								<a ng-if="order.status == 405" class="operate-height" href="user#/rate/firstRate" style="display: block;">
+								<a ng-if="order.status == 520" class="operate-height" ui-sref="firstRate({order: order})" style="display: block;">
                                   <em class="order-operation">评价</em>
                               	</a>
                               <a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="(order.status == 503 || order.status == 501) && order.auditPayFailReason == null" style="display: block;">

src/main/webapp/resources/view/usercenter/forstore/first_rate.html

@@ -140,10 +140,14 @@
             </tr>
         </thead>
         <tbody>
-            <tr>
+            <tr ng-repeat="detail in order.orderDetails">
                 <td>
                     <img src="static/img/user/images/default.png" alt="">
                     <div class="first-rate-item-info">
+                        类目：<a href="product/kind/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/>
+                        型号：<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/>
+                        品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a>
+
                         <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：专用处理器</span></span>
                         <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：445NNSJASDASKDJA</span></span>
                         <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：mnnnnnk</span></span>