|
@@ -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.model.RateVendor;
|
|
|
import com.uas.platform.b2c.trade.rate.service.RateService;
|
|
import com.uas.platform.b2c.trade.rate.service.RateService;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
|
|
+import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.Status;
|
|
import com.uas.platform.core.model.Status;
|
|
|
import org.apache.kafka.common.metrics.stats.Rate;
|
|
import org.apache.kafka.common.metrics.stats.Rate;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
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.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
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.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -223,7 +229,13 @@ public class RateServiceImpl implements RateService{
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@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);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|