Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java

@@ -285,9 +285,9 @@ public class PayOweFeeCmd extends Cmd {
 
         businessFee.putAll(feeMap);
         PayFeePo payFeePo =  BeanConvertUtil.covertBean(businessFee,PayFeePo.class);
-        int flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
+        int flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
         if (flag < 1) {
-            throw new CmdException("保存失败");
+            throw new CmdException("修改失败");
         }
     }
 

springboot/src/main/java/com/java110/boot/components/fee/FeeSummaryComponent.java

@@ -0,0 +1,42 @@
+package com.java110.boot.components.fee;
+
+
+import com.java110.boot.smo.fee.IListFeeSummarySMO;
+import com.java110.core.context.IPageData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 应用组件管理类
+ * <p>
+ * add by wuxw
+ * <p>
+ * 2019-06-29
+ */
+@Component("feeSummary")
+public class FeeSummaryComponent {
+
+    @Autowired
+    private IListFeeSummarySMO listFeeSummarySMOImpl;
+
+
+    /**
+     * 查询应用列表
+     *
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd) {
+        return listFeeSummarySMOImpl.list(pd);
+    }
+
+    public IListFeeSummarySMO getListFeeSummarySMOImpl() {
+        return listFeeSummarySMOImpl;
+    }
+
+    public void setListFeeSummarySMOImpl(IListFeeSummarySMO listFeeSummarySMOImpl) {
+        this.listFeeSummarySMOImpl = listFeeSummarySMOImpl;
+    }
+}

springboot/src/main/java/com/java110/boot/smo/fee/IListFeeSummarySMO.java

@@ -0,0 +1,8 @@
+package com.java110.boot.smo.fee;
+
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+
+public interface IListFeeSummarySMO {
+    public ResponseEntity<String> list(IPageData pd);
+}

springboot/src/main/java/com/java110/boot/smo/fee/impl/ListFeeSummarySMOImpl.java

@@ -0,0 +1,74 @@
+package com.java110.boot.smo.fee.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.boot.smo.DefaultAbstractComponentSMO;
+import com.java110.boot.smo.fee.IListFeeSummarySMO;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 查询app服务类
+ */
+@Service("listFeeSummarySMOImpl")
+public class ListFeeSummarySMOImpl extends DefaultAbstractComponentSMO implements IListFeeSummarySMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    public ResponseEntity<String> list(IPageData pd) throws SMOException {
+        return businessProcess(pd);
+    }
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        super.validatePageInfo(pd);
+        Assert.hasKeyAndValue(paramIn, "communityId", "未包含小区信息");
+        Assert.hasKeyAndValue(paramIn, "feeSummaryType", "未包含小区信息");
+
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        int page = paramIn.getInteger("page");
+        int row = paramIn.getInteger("row");
+        paramIn.put("page", (page - 1) * row);
+        paramIn.put("row", page * row);
+
+        if ("1001".equals(paramIn.getString("feeSummaryType"))) {//日
+            paramIn.put("formatStr", "%Y-%m-%d");
+        } else if ("1101".equals(paramIn.getString("feeSummaryType"))) {
+            paramIn.put("formatStr", "%Y-%m");
+        } else {
+            paramIn.put("formatStr", "%Y");
+        }
+
+        String apiUrl = "";
+        apiUrl = "api.queryFeeSummary" + mapToUrlParam(paramIn);
+
+
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+
+        return responseEntity;
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}