Browse Source

评价:开始卖家评价模块

wangdy 8 years ago
parent
commit
d49e4cc600

+ 18 - 0
src/main/java/com/uas/platform/b2c/trade/order/model/Purchase.java

@@ -633,6 +633,24 @@ public class Purchase extends Document implements Serializable {
 		this.status = Status.TOBEPAID.value();
 		this.status = Status.TOBEPAID.value();
 		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
 		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
 	}
 	}
+	/**
+	 * 设置为已初评
+	 *
+	 * @param uu the uu
+	 */
+	public void setTobeRate(Long uu) {
+		this.status = Status.TO_BE_AFTERREVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
+	/**
+	 * 设置为已追评
+	 *
+	 * @param uu the uu
+	 */
+	public void setTobeAfterRate(Long uu) {
+		this.status = Status.REVIEWED.value();
+		this.statushistory = addStatusHistory(this.statushistory, uu, this.status);
+	}
 
 
 	/**
 	/**
 	 * Sets status un available personal.
 	 * Sets status un available personal.

+ 6 - 1
src/main/java/com/uas/platform/b2c/trade/order/status/PurchaseStatus.java

@@ -34,7 +34,12 @@ public enum PurchaseStatus {
 	/**
 	/**
 	 * {@code unavailable 售后中}
 	 * {@code unavailable 售后中}
 	 */
 	 */
-	TOBEREVIEWED("toBeReviewed","404-503-520");
+	TOBEREVIEWED("toBeReviewed","404-503"),
+
+	/**
+	 * {@code unavailable 待评价}
+	 */
+	TOBERATE("toBeRate","523-520");
 
 
 	/**
 	/**
 	 * 状态名称
 	 * 状态名称

+ 17 - 1
src/main/java/com/uas/platform/b2c/trade/rate/controller/RateController.java

@@ -4,8 +4,10 @@ package com.uas.platform.b2c.trade.rate.controller;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.dao.OrderDao;
+import com.uas.platform.b2c.trade.order.dao.PurchaseDao;
 import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.model.OrderDetail;
 import com.uas.platform.b2c.trade.order.model.OrderDetail;
+import com.uas.platform.b2c.trade.order.model.Purchase;
 import com.uas.platform.b2c.trade.rate.model.RateBuyer;
 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.RateGoods;
 import com.uas.platform.b2c.trade.rate.model.RateTemplate;
 import com.uas.platform.b2c.trade.rate.model.RateTemplate;
@@ -35,6 +37,9 @@ public class RateController {
     @Autowired
     @Autowired
     private OrderDao   orderDao;
     private OrderDao   orderDao;
 
 
+    @Autowired
+    private PurchaseDao purchaseDao;
+
     /**
     /**
      * 买家评价卖家店铺
      * 买家评价卖家店铺
      *
      *
@@ -127,7 +132,12 @@ public class RateController {
         rateBuyer.setVendorRateTime(new Date(System.currentTimeMillis()));
         rateBuyer.setVendorRateTime(new Date(System.currentTimeMillis()));
         RateBuyer result = rateService.saveRateBuyer(rateBuyer);
         RateBuyer result = rateService.saveRateBuyer(rateBuyer);
         //TODO 改变采购单状态
         //TODO 改变采购单状态
-
+        Purchase purchase = purchaseDao.findByPurchaseid(purchaseId);
+        if (purchase.getStatus().intValue() != Status.COMPLETED.value()) {
+            throw new IllegalOperatorException("当前订单未完成,不能评价");
+        }
+        purchase.setTobeRate(SystemSession.getUser().getUserUU());
+        purchaseDao.save(purchase);
         return new ResultMap(CodeType.OK.code(), "评价成功",result);
         return new ResultMap(CodeType.OK.code(), "评价成功",result);
 
 
     }
     }
@@ -147,6 +157,12 @@ public class RateController {
         rateBuyer.setVendorRateTime(new Date(System.currentTimeMillis()));
         rateBuyer.setVendorRateTime(new Date(System.currentTimeMillis()));
         RateBuyer result = rateService.saveRateBuyer(rateBuyer);
         RateBuyer result = rateService.saveRateBuyer(rateBuyer);
 
 
+        Purchase purchase = purchaseDao.findByPurchaseid(purchaseId);
+        if (purchase.getStatus().intValue() != Status.TO_BE_AFTERREVIEWED.value()) {
+            throw new IllegalOperatorException("当前订单未初评,不能追评");
+        }
+        purchase.setTobeAfterRate(SystemSession.getUser().getUserUU());
+        purchaseDao.save(purchase);
         return new ResultMap(CodeType.OK.code(), "追评成功",result);
         return new ResultMap(CodeType.OK.code(), "追评成功",result);
 
 
     }
     }

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -942,7 +942,7 @@
                                 <a href="vendor#/purchase/detail/{{purchase.purchaseid | EncryptionFilter}}" class="oder_d action-link" target="_blank">订单详情</a><br/>
                                 <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>
                                 <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" 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;">双方已评</a>
+                           		<a class="oder_d action-link" ng-if="purchase.status == 522" target="_blank" href="vendor#/showRate/1" style="display: block;">双方已评</a>
                             </div>
                             </div>
                         </span>
                         </span>
 						<span class="click_shop">
 						<span class="click_shop">
@@ -950,8 +950,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 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 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-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>
-								<a class="order-operation" href="javascript:void(0)" style="position: relative;">追加评价</a>
-								<a class="order-operation" href="javascript:void(0)" style="position: relative;">评价</a>
+								<a class="order-operation" ng-if="purchase.status == 523" href="javascript:void(0)" style="position: relative;">追加评价</a>
+								<a class="order-operation" ng-if="purchase.status == 520" href="javascript:void(0)" style="position: relative;">评价</a>
 								<div class="seller-ship-tip" ng-if="purchase.status == 404 && purchase.lgtId &&!purchase.uasPurcid" style="position: relative;">
 								<div class="seller-ship-tip" ng-if="purchase.status == 404 && purchase.lgtId &&!purchase.uasPurcid" style="position: relative;">
                                     <img src="static/img/common/notice-tip.png" ng-mouseover="purchase.noticeTip = true" ng-mouseleave="purchase.noticeTip = false"/>
                                     <img src="static/img/common/notice-tip.png" ng-mouseover="purchase.noticeTip = true" ng-mouseleave="purchase.noticeTip = false"/>
                                     <div class="ship-notify" ng-if="purchase.noticeTip">
                                     <div class="ship-notify" ng-if="purchase.noticeTip">