优化代码

java110-bean/src/main/java/com/java110/dto/paymentPool/PaymentPoolDto.java

@@ -1,9 +1,12 @@
 package com.java110.dto.paymentPool;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.paymentPoolConfig.PaymentPoolConfigDto;
+import com.java110.dto.paymentPoolValue.PaymentPoolValueDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -31,6 +34,10 @@ public class PaymentPoolDto extends PageDto implements Serializable {
 
     private String payType;
 
+    private List<PaymentPoolValueDto> values;
+
+    private List<PaymentPoolConfigDto> configs;
+
 
     private Date createTime;
 
@@ -125,4 +132,20 @@ public class PaymentPoolDto extends PageDto implements Serializable {
     public void setPayType(String payType) {
         this.payType = payType;
     }
+
+    public List<PaymentPoolValueDto> getValues() {
+        return values;
+    }
+
+    public void setValues(List<PaymentPoolValueDto> values) {
+        this.values = values;
+    }
+
+    public List<PaymentPoolConfigDto> getConfigs() {
+        return configs;
+    }
+
+    public void setConfigs(List<PaymentPoolConfigDto> configs) {
+        this.configs = configs;
+    }
 }

java110-bean/src/main/java/com/java110/dto/paymentPoolValue/PaymentPoolValueDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.paymentPoolValue;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,13 @@ import java.util.Date;
 public class PaymentPoolValueDto extends PageDto implements Serializable {
 
     private String valueId;
-private String columnValue;
-private String communityId;
-private String columnKey;
-private String ppId;
+    private String columnValue;
+    private String communityId;
+    private String columnKey;
+    private String ppId;
+
+    private String name;
+    private String remark;
 
 
     private Date createTime;
@@ -29,31 +33,40 @@ private String ppId;
     public String getValueId() {
         return valueId;
     }
-public void setValueId(String valueId) {
+
+    public void setValueId(String valueId) {
         this.valueId = valueId;
     }
-public String getColumnValue() {
+
+    public String getColumnValue() {
         return columnValue;
     }
-public void setColumnValue(String columnValue) {
+
+    public void setColumnValue(String columnValue) {
         this.columnValue = columnValue;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getColumnKey() {
+
+    public String getColumnKey() {
         return columnKey;
     }
-public void setColumnKey(String columnKey) {
+
+    public void setColumnKey(String columnKey) {
         this.columnKey = columnKey;
     }
-public String getPpId() {
+
+    public String getPpId() {
         return ppId;
     }
-public void setPpId(String ppId) {
+
+    public void setPpId(String ppId) {
         this.ppId = ppId;
     }
 
@@ -73,4 +86,20 @@ public void setPpId(String ppId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

service-acct/src/main/java/com/java110/acct/cmd/payment/ListPaymentPoolCmd.java

@@ -16,11 +16,16 @@
 package com.java110.acct.cmd.payment;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.acct.dao.IPaymentPoolValueV1ServiceDao;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.paymentPoolConfig.PaymentPoolConfigDto;
+import com.java110.dto.paymentPoolValue.PaymentPoolValueDto;
+import com.java110.intf.acct.IPaymentPoolConfigV1InnerServiceSMO;
 import com.java110.intf.acct.IPaymentPoolV1InnerServiceSMO;
+import com.java110.intf.acct.IPaymentPoolValueV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -54,6 +59,12 @@ public class ListPaymentPoolCmd extends Cmd {
     @Autowired
     private IPaymentPoolV1InnerServiceSMO paymentPoolV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IPaymentPoolValueV1InnerServiceSMO paymentPoolValueV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IPaymentPoolConfigV1InnerServiceSMO paymentPoolConfigV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
@@ -76,10 +87,32 @@ public class ListPaymentPoolCmd extends Cmd {
             paymentPoolDtos = new ArrayList<>();
         }
 
+        //todo 补充config 和value
+        computeConfigAndValues(paymentPoolDtos);
+
         ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, paymentPoolDtos);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }
+
+    private void computeConfigAndValues(List<PaymentPoolDto> paymentPoolDtos) {
+
+        if(paymentPoolDtos == null || paymentPoolDtos.isEmpty()){
+            return;
+        }
+
+        PaymentPoolValueDto paymentPoolValueDto = new PaymentPoolValueDto();
+        paymentPoolValueDto.setPpId(paymentPoolDtos.get(0).getPpId());
+        paymentPoolValueDto.setCommunityId(paymentPoolDtos.get(0).getCommunityId());
+       List<PaymentPoolValueDto> values =  paymentPoolValueV1InnerServiceSMOImpl.queryPaymentPoolValues(paymentPoolValueDto);
+       paymentPoolDtos.get(0).setValues(values);
+
+        PaymentPoolConfigDto paymentPoolConfigDto = new PaymentPoolConfigDto();
+        paymentPoolConfigDto.setPpId(paymentPoolDtos.get(0).getPpId());
+        paymentPoolConfigDto.setCommunityId(paymentPoolDtos.get(0).getCommunityId());
+        List<PaymentPoolConfigDto> configs =  paymentPoolConfigV1InnerServiceSMOImpl.queryPaymentPoolConfigs(paymentPoolConfigDto);
+        paymentPoolDtos.get(0).setConfigs(configs);
+    }
 }