优化代码

java110-bean/src/main/java/com/java110/dto/feeDiscountSpec/FeeDiscountSpecDto.java

@@ -4,6 +4,7 @@ import com.java110.dto.PageDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -24,6 +25,8 @@ public class FeeDiscountSpecDto extends PageDto implements Serializable {
     private String communityId;
 
 
+
+
     private Date createTime;
 
     private String statusCd = "0";
@@ -101,4 +104,5 @@ public class FeeDiscountSpecDto extends PageDto implements Serializable {
     public void setDiscountSpecId(String discountSpecId) {
         this.discountSpecId = discountSpecId;
     }
+
 }

java110-bean/src/main/java/com/java110/dto/payFeeConfigDiscount/PayFeeConfigDiscountDto.java

@@ -1,9 +1,11 @@
 package com.java110.dto.payFeeConfigDiscount;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -22,7 +24,7 @@ public class PayFeeConfigDiscountDto extends PageDto implements Serializable {
 
     private String  discountName;
     private String discountType;
-
+    private List<FeeDiscountSpecDto> feeDiscountSpecs;
 
     private Date createTime;
 
@@ -93,4 +95,12 @@ public class PayFeeConfigDiscountDto extends PageDto implements Serializable {
     public void setDiscountType(String discountType) {
         this.discountType = discountType;
     }
+
+    public List<FeeDiscountSpecDto> getFeeDiscountSpecs() {
+        return feeDiscountSpecs;
+    }
+
+    public void setFeeDiscountSpecs(List<FeeDiscountSpecDto> feeDiscountSpecs) {
+        this.feeDiscountSpecs = feeDiscountSpecs;
+    }
 }

service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java

@@ -109,7 +109,7 @@ public class FeeDiscountApi {
      */
     @RequestMapping(value = "/queryFeeDiscount", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeDiscount(@RequestParam(value = "communityId") String communityId,
-                                                   @RequestParam(value = "discountType") String discountType,
+                                                   @RequestParam(value = "discountType", required = false) String discountType,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
         FeeDiscountDto feeDiscountDto = new FeeDiscountDto();

service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java

@@ -1,7 +1,10 @@
 package com.java110.fee.bmo.payFeeConfigDiscount.impl;
 
+import com.java110.dto.feeDiscount.FeeDiscountDto;
+import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
 import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
 import com.java110.fee.bmo.payFeeConfigDiscount.IGetPayFeeConfigDiscountBMO;
+import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeConfigDiscountInnerServiceSMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,9 @@ public class GetPayFeeConfigDiscountBMOImpl implements IGetPayFeeConfigDiscountB
     @Autowired
     private IPayFeeConfigDiscountInnerServiceSMO payFeeConfigDiscountInnerServiceSMOImpl;
 
+    @Autowired
+    private IFeeDiscountSpecInnerServiceSMO feeDiscountSpecInnerServiceSMOImpl;
+
     /**
      * @param payFeeConfigDiscountDto
      * @return 订单服务能够接受的报文
@@ -30,6 +36,7 @@ public class GetPayFeeConfigDiscountBMOImpl implements IGetPayFeeConfigDiscountB
         List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos = null;
         if (count > 0) {
             payFeeConfigDiscountDtos = payFeeConfigDiscountInnerServiceSMOImpl.queryPayFeeConfigDiscounts(payFeeConfigDiscountDto);
+            freshDiscountSpec(payFeeConfigDiscountDtos);
         } else {
             payFeeConfigDiscountDtos = new ArrayList<>();
         }
@@ -41,4 +48,38 @@ public class GetPayFeeConfigDiscountBMOImpl implements IGetPayFeeConfigDiscountB
         return responseEntity;
     }
 
+    private void freshDiscountSpec(List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos) {
+
+        if (payFeeConfigDiscountDtos == null || payFeeConfigDiscountDtos.size() < 1) {
+            return;
+        }
+
+        List<String> discountIds = new ArrayList<>();
+        for (PayFeeConfigDiscountDto payFeeConfigDiscountDto : payFeeConfigDiscountDtos) {
+            discountIds.add(payFeeConfigDiscountDto.getDiscountId());
+        }
+
+        FeeDiscountSpecDto tmpFeeDiscountSpecDto = new FeeDiscountSpecDto();
+
+        tmpFeeDiscountSpecDto.setDiscountIds(discountIds.toArray(new String[discountIds.size()]));
+        tmpFeeDiscountSpecDto.setCommunityId(payFeeConfigDiscountDtos.get(0).getCommunityId());
+
+        List<FeeDiscountSpecDto> feeDiscountSpecDtos = feeDiscountSpecInnerServiceSMOImpl.queryFeeDiscountSpecs(tmpFeeDiscountSpecDto);
+
+        if (feeDiscountSpecDtos == null || feeDiscountSpecDtos.size() < 1) {
+            return;
+        }
+        List<FeeDiscountSpecDto> tmpSpecs = null;
+        for (PayFeeConfigDiscountDto payFeeConfigDiscountDto : payFeeConfigDiscountDtos) {
+            tmpSpecs = new ArrayList<>();
+            for (FeeDiscountSpecDto feeDiscountSpecDto : feeDiscountSpecDtos) {
+                if (payFeeConfigDiscountDto.getDiscountId().equals(feeDiscountSpecDto.getDiscountId())) {
+                    tmpSpecs.add(feeDiscountSpecDto);
+
+                }
+            }
+            payFeeConfigDiscountDto.setFeeDiscountSpecs(tmpSpecs);
+        }
+    }
+
 }