完善评价模块接口设计3

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

@@ -3,9 +3,6 @@ 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.prod.store.model.StoreIn;
-import com.uas.platform.b2c.prod.store.service.StoreInService;
-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;
@@ -15,7 +12,6 @@ import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.method.P;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -31,8 +27,6 @@ public class RateController {
 
     @Autowired
     private RateService rateService;
-    @Autowired
-    private StoreInService storeInService;
 
     /**
      * 买家评价卖家店铺
@@ -114,8 +108,8 @@ public class RateController {
     @RequestMapping(value = "/rateBuyer/{purchaseId}", method = RequestMethod.POST)
     public ResultMap saveRateBuyer(@PathVariable("purchaseId") String purchaseId, @RequestBody String json) {
         RateBuyer rateBuyer = FastjsonUtils.fromJson(json, RateBuyer.class);
-        rateBuyer.setUserUU(SystemSession.getUser().getUserUU());
-        rateBuyer.setUserEnuu(SystemSession.getUser().getEnterprise().getUu());
+        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);
@@ -134,8 +128,8 @@ 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.setUserUU(SystemSession.getUser().getUserUU());
-        rateBuyer.setUserEnuu(SystemSession.getUser().getEnterprise().getUu());
+        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);
@@ -154,7 +148,7 @@ public class RateController {
     public ResultMap saveRateTemplate(@PathVariable("storeuuid") String storeuuid, @RequestBody String json) {
         RateTemplate rateTemplate = FastjsonUtils.fromJson(json, RateTemplate.class);
         rateTemplate.setUserUU(SystemSession.getUser().getUserUU());
-        rateTemplate.setStoreId((storeInService.findByUuid(storeuuid)).getId());
+        rateTemplate.setStoreId(storeuuid);
 
         rateTemplate.setCreateTime(new Date(System.currentTimeMillis()));
         RateTemplate result = rateService.saveRateTemplate(rateTemplate);
@@ -180,7 +174,7 @@ public class RateController {
      * @param  returnMeg
      * @return the result map
      */
-    @RequestMapping(value = "/rateReply/{orderId}", method = RequestMethod.POST)
+    @RequestMapping(value = "/afterRateReply/{orderId}", method = RequestMethod.POST)
     public ResultMap saveAfterReply(@PathVariable("orderId") String orderId, @RequestParam String goodsId, @RequestParam String returnMeg) {
         RateGoods result = rateService.saveAfterReply(orderId,goodsId,returnMeg);
         return new ResultMap(CodeType.OK.code(), "回复成功",result);
@@ -195,8 +189,7 @@ public class RateController {
      */
     @RequestMapping(value = "/rateTemplate/{storeuuid}", method = RequestMethod.GET)
     public ResultMap getRateTemplate(@PathVariable("storeuuid") String storeuuid){
-        Long storeid = storeInService.findByUuid(storeuuid).getId();
-        List<RateTemplate> result = rateService.getRateTempalteByStoreId(storeid);
+        List<RateTemplate> result = rateService.getRateTempalteByStoreId(storeuuid);
         return new ResultMap(CodeType.OK.code(), "查询成功",result);
     }
 

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

@@ -26,5 +26,5 @@ public interface RateTemplateDao extends JpaSpecificationExecutor<RateTemplate>,
      * @param storeID
      * @return
      */
-    List<RateTemplate> findByStoreId(Long storeID);
+    List<RateTemplate> findByStoreId(String storeID);
 }

src/main/java/com/uas/platform/b2c/trade/rate/model/RateBuyer.java

@@ -53,11 +53,16 @@ public class RateBuyer implements Serializable{
     @Column(name = "enuu")
     private Long enuu;
 
+    /**
+     * 评价人uu
+     */
+    @Column(name = "vendor—_useruu")
+    private Long vendorUseruu;
     /**
      * 卖家店铺id
      */
     @Column(name = "store_id")
-    private Long storeId;
+    private String storeId;
 
     /**
      * 评价等级
@@ -124,11 +129,11 @@ public class RateBuyer implements Serializable{
         this.enuu = enuu;
     }
 
-    public Long getStoreId() {
+    public String getStoreId() {
         return storeId;
     }
 
-    public void setStoreId(Long storeId) {
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 
@@ -179,4 +184,12 @@ public class RateBuyer implements Serializable{
     public void setPurchaseId(String purchaseId) {
         this.purchaseId = purchaseId;
     }
+
+    public Long getVendorUseruu() {
+        return vendorUseruu;
+    }
+
+    public void setVendorUseruu(Long vendorUseruu) {
+        this.vendorUseruu = vendorUseruu;
+    }
 }

src/main/java/com/uas/platform/b2c/trade/rate/model/RateGoods.java

@@ -59,7 +59,7 @@ public class RateGoods implements Serializable{
      * 卖家店铺id
      */
     @Column(name = "store_id")
-    private Long storeId;
+    private String storeId;
 
     /**
      * 评价等级
@@ -101,7 +101,7 @@ public class RateGoods implements Serializable{
 
 
 
-    /**********买家卖家初评追评时间*************/
+    /**********买家初评追评时间*************/
 
     @Column(name = "buyer_ratetime")
     private Date buyerRateTime;
@@ -110,6 +110,13 @@ public class RateGoods implements Serializable{
     @Column(name = "buyer_afterratetime")
     private Date buyerAfterRateTime;
 
+    @Column(name = "return_megtime")
+    private Date returnMegTime;
+
+
+    @Column(name = "afterreturn_megtime")
+    private Date afterReturnMegTime;
+
 
     /****************************************/
 
@@ -161,11 +168,11 @@ public class RateGoods implements Serializable{
         this.enuu = enuu;
     }
 
-    public Long getStoreId() {
+    public String getStoreId() {
         return storeId;
     }
 
-    public void setStoreId(Long storeId) {
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 
@@ -235,4 +242,20 @@ public class RateGoods implements Serializable{
     public void setAfterReturnMeg(String afterReturnMeg) {
         this.afterReturnMeg = afterReturnMeg;
     }
+
+    public Date getReturnMegTime() {
+        return returnMegTime;
+    }
+
+    public void setReturnMegTime(Date returnMegTime) {
+        this.returnMegTime = returnMegTime;
+    }
+
+    public Date getAfterReturnMegTime() {
+        return afterReturnMegTime;
+    }
+
+    public void setAfterReturnMegTime(Date afterReturnMegTime) {
+        this.afterReturnMegTime = afterReturnMegTime;
+    }
 }

src/main/java/com/uas/platform/b2c/trade/rate/model/RateTemplate.java

@@ -49,7 +49,7 @@ public class RateTemplate implements Serializable{
      * 所属店铺id
      */
     @Column(name = "storeid")
-    private Long storeId;
+    private String storeId;
 
     /**
      * 所属店铺
@@ -100,11 +100,11 @@ public class RateTemplate implements Serializable{
         this.rateTemplateContent = rateTemplateContent;
     }
 
-    public Long getStoreId() {
+    public String getStoreId() {
         return storeId;
     }
 
-    public void setStoreId(Long storeId) {
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 

src/main/java/com/uas/platform/b2c/trade/rate/model/RateVendor.java

@@ -51,22 +51,22 @@ public class RateVendor implements Serializable{
      * 卖家店铺id
      */
     @Column(name = "store_id")
-    private Long storeId;
+    private String storeId;
 
     /**
-     * 评价星级
+     * 评价星级 (描述相符)
      */
     @Column(name = "describe_level")
     private Short describeLevel;
 
     /**
-     * 评价星级
+     * 评价星级 (卖家服务)
      */
     @Column(name = "vendor_level")
     private Short vendorLevel;
 
     /**
-     * 评价星级
+     * 评价星级 (物流服务)
      */
     @Column(name = "logistics_level")
     private Short logisticsLevel;
@@ -117,11 +117,11 @@ public class RateVendor implements Serializable{
         this.enuu = enuu;
     }
 
-    public Long getStoreId() {
+    public String getStoreId() {
         return storeId;
     }
 
-    public void setStoreId(Long storeId) {
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
 

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

@@ -78,7 +78,7 @@ public interface RateService {
      * @param storeId
      * @return
      */
-    List<RateTemplate> getRateTempalteByStoreId(Long storeId);
+    List<RateTemplate> getRateTempalteByStoreId(String storeId);
 
 
     /******************************************************************/

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

@@ -82,7 +82,7 @@ public class RateServiceImpl implements RateService{
     }
 
     @Override
-    public List<RateTemplate> getRateTempalteByStoreId(Long storeId) {
+    public List<RateTemplate> getRateTempalteByStoreId(String storeId) {
         return rateTemplateDao.findByStoreId(storeId);
     }