Explorar o código

评价:数据获取分页

wangdy %!s(int64=8) %!d(string=hai) anos
pai
achega
f9f59d2e54

+ 6 - 2
src/main/java/com/uas/platform/b2c/trade/rate/controller/RateController.java

@@ -17,9 +17,12 @@ 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.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -261,8 +264,9 @@ public class RateController {
      * @return
      */
     @RequestMapping(value = "/rateGoodsByOrderId/{orderId}", method = RequestMethod.GET)
-    public ResultMap getRateGoodsByOrderId(@PathVariable("orderId")String orderId){
-        List<RateGoods> result = rateService.getRateGoodsByOrderId(orderId);
+    public ResultMap getRateGoodsByOrderId(@PathVariable("orderId")String orderId,PageParams params){
+        PageInfo pageInfo = new PageInfo(params);
+        Page<RateGoods> result = rateService.getRateGoodsByOrderId(orderId,pageInfo);
         return new ResultMap(CodeType.OK.code(), "查询成功",result);
     }
     /**

+ 3 - 1
src/main/java/com/uas/platform/b2c/trade/rate/service/RateService.java

@@ -4,6 +4,8 @@ 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;
 import com.uas.platform.b2c.trade.rate.model.RateVendor;
+import com.uas.platform.core.model.PageInfo;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -111,7 +113,7 @@ public interface RateService {
 
     RateGoods  getRateGoodsByGoodsId(Long goodsId);
 
-    List<RateGoods>  getRateGoodsByOrderId(String orderId);
+    Page<RateGoods> getRateGoodsByOrderId(String orderId, PageInfo pageInfo);
 
 
 }

+ 15 - 3
src/main/java/com/uas/platform/b2c/trade/rate/service/impl/RateServiceImpl.java

@@ -15,13 +15,19 @@ import com.uas.platform.b2c.trade.rate.model.RateTemplate;
 import com.uas.platform.b2c.trade.rate.model.RateVendor;
 import com.uas.platform.b2c.trade.rate.service.RateService;
 import com.uas.platform.core.exception.IllegalOperatorException;
+import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import org.apache.kafka.common.metrics.stats.Rate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.index.Index;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -223,7 +229,13 @@ public class RateServiceImpl implements RateService{
     }
 
     @Override
-    public List<RateGoods> getRateGoodsByOrderId(String orderId) {
-        return rateGoodsDao.findByOrderId(orderId);
+    public Page<RateGoods> getRateGoodsByOrderId(String orderId, final PageInfo pageInfo) {
+        return rateGoodsDao.findAll(new Specification<RateGoods>() {
+            @Override
+            public Predicate toPredicate(Root<RateGoods> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+                query.where(pageInfo.getPredicates(root, query, builder));
+                return null;
+            }
+        }, pageInfo);
     }
 }

+ 4 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/show_rate_ctrl.js

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

+ 12 - 12
src/main/webapp/resources/view/usercenter/forstore/show_rate.html

@@ -188,16 +188,16 @@
     </div>
     <table>
         <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>
@@ -260,21 +260,21 @@
                     </div>
                 </div>
                 <div class="buyer-first-rate">
-                    <div class="buyer-first-rate02" style="margin-left: 100px">
+                    <div class="buyer-first-rate02" style="margin-left: 100px" ng-if="detail.returnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
-                            <span class="rate-date">2017-06-05</span>
+                            <span class="rate-date" ng-bind="detail.returnMegTime"></span>
                         </div>
                         <div class="comment">
-                            <span>谢谢亲阿双方打款付了哈咖啡韩哈见客户</span></div>
+                            <span ng-bind="detail.returnMeg"></span></div>
                     </div>
-                    <div class="buyer-first-rate02">
+                    <div class="buyer-first-rate02" ng-if="detail.afterReturnMeg">
                         <div>
                             <span style="color:#6083ce;">卖家回复</span>
-                            <span class="rate-date">2017-06-05</span>
+                            <span class="rate-date" ng-bind="detail.afterReturnMegTime"></span>
                         </div>
                         <div class="comment">
-                            <span>谢谢亲阿双方打款付了哈咖啡韩哈见客户</span></div>
+                            <span ng-bind="detail.afterReturnMeg"></span></div>
                     </div>
                 </div>
             </td>