评论：状态修改

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -1368,8 +1368,7 @@ public class Order extends Document implements Serializable {
 	 * @param uu the uu
 	 */
 	public void setStatusReviewed(Long uu) {
-		this.status = Status.REVIEWED.value();
-		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+		this.rateStatus = Status.REVIEWED.value();
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/trade/rate/service/impl/RateServiceImpl.java

@@ -88,9 +88,9 @@ public class RateServiceImpl implements RateService{
         rateGoodsDao.save(rateGoodsList);
         //订单状态变更
         Order order = orderDao.findByOrderid(orderId);
-        if (order.getStatus().intValue() < Status.RECEIVED.value()) {
+        /*if (order.getStatus().intValue() < Status.RECEIVED.value()) {
             throw new IllegalOperatorException("当前订单不在已完成状态，不能评价！");
-        }
+        }*/
         order.setStatusToBeAfterReviewed(SystemSession.getUser().getUserUU());
         orderDao.save(order);
     }
@@ -138,9 +138,9 @@ public class RateServiceImpl implements RateService{
                 rateVendor.setVendorLevel((short)5);
                 rateVendorDao.save(rateVendor);
                 //订单状态变更
-                if (order.getStatus().intValue() < Status.RECEIVED.value()) {
+                /*if (order.getStatus().intValue() < Status.RECEIVED.value()) {
                     throw new IllegalOperatorException("当前订单不在已完成状态，不能收货！");
-                }
+                }*/
                 order.setStatusToBeAfterReviewed(SystemSession.getUser().getUserUU());
                 orderDao.save(order);
             }
@@ -184,9 +184,7 @@ public class RateServiceImpl implements RateService{
             Purchase purchase = purchaseDao.findByPurchaseid(id);
             if(isFirst){
                 Order order = orderDao.findByOrderid(purchase.getOrderid());
-                if (order.getStatus().intValue() < Status.RECEIVED.value()) {
-                    throw new IllegalOperatorException("当前订单未完成，不能初评！");
-                }
+
                 if(rateBuyerDao.findByOrderId(order.getOrderid()) !=null ){continue;}
                 RateBuyer rateBuyer = new RateBuyer();
                 rateBuyer.setLevel(isAnony);

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

@@ -113,7 +113,7 @@ define(['app/app'], function (app) {
                     break;
                 case 'completed':
                     // TODO huxz 平台采购单已完成，即交易完成
-                    state = '520-522-523';
+                    state = '520';
                     break;
                 case 'unavailable':
                     // TODO huxz 平台采购单的失效状态

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

@@ -749,7 +749,7 @@
 						</span>
 						<span class="oder_deal" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length -1 || $index==2}">
                             <div ng-if="$index == 0">
-                                <a ng-if="order.status >= 405 && !order.rateStatus" class="operate-height" target="_blank" href="user#/rate/firstRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+                                <a ng-if="(order.status == 405 || order.status == 520) && !order.rateStatus" class="operate-height" target="_blank" href="user#/rate/firstRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">评价</em>
                               	</a>
 								<a ng-if="order.rateStatus == 523" class="operate-height" target="_blank" href="user#/rate/addRate/{{order.orderid | EncryptionFilter}}" style="display: block;">

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

@@ -1042,8 +1042,8 @@
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">点击发货</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
                                 <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>
-								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="purchase.status >= 503 && purchase.isFirstRate && !purchase.isAfterRate">追加评价</a>
-								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="purchase.status >= 503 && !purchase.isFirstRate">评价</a>
+								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) && !purchase.isAfterRate">追加评价</a>
+								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) && !purchase.isFirstRate">评价</a>
 								<!--<div ng-if="purchase.status == 520" class="clock-mind">
                                   <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="purchase.complete + 1728000000 | restTime"></em>&lt;!&ndash;暂时设定30天自动初评&ndash;&gt;
                               </div>