评价：修改验收中的bug

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

@@ -155,17 +155,16 @@ public class RateController {
      */
     @RequestMapping(value = "/afterRateBuyer/{purchaseId}", method = RequestMethod.POST)
     public ResultMap saveAfterRateBuyer(@PathVariable("purchaseId") String purchaseId, @RequestBody String json) {
-        RateBuyer rateBuyer = FastjsonUtils.fromJson(json, RateBuyer.class);
-        rateBuyer.setVendorUseruu(SystemSession.getUser().getUserUU());
-        rateBuyer.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-        rateBuyer.setPurchaseId(purchaseId);
-        rateBuyer.setVendorRateTime(new Date(System.currentTimeMillis()));
-        RateBuyer result = rateService.saveRateBuyer(rateBuyer);
-
         Purchase purchase = purchaseDao.findByPurchaseid(purchaseId);
         if (purchase.getStatus().intValue() != Status.TO_BE_AFTERREVIEWED.value()) {
             throw new IllegalOperatorException("当前订单未初评，不能追评");
         }
+        RateBuyer rateBuyerlater = rateService.getRateBuyerByOrderId(purchase.getOrderid());
+        RateBuyer rateBuyer = FastjsonUtils.fromJson(json, RateBuyer.class);
+        rateBuyerlater.setVendorAfterRate(rateBuyer.getVendorAfterRate());
+        rateBuyerlater.setVendorAfterRateTime(new Date(System.currentTimeMillis()));
+        RateBuyer result = rateService.saveRateBuyer(rateBuyerlater);
+
         purchase.setTobeAfterRate(SystemSession.getUser().getUserUU());
         purchaseDao.save(purchase);
         return new ResultMap(CodeType.OK.code(), "追评成功",result);
@@ -197,7 +196,7 @@ public class RateController {
      * @return the result map
      */
     @RequestMapping(value = "/rateReply/{orderId}", method = RequestMethod.POST)
-    public ResultMap saveReply(@PathVariable("orderId") String orderId, @RequestParam String goodsId, @RequestParam String returnMeg) {
+    public ResultMap saveReply(@PathVariable("orderId") String orderId, @RequestParam Long goodsId, @RequestParam String returnMeg) {
         RateGoods result = rateService.saveReply(orderId,goodsId,returnMeg);
         return new ResultMap(CodeType.OK.code(), "回复成功",result);
     }
@@ -209,7 +208,7 @@ public class RateController {
      * @return the result map
      */
     @RequestMapping(value = "/afterRateReply/{orderId}", method = RequestMethod.POST)
-    public ResultMap saveAfterReply(@PathVariable("orderId") String orderId, @RequestParam String goodsId, @RequestParam String returnMeg) {
+    public ResultMap saveAfterReply(@PathVariable("orderId") String orderId, @RequestParam Long goodsId, @RequestParam String returnMeg) {
         RateGoods result = rateService.saveAfterReply(orderId,goodsId,returnMeg);
         return new ResultMap(CodeType.OK.code(), "回复成功",result);
     }

src/main/java/com/uas/platform/b2c/trade/rate/dao/RateGoodsDao.java

@@ -35,5 +35,5 @@ public interface RateGoodsDao extends JpaSpecificationExecutor<RateGoods>, JpaRe
      * @param goodsId
      * @return
      */
-    List<RateGoods> findByOrderIdAndGoodsId(String orderId,String goodsId);
+    List<RateGoods> findByOrderIdAndGoodsId(String orderId,Long goodsId);
 }

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

@@ -76,12 +76,12 @@ public interface RateService {
     /**
      * 保存卖家对商品评价的回复(初评回复)
      */
-    RateGoods saveReply(String orderId, String goodsId, String reply);
+    RateGoods saveReply(String orderId, Long goodsId, String reply);
 
     /**
      * 保存卖家对商品评价的回复(追评回复)
      */
-    RateGoods saveAfterReply(String orderId, String goodsId, String reply);
+    RateGoods saveAfterReply(String orderId, Long goodsId, String reply);
 
 
     /****************************查询模版方法****************************/

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

@@ -170,7 +170,7 @@ public class RateServiceImpl implements RateService{
     }
 
     @Override
-    public RateGoods saveReply(String orderId, String goodsId, String reply) {
+    public RateGoods saveReply(String orderId, Long goodsId, String reply) {
         RateGoods rateGoods = rateGoodsDao.findByOrderIdAndGoodsId(orderId,goodsId).get(0);
         rateGoods.setReturnMeg(reply);
         rateGoods.setReturnMegTime(new Date(System.currentTimeMillis()));
@@ -178,7 +178,7 @@ public class RateServiceImpl implements RateService{
     }
 
     @Override
-    public RateGoods saveAfterReply(String orderId, String goodsId, String reply) {
+    public RateGoods saveAfterReply(String orderId, Long goodsId, String reply) {
         RateGoods rateGoods = rateGoodsDao.findByOrderIdAndGoodsId(orderId,goodsId).get(0);
         rateGoods.setAfterReturnMeg(reply);
         rateGoods.setAfterReturnMegTime(new Date(System.currentTimeMillis()));

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

@@ -44,7 +44,9 @@ define(['app/app'], function(app) {
                             });
                             console.log($scope.buyerRate);
                         });
-
+                        Rate.getRateBuyer({orderId: $scope.order.orderid}, function (data) {
+                            $scope.vendorRateBuyer = data.data;
+                        });
                     });
                 }
             });

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

@@ -4,7 +4,7 @@
  */
 define(['app/app'], function (app) {
 	'use strict';
-	app.register.controller('orderCtrl', ['$scope', '$rootScope', 'Order', 'toaster', '$filter', 'OrderSimpleInfo', 'Recommendation', '$modal', 'tradeMessageNoticeService', 'tradeBasicProperties', 'NumberService', 'ChatBusinessLayer', function($scope, $rootScope, Order, toaster, $filter, OrderSimpleInfo, Recommendation, $modal, tradeMessageNoticeService, tradeBasicProperties, NumberService, ChatBusinessLayer) {
+	app.register.controller('orderCtrl', ['$scope', '$rootScope', 'Order', 'toaster', '$filter', 'OrderSimpleInfo', 'Recommendation', '$modal', 'tradeMessageNoticeService', 'tradeBasicProperties', 'NumberService', 'ChatBusinessLayer','Rate', function($scope, $rootScope, Order, toaster, $filter, OrderSimpleInfo, Recommendation, $modal, tradeMessageNoticeService, tradeBasicProperties, NumberService, ChatBusinessLayer,Rate) {
 
 		//初始化数据
 		$rootScope.active = 'buyer_order';
@@ -160,6 +160,11 @@ define(['app/app'], function (app) {
 				$scope.currenctOrders = data.content;
 				angular.forEach($scope.currenctOrders, function(data){
                     data.ensurePrice = Number(NumberService.toCeil(data.ensurePrice, 2));
+					Rate.getRateBuyer({orderId:data.orderid},{},function (result) {
+						if (result.data){
+							data.isEachRate = true;
+						}
+					});
 				});
 				$scope.accumulateNotifyTime($scope.currenctOrders);
 				$scope.param.currentPage = data.number;
@@ -653,6 +658,9 @@ define(['app/app'], function (app) {
                 case 523:
                     result = '待追评';
                     break;
+				case 522:
+					result = '已完成评价';
+					break;
 				case 602:
 				case 603:
 				case 315:

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

@@ -382,6 +382,13 @@ define(['app/app'], function (app) {
                             }
                         }
                         $scope.purchases = page.content;
+                        angular.forEach($scope.purchases, function (order) {
+                            Rate.getRateVendor({orderId:order.orderid},{},function (data) {
+                               if (data.data){
+                                   order.isEachRate = true;
+                               }
+                            });
+                        });
                         getExMsgState(); // 获取异常消息状态
                         getReturnByPurchaseIds(); // 获取退货单信息
 
@@ -1034,6 +1041,9 @@ define(['app/app'], function (app) {
             $scope.rateType = type;
             Rate.getRateTemplate({storeuuid: $scope.rateContent.storeid},{},function (data) {
                 $scope.modalData = data.data;
+                Rate.getRateBuyer({orderId: $scope.rateContent.orderid},{},function (data) {
+                    $scope.rateBuyer = data.data;
+                });
             },function (error) {
                toaster.pop('error', '获取模板信息失败');
             });
@@ -1199,6 +1209,9 @@ define(['app/app'], function (app) {
                 case 520:
                     result = '交易完成';
                     break;
+                case 522:
+                    result = '已完成评价';
+                    break;
             }
             return result;
         }

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

@@ -199,16 +199,16 @@
     </div>
     <table ng-table="showRateTableParams">
         <thead>
-        <tr class="line01">
+        <tr class="line01" ng-if="vendorRateBuyer.id">
             <td>
-                <span><img src="static/img/user/images/rate1.png" alt="">好评</span>
+                <span><img src="static/img/user/images/{{vendorRateBuyer.level == 1?'rate1.png':vendorRateBuyer.level == 2?'rate2.png':'rate3.png'}}" alt=""><span ng-bind="vendorRateBuyer.level == 1?'好评':vendorRateBuyer.level == 2?'中评':'差评'"></span></span>
                 <div style="margin-left: 20px;">
-                    <span class="add-rate-item01">卖家初评：<span>很爽快的买家</span></span>
-                    <span class="add-rate-item02">2017-07-01</span>
+                    <span class="add-rate-item01">卖家初评：<span ng-bind="vendorRateBuyer.vendorRate"></span></span>
+                    <span class="add-rate-item02" ng-bind="vendorRateBuyer.vendorRateTime | date:'yyyy-MM-dd'"></span>
                 </div>
                 <div style="margin-left: 40px;">
-                    <span class="add-rate-item01">卖家追评：<span>很好的买家，感谢您的支持！</span></span>
-                    <span class="add-rate-item02">2017-07-01</span>
+                    <span class="add-rate-item01">卖家追评：<span ng-bind="vendorRateBuyer.vendorAfterRate"></span></span>
+                    <span class="add-rate-item02" ng-bind="vendorRateBuyer.vendorAfterRateTime | date:'yyyy-MM-dd'"></span>
                 </div>
             </td>
         </tr>
@@ -285,7 +285,7 @@
     </table>
     <div class="submitBox">
      <label class="check-active">
-         <input ng-model="isSetTop" type="checkbox" id="check-act" class="ng-pristine ng-untouched ng-valid" ng-checked="isAnony" >
+         <input ng-model="isSetTop" type="checkbox" id="check-act" class="ng-pristine ng-untouched ng-valid" disabled ng-checked="isAnony" >
          <label for="check-act"></label>
          <span style="font-size: 14px; color: black">匿名评价</span>
      </label>

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

@@ -736,7 +736,7 @@
 								<a href="user#/order/detail/{{order.orderid | EncryptionFilter}}" class="oder_d action-link" style="display: block;" target="_blank">订单详情</a>
 
 								<a class="action-link" href="user#/buyerQueryLogistics/{{order.orderid | EncryptionFilter}}" ng-if="order.status == 404" style="display: block;" target="_blank">查看物流</a>
-								<a ng-if="order.status == 522" class="operate-height" target="_blank" href="user#/rate/showRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
+								<a ng-if="order.isEachRate && order.status != 520" class="operate-height" target="_blank" href="user#/rate/showRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">双方已评</em>
                               	</a>
 							</div>

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

@@ -963,7 +963,7 @@
                                 <a href="vendor#/purchase/detail/{{purchase.purchaseid | EncryptionFilter}}" class="oder_d action-link" target="_blank">订单详情</a><br/>
                                 <em ng-if="purchase.buyerNotifyShip && (purchase.status == 502 || purchase.status == 406)" style="display: block;">买家催促发货</em>
                                 <a class="oder_d action-link" href="vendor#/logistics/query/{{purchase.purchaseid | EncryptionFilter}}" ng-if="purchase.status == 404 || purchase.status == 520 || purchase.status == 405 || purchase.status == 503 || purchase.status == 514" target="_blank">查看物流</a>
-                           		<a class="oder_d action-link" target="_blank" href="vendor#/showRate/1" style="display: block;" ng-if="purchase.status == 522">双方已评</a>
+                           		<a class="oder_d action-link" target="_blank" href="vendor#/showRate/{{purchase.orderid | EncryptionFilter}}" style="display: block;" ng-if="purchase.isEachRate && purchase.status != 520">双方已评</a>
                             </div>
                         </span>
 						<span class="click_shop">
@@ -1056,10 +1056,10 @@
 				<div class="modal-add-rate" ng-show="rateType == 'addRate'">
 					<div style="width: 70px;display: inline-block;">
 						<span class="rate-item">初次评价：</span>
-						<span><img src="static/img/user/images/rate2.png" alt="">中评</span>
+						<span><img src="static/img/user/images/{{rateBuyer.level == 1?'rate1.png':rateBuyer.level == 2?'rate2.png':'rate3.png'}}" alt=""><span ng-bind="rateBuyer.level == 1?'好评':rateBuyer.level == 2?'中评':'差评'"></span></span>
 					</div>
-					<div class="rate-content">
-						<span>asdasdasdasdadaasdasdasdasdasdasdasdasdasdasdasdadsadssd</span>
+					<div class="rate-content" >
+						<span ng-bind="rateBuyer.vendorRate"></span>
 					</div>
 				</div>
 			</div>
@@ -1072,7 +1072,7 @@
 					</label>
 					<input type="search" ng-show="boxStatus == 1" class="form-control modal-select" ng-focus="setShowModalListFlag(true)" ng-blur="setShowModalListFlag(false)" readonly>
 					<ul ng-show="showModalListFlag" ng-mouseenter="setIsInListFlag(true)" ng-mouseleave="setIsInListFlag(false)">
-						<li ng-repeat="modal in modalData" ng-bind="modalData.rateTemplateName" ng-click="chooseModal(modal)"></li>
+						<li ng-repeat="modal in modalData" ng-bind="modal.rateTemplateName" ng-click="chooseModal(modal)"></li>
 						<li ng-click="addModal()" class="add-modal"><img src="static/img/vendor/images/rate-add.png" alt="">新增模板</li>
 					</ul>
 				</div>