接口修改

src/main/java/com/uas/platform/b2b/dao/PurchaseAcceptItemDao.java

@@ -39,7 +39,7 @@ public interface PurchaseAcceptItemDao extends JpaSpecificationExecutor<Purchase
 	 * @param needEndDate
 	 * @return
 	 */
-	@Query("from PurchaseAcceptItem p where p.accept.enUU = :enUU and p.accept.date >= :startDate and p.accept.date <= :endDate")
+	@Query("from PurchaseAcceptItem p where p.accept.enUU = :enUU and p.orderItem.order.date >= :startDate and p.orderItem.order.date <= :endDate")
 	List<PurchaseAcceptItem> findPurcAccsptItems(@Param("enUU") Long enUU, @Param("startDate") Date needStartDate, @Param("endDate") Date needEndDate);
 
 

src/main/java/com/uas/platform/b2b/publicapi/controller/UsoftFxController.java

@@ -38,7 +38,10 @@ public class UsoftFxController {
     public List<FxPurOrder> getPurcAcceptItems(@RequestParam("enUU") Long enUU,@RequestParam(value = "excludeAcceptItemIds",required = false) String excludeAcceptItemIds,
                                    @RequestParam(value = "startDate",required = false) Long startDate,
                                    @RequestParam(value = "endDate",required = false) Long endDate) throws UnsupportedEncodingException {
-        String acceptItems = URLDecoder.decode(excludeAcceptItemIds,"UTF-8");
+        String acceptItems = null;
+        if (!StringUtils.isEmpty(excludeAcceptItemIds)) {
+            acceptItems = URLDecoder.decode(excludeAcceptItemIds,"UTF-8");
+        }
         List<Long> excludeItemsIds = new ArrayList<>();
         if (!StringUtils.isEmpty(acceptItems)) {
             Long[] longs = (Long[]) ConvertUtils.convert(acceptItems.split(","),Long.class);

src/main/java/com/uas/platform/b2b/publicapi/model/FxPurOrder.java

@@ -87,12 +87,12 @@ public class FxPurOrder {
         this.date = date;
     }
 
-    public Set<FxPurcOrderItem> getOrderItemSet() {
+    public Set<FxPurcOrderItem> getOrderItems() {
         return orderItems;
     }
 
-    public void setOrderItemSet(Set<FxPurcOrderItem> orderItemSet) {
-        this.orderItems = orderItemSet;
+    public void setOrderItems(Set<FxPurcOrderItem> orderItems) {
+        this.orderItems = orderItems;
     }
 
     public FxPurOrder() {}

src/main/java/com/uas/platform/b2b/publicapi/model/FxPurcAcceptItem.java

@@ -42,12 +42,12 @@ public class FxPurcAcceptItem {
      */
     private FxPurcOrderItem orderItem;
 
-    public FxPurcOrderItem getPurcOrderItem() {
+    public FxPurcOrderItem getOrderItem() {
         return orderItem;
     }
 
-    public void setPurcOrderItem(FxPurcOrderItem purcOrderItem) {
-        this.orderItem = purcOrderItem;
+    public void setOrderItem(FxPurcOrderItem orderItem) {
+        this.orderItem = orderItem;
     }
 
     public Long getId() {

src/main/java/com/uas/platform/b2b/publicapi/model/FxPurcOrderItem.java

@@ -56,12 +56,20 @@ public class FxPurcOrderItem {
      */
     private FxPurOrder order;
 
-    public FxPurOrder getPurOrder() {
+    public Set<FxPurcAcceptItem> getAcceptItems() {
+        return acceptItems;
+    }
+
+    public void setAcceptItems(Set<FxPurcAcceptItem> acceptItems) {
+        this.acceptItems = acceptItems;
+    }
+
+    public FxPurOrder getOrder() {
         return order;
     }
 
-    public void setPurOrder(FxPurOrder purOrder) {
-        this.order = purOrder;
+    public void setOrder(FxPurOrder order) {
+        this.order = order;
     }
 
     public Long getId() {
@@ -128,14 +136,6 @@ public class FxPurcOrderItem {
         this.qty = qty;
     }
 
-    public Set<FxPurcAcceptItem> getAcceptItemSet() {
-        return acceptItems;
-    }
-
-    public void setAcceptItemSet(Set<FxPurcAcceptItem> acceptItemSet) {
-        this.acceptItems = acceptItemSet;
-    }
-
     public FxPurcOrderItem(){}
 
     public FxPurcOrderItem(PurchaseOrderItem orderItem,PurchaseAcceptItem needAcceptItem) {

src/main/java/com/uas/platform/b2b/publicapi/service/impl/UsoftFxServiceImpl.java

@@ -70,11 +70,11 @@ public class UsoftFxServiceImpl implements UsoftFxService{
                         if (order.getId().equals(fxPurOrder.getId())) {
                             if (!exitOrderItem) {
                                 fxPurOrder.setTotal(fxPurOrder.getTotal()+orderItem.getAmount());
-                                fxPurOrder.getOrderItemSet().add(new FxPurcOrderItem(orderItem,needAcceptItem));
+                                fxPurOrder.getOrderItems().add(new FxPurcOrderItem(orderItem,needAcceptItem));
                             } else {
-                                for (FxPurcOrderItem fxPurcOrderItem :fxPurOrder.getOrderItemSet()) {
+                                for (FxPurcOrderItem fxPurcOrderItem :fxPurOrder.getOrderItems()) {
                                     if (fxPurcOrderItem.getId().equals(orderItem.getId())) {
-                                        fxPurcOrderItem.getAcceptItemSet().add(new FxPurcAcceptItem(needAcceptItem));
+                                        fxPurcOrderItem.getAcceptItems().add(new FxPurcAcceptItem(needAcceptItem));
                                     }
                                 }
                             }