java110 лет назад: 5
Родитель
Сommit
6a3fc652bd
19 измененных файлов с 991 добавлено и 20 удалено
  1. 90 0
      java110-bean/src/main/java/com/java110/dto/payFeeAudit/PayFeeAuditDto.java
  2. 73 0
      java110-bean/src/main/java/com/java110/po/payFeeAudit/PayFeeAuditPo.java
  3. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  4. 130 0
      java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
  5. 14 20
      java110-generator/src/main/resources/newBack/template_1.json
  6. 49 0
      java110-generator/src/main/resources/newBack/template_manualCollectionDetail.json
  7. 53 0
      java110-interface/src/main/java/com/java110/intf/fee/IPayFeeAuditInnerServiceSMO.java
  8. 117 0
      service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
  9. 17 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/IDeletePayFeeAuditBMO.java
  10. 19 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/IGetPayFeeAuditBMO.java
  11. 19 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/ISavePayFeeAuditBMO.java
  12. 17 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/IUpdatePayFeeAuditBMO.java
  13. 34 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/DeletePayFeeAuditBMOImpl.java
  14. 44 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java
  15. 38 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/SavePayFeeAuditBMOImpl.java
  16. 34 0
      service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/UpdatePayFeeAuditBMOImpl.java
  17. 61 0
      service-fee/src/main/java/com/java110/fee/dao/IPayFeeAuditServiceDao.java
  18. 98 0
      service-fee/src/main/java/com/java110/fee/dao/impl/PayFeeAuditServiceDaoImpl.java
  19. 83 0
      service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeAuditInnerServiceSMOImpl.java

+ 90 - 0
java110-bean/src/main/java/com/java110/dto/payFeeAudit/PayFeeAuditDto.java

@@ -0,0 +1,90 @@
+package com.java110.dto.payFeeAudit;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 缴费审核数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class PayFeeAuditDto extends PageDto implements Serializable {
+
+    private String auditUserId;
+private String auditUserName;
+private String feeDetailId;
+private String state;
+private String message;
+private String communityId;
+private String feeId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getAuditUserId() {
+        return auditUserId;
+    }
+public void setAuditUserId(String auditUserId) {
+        this.auditUserId = auditUserId;
+    }
+public String getAuditUserName() {
+        return auditUserName;
+    }
+public void setAuditUserName(String auditUserName) {
+        this.auditUserName = auditUserName;
+    }
+public String getFeeDetailId() {
+        return feeDetailId;
+    }
+public void setFeeDetailId(String feeDetailId) {
+        this.feeDetailId = feeDetailId;
+    }
+public String getState() {
+        return state;
+    }
+public void setState(String state) {
+        this.state = state;
+    }
+public String getMessage() {
+        return message;
+    }
+public void setMessage(String message) {
+        this.message = message;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getFeeId() {
+        return feeId;
+    }
+public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

+ 73 - 0
java110-bean/src/main/java/com/java110/po/payFeeAudit/PayFeeAuditPo.java

@@ -0,0 +1,73 @@
+package com.java110.po.payFeeAudit;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class PayFeeAuditPo implements Serializable {
+
+    private String auditId;
+    private String auditUserId;
+private String auditUserName;
+private String feeDetailId;
+private String statusCd = "0";
+private String state;
+private String message;
+private String communityId;
+private String feeId;
+public String getAuditUserId() {
+        return auditUserId;
+    }
+public void setAuditUserId(String auditUserId) {
+        this.auditUserId = auditUserId;
+    }
+public String getAuditUserName() {
+        return auditUserName;
+    }
+public void setAuditUserName(String auditUserName) {
+        this.auditUserName = auditUserName;
+    }
+public String getFeeDetailId() {
+        return feeDetailId;
+    }
+public void setFeeDetailId(String feeDetailId) {
+        this.feeDetailId = feeDetailId;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getState() {
+        return state;
+    }
+public void setState(String state) {
+        this.state = state;
+    }
+public String getMessage() {
+        return message;
+    }
+public void setMessage(String message) {
+        this.message = message;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getFeeId() {
+        return feeId;
+    }
+public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
+
+    public String getAuditId() {
+        return auditId;
+    }
+
+    public void setAuditId(String auditId) {
+        this.auditId = auditId;
+    }
+}

+ 1 - 0
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -152,6 +152,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_templateId = "82";
     public static final String CODE_PREFIX_printId = "83";
     public static final String CODE_PREFIX_receiptId = "83";
+    public static final String CODE_PREFIX_auditId = "84";
 
 
 

+ 130 - 0
java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="payFeeAuditServiceDaoImpl">
+
+
+    <!-- 保存缴费审核信息 add by wuxw 2018-07-03 -->
+    <insert id="savePayFeeAuditInfo" parameterType="Map">
+        insert into pay_fee_audit(
+        audit_user_id,audit_user_name,fee_detail_id,state,message,community_id,fee_id,audit_id
+        ) values (
+        #{auditUserId},#{auditUserName},#{feeDetailId},#{state},#{message},#{communityId},#{feeId},#{auditId}
+        )
+    </insert>
+
+
+    <!-- 查询缴费审核信息 add by wuxw 2018-07-03 -->
+    <select id="getPayFeeAuditInfo" parameterType="Map" resultType="Map">
+        select t.audit_user_id,t.audit_user_id auditUserId,t.audit_user_name,t.audit_user_name
+        auditUserName,t.fee_detail_id,t.fee_detail_id feeDetailId,t.status_cd,t.status_cd
+        statusCd,t.state,t.message,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,
+        t.audit_id auditId
+        from pay_fee_audit t
+        where 1 =1
+        <if test="auditUserId !=null and auditUserId != ''">
+            and t.audit_user_id= #{auditUserId}
+        </if>
+        <if test="auditUserName !=null and auditUserName != ''">
+            and t.audit_user_name= #{auditUserName}
+        </if>
+        <if test="feeDetailId !=null and feeDetailId != ''">
+            and t.fee_detail_id= #{feeDetailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="message !=null and message != ''">
+            and t.message= #{message}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="auditId !=null and auditId != ''">
+            and t.audit_id= #{auditId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改缴费审核信息 add by wuxw 2018-07-03 -->
+    <update id="updatePayFeeAuditInfo" parameterType="Map">
+        update pay_fee_audit t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="auditUserId !=null and auditUserId != ''">
+            , t.audit_user_id= #{auditUserId}
+        </if>
+        <if test="auditUserName !=null and auditUserName != ''">
+            , t.audit_user_name= #{auditUserName}
+        </if>
+        <if test="feeDetailId !=null and feeDetailId != ''">
+            , t.fee_detail_id= #{feeDetailId}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="message !=null and message != ''">
+            , t.message= #{message}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            , t.fee_id= #{feeId}
+        </if>
+        where 1=1
+        <if test="auditId !=null and auditId != ''">
+            and t.audit_id= #{auditId}
+        </if>
+    </update>
+
+    <!-- 查询缴费审核数量 add by wuxw 2018-07-03 -->
+    <select id="queryPayFeeAuditsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from pay_fee_audit t
+        where 1 =1
+        <if test="auditUserId !=null and auditUserId != ''">
+            and t.audit_user_id= #{auditUserId}
+        </if>
+        <if test="auditUserName !=null and auditUserName != ''">
+            and t.audit_user_name= #{auditUserName}
+        </if>
+        <if test="feeDetailId !=null and feeDetailId != ''">
+            and t.fee_detail_id= #{feeDetailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="message !=null and message != ''">
+            and t.message= #{message}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="auditId !=null and auditId != ''">
+            and t.audit_id= #{auditId}
+        </if>
+
+
+    </select>
+
+</mapper>

+ 14 - 20
java110-generator/src/main/resources/newBack/template_1.json

@@ -1,20 +1,18 @@
 {
   "autoMove": true,
-  "id": "detailId",
-  "name": "feeManualCollectionDetail",
-  "desc": "托收明细",
+  "id": "auditId",
+  "name": "payFeeAudit",
+  "desc": "缴费审核",
   "shareParam": "communityId",
   "shareColumn": "community_id",
   "shareName": "fee",
-  "tableName": "fee_manual_collection_detail",
+  "tableName": "pay_fee_audit",
   "param": {
-    "collectionId": "collection_id",
-    "detailId": "detail_id",
     "feeId": "fee_id",
-    "feeName": "fee_name",
-    "startTime": "start_time",
-    "endTime": "end_time",
-    "amount": "amount",
+    "feeDetailId": "fee_detail_id",
+    "message": "message",
+    "auditUserId": "audit_user_id",
+    "auditUserName": "audit_user_name",
     "communityId": "community_id",
     "state": "state",
     "statusCd": "status_cd"
@@ -24,25 +22,21 @@
       "code": "communityId",
       "msg": "小区不能为空"
     },
-    {
-      "code": "collectionId",
-      "msg": "托收不能为空"
-    },
     {
       "code": "feeId",
       "msg": "费用不能为空"
     },
     {
-      "code": "startTime",
-      "msg": "开始时间不能为空"
+      "code": "auditUserId",
+      "msg": "审核人不能为空"
     },
     {
-      "code": "endTime",
-      "msg": "结束时间不能为空"
+      "code": "auditUserName",
+      "msg": "审核人不能为空"
     },
     {
-      "code": "amount",
-      "msg": "金额不能为空"
+      "code": "state",
+      "msg": "审核状态不能为空"
     }
   ]
 }

+ 49 - 0
java110-generator/src/main/resources/newBack/template_manualCollectionDetail.json

@@ -0,0 +1,49 @@
+{
+  "autoMove": true,
+  "id": "detailId",
+  "name": "feeManualCollectionDetail",
+  "desc": "托收明细",
+  "shareParam": "communityId",
+  "shareColumn": "community_id",
+  "shareName": "fee",
+  "tableName": "fee_manual_collection_detail",
+  "param": {
+    "collectionId": "collection_id",
+    "detailId": "detail_id",
+    "feeId": "fee_id",
+    "feeName": "fee_name",
+    "startTime": "start_time",
+    "endTime": "end_time",
+    "amount": "amount",
+    "communityId": "community_id",
+    "state": "state",
+    "statusCd": "status_cd"
+  },
+  "required": [
+    {
+      "code": "communityId",
+      "msg": "小区不能为空"
+    },
+    {
+      "code": "collectionId",
+      "msg": "托收不能为空"
+    },
+    {
+      "code": "feeId",
+      "msg": "费用不能为空"
+    },
+    {
+      "code": "startTime",
+      "msg": "开始时间不能为空"
+    },
+    {
+      "code": "endTime",
+      "msg": "结束时间不能为空"
+    },
+    {
+      "code": "amount",
+      "msg": "金额不能为空"
+    }
+  ]
+}
+

+ 53 - 0
java110-interface/src/main/java/com/java110/intf/fee/IPayFeeAuditInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IPayFeeAuditInnerServiceSMO
+ * @Description 缴费审核接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "fee-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/payFeeAuditApi")
+public interface IPayFeeAuditInnerServiceSMO {
+
+
+    @RequestMapping(value = "/savePayFeeAudit", method = RequestMethod.POST)
+    public int savePayFeeAudit(@RequestBody PayFeeAuditPo payFeeAuditPo);
+
+    @RequestMapping(value = "/updatePayFeeAudit", method = RequestMethod.POST)
+    public int updatePayFeeAudit(@RequestBody  PayFeeAuditPo payFeeAuditPo);
+
+    @RequestMapping(value = "/deletePayFeeAudit", method = RequestMethod.POST)
+    public int deletePayFeeAudit(@RequestBody  PayFeeAuditPo payFeeAuditPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param payFeeAuditDto 数据对象分享
+     * @return PayFeeAuditDto 对象数据
+     */
+    @RequestMapping(value = "/queryPayFeeAudits", method = RequestMethod.POST)
+    List<PayFeeAuditDto> queryPayFeeAudits(@RequestBody PayFeeAuditDto payFeeAuditDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param payFeeAuditDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryPayFeeAuditsCount", method = RequestMethod.POST)
+    int queryPayFeeAuditsCount(@RequestBody PayFeeAuditDto payFeeAuditDto);
+}

+ 117 - 0
service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java

@@ -0,0 +1,117 @@
+package com.java110.fee.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.fee.bmo.payFeeAudit.IDeletePayFeeAuditBMO;
+import com.java110.fee.bmo.payFeeAudit.IGetPayFeeAuditBMO;
+import com.java110.fee.bmo.payFeeAudit.ISavePayFeeAuditBMO;
+import com.java110.fee.bmo.payFeeAudit.IUpdatePayFeeAuditBMO;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping(value = "/payFeeAudit")
+public class PayFeeAuditApi {
+
+    @Autowired
+    private ISavePayFeeAuditBMO savePayFeeAuditBMOImpl;
+    @Autowired
+    private IUpdatePayFeeAuditBMO updatePayFeeAuditBMOImpl;
+    @Autowired
+    private IDeletePayFeeAuditBMO deletePayFeeAuditBMOImpl;
+
+    @Autowired
+    private IGetPayFeeAuditBMO getPayFeeAuditBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /payFeeAudit/savePayFeeAudit
+     * @path /app/payFeeAudit/savePayFeeAudit
+     */
+    @RequestMapping(value = "/savePayFeeAudit", method = RequestMethod.POST)
+    public ResponseEntity<String> savePayFeeAudit(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "feeId", "请求报文中未包含feeId");
+        Assert.hasKeyAndValue(reqJson, "auditUserId", "请求报文中未包含auditUserId");
+        Assert.hasKeyAndValue(reqJson, "auditUserName", "请求报文中未包含auditUserName");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+
+
+        PayFeeAuditPo payFeeAuditPo = BeanConvertUtil.covertBean(reqJson, PayFeeAuditPo.class);
+        return savePayFeeAuditBMOImpl.save(payFeeAuditPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /payFeeAudit/updatePayFeeAudit
+     * @path /app/payFeeAudit/updatePayFeeAudit
+     */
+    @RequestMapping(value = "/updatePayFeeAudit", method = RequestMethod.POST)
+    public ResponseEntity<String> updatePayFeeAudit(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "feeId", "请求报文中未包含feeId");
+        Assert.hasKeyAndValue(reqJson, "auditUserId", "请求报文中未包含auditUserId");
+        Assert.hasKeyAndValue(reqJson, "auditUserName", "请求报文中未包含auditUserName");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        Assert.hasKeyAndValue(reqJson, "auditId", "auditId不能为空");
+
+
+        PayFeeAuditPo payFeeAuditPo = BeanConvertUtil.covertBean(reqJson, PayFeeAuditPo.class);
+        return updatePayFeeAuditBMOImpl.update(payFeeAuditPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /payFeeAudit/deletePayFeeAudit
+     * @path /app/payFeeAudit/deletePayFeeAudit
+     */
+    @RequestMapping(value = "/deletePayFeeAudit", method = RequestMethod.POST)
+    public ResponseEntity<String> deletePayFeeAudit(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "auditId", "auditId不能为空");
+
+
+        PayFeeAuditPo payFeeAuditPo = BeanConvertUtil.covertBean(reqJson, PayFeeAuditPo.class);
+        return deletePayFeeAuditBMOImpl.delete(payFeeAuditPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /payFeeAudit/queryPayFeeAudit
+     * @path /app/payFeeAudit/queryPayFeeAudit
+     */
+    @RequestMapping(value = "/queryPayFeeAudit", method = RequestMethod.GET)
+    public ResponseEntity<String> queryPayFeeAudit(@RequestParam(value = "communityId") String communityId,
+                                                   @RequestParam(value = "page") int page,
+                                                   @RequestParam(value = "row") int row) {
+        PayFeeAuditDto payFeeAuditDto = new PayFeeAuditDto();
+        payFeeAuditDto.setPage(page);
+        payFeeAuditDto.setRow(row);
+        payFeeAuditDto.setCommunityId(communityId);
+        return getPayFeeAuditBMOImpl.get(payFeeAuditDto);
+    }
+}

+ 17 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/IDeletePayFeeAuditBMO.java

@@ -0,0 +1,17 @@
+package com.java110.fee.bmo.payFeeAudit;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeletePayFeeAuditBMO {
+
+
+    /**
+     * 修改缴费审核
+     * add by wuxw
+     * @param payFeeAuditPo
+     * @return
+     */
+    ResponseEntity<String> delete(PayFeeAuditPo payFeeAuditPo);
+
+
+}

+ 19 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/IGetPayFeeAuditBMO.java

@@ -0,0 +1,19 @@
+package com.java110.fee.bmo.payFeeAudit;
+
+import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import org.springframework.http.ResponseEntity;
+
+public interface IGetPayFeeAuditBMO {
+
+
+    /**
+     * 查询缴费审核
+     * add by wuxw
+     *
+     * @param payFeeAuditDto
+     * @return
+     */
+    ResponseEntity<String> get(PayFeeAuditDto payFeeAuditDto);
+
+
+}

+ 19 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/ISavePayFeeAuditBMO.java

@@ -0,0 +1,19 @@
+package com.java110.fee.bmo.payFeeAudit;
+
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import org.springframework.http.ResponseEntity;
+
+public interface ISavePayFeeAuditBMO {
+
+
+    /**
+     * 添加缴费审核
+     * add by wuxw
+     *
+     * @param payFeeAuditPo
+     * @return
+     */
+    ResponseEntity<String> save(PayFeeAuditPo payFeeAuditPo);
+
+
+}

+ 17 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/IUpdatePayFeeAuditBMO.java

@@ -0,0 +1,17 @@
+package com.java110.fee.bmo.payFeeAudit;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdatePayFeeAuditBMO {
+
+
+    /**
+     * 修改缴费审核
+     * add by wuxw
+     * @param payFeeAuditPo
+     * @return
+     */
+    ResponseEntity<String> update(PayFeeAuditPo payFeeAuditPo);
+
+
+}

+ 34 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/DeletePayFeeAuditBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.fee.bmo.payFeeAudit.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.fee.bmo.payFeeAudit.IDeletePayFeeAuditBMO;
+import com.java110.intf.IPayFeeAuditInnerServiceSMO;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deletePayFeeAuditBMOImpl")
+public class DeletePayFeeAuditBMOImpl implements IDeletePayFeeAuditBMO {
+
+    @Autowired
+    private IPayFeeAuditInnerServiceSMO payFeeAuditInnerServiceSMOImpl;
+
+    /**
+     * @param payFeeAuditPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(PayFeeAuditPo payFeeAuditPo) {
+
+        int flag = payFeeAuditInnerServiceSMOImpl.deletePayFeeAudit(payFeeAuditPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 44 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.fee.bmo.payFeeAudit.impl;
+
+import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.fee.bmo.payFeeAudit.IGetPayFeeAuditBMO;
+import com.java110.intf.IPayFeeAuditInnerServiceSMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getPayFeeAuditBMOImpl")
+public class GetPayFeeAuditBMOImpl implements IGetPayFeeAuditBMO {
+
+    @Autowired
+    private IPayFeeAuditInnerServiceSMO payFeeAuditInnerServiceSMOImpl;
+
+    /**
+     * @param payFeeAuditDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(PayFeeAuditDto payFeeAuditDto) {
+
+
+        int count = payFeeAuditInnerServiceSMOImpl.queryPayFeeAuditsCount(payFeeAuditDto);
+
+        List<PayFeeAuditDto> payFeeAuditDtos = null;
+        if (count > 0) {
+            payFeeAuditDtos = payFeeAuditInnerServiceSMOImpl.queryPayFeeAudits(payFeeAuditDto);
+        } else {
+            payFeeAuditDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) payFeeAuditDto.getRow()), count, payFeeAuditDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

+ 38 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/SavePayFeeAuditBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.fee.bmo.payFeeAudit.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.fee.bmo.payFeeAudit.ISavePayFeeAuditBMO;
+import com.java110.intf.IPayFeeAuditInnerServiceSMO;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("savePayFeeAuditBMOImpl")
+public class SavePayFeeAuditBMOImpl implements ISavePayFeeAuditBMO {
+
+    @Autowired
+    private IPayFeeAuditInnerServiceSMO payFeeAuditInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param payFeeAuditPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(PayFeeAuditPo payFeeAuditPo) {
+
+        payFeeAuditPo.setAuditId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_auditId));
+        int flag = payFeeAuditInnerServiceSMOImpl.savePayFeeAudit(payFeeAuditPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 34 - 0
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/UpdatePayFeeAuditBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.fee.bmo.payFeeAudit.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.fee.bmo.payFeeAudit.IUpdatePayFeeAuditBMO;
+import com.java110.intf.IPayFeeAuditInnerServiceSMO;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updatePayFeeAuditBMOImpl")
+public class UpdatePayFeeAuditBMOImpl implements IUpdatePayFeeAuditBMO {
+
+    @Autowired
+    private IPayFeeAuditInnerServiceSMO payFeeAuditInnerServiceSMOImpl;
+
+    /**
+     * @param payFeeAuditPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(PayFeeAuditPo payFeeAuditPo) {
+
+        int flag = payFeeAuditInnerServiceSMOImpl.updatePayFeeAudit(payFeeAuditPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 61 - 0
service-fee/src/main/java/com/java110/fee/dao/IPayFeeAuditServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.fee.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 缴费审核组件内部之间使用,没有给外围系统提供服务能力
+ * 缴费审核服务接口类,要求全部以字符串传输,方便微服务化
+ * 新建客户,修改客户,删除客户,查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IPayFeeAuditServiceDao {
+
+
+    /**
+     * 保存 缴费审核信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void savePayFeeAuditInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询缴费审核信息(instance过程)
+     * 根据bId 查询缴费审核信息
+     * @param info bId 信息
+     * @return 缴费审核信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getPayFeeAuditInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改缴费审核信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updatePayFeeAuditInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询缴费审核总数
+     *
+     * @param info 缴费审核信息
+     * @return 缴费审核数量
+     */
+    int queryPayFeeAuditsCount(Map info);
+
+}

+ 98 - 0
service-fee/src/main/java/com/java110/fee/dao/impl/PayFeeAuditServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.fee.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.fee.dao.IPayFeeAuditServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 缴费审核服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("payFeeAuditServiceDaoImpl")
+//@Transactional
+public class PayFeeAuditServiceDaoImpl extends BaseServiceDao implements IPayFeeAuditServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(PayFeeAuditServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存缴费审核信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void savePayFeeAuditInfo(Map info) throws DAOException {
+        logger.debug("保存缴费审核信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("payFeeAuditServiceDaoImpl.savePayFeeAuditInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存缴费审核信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询缴费审核信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getPayFeeAuditInfo(Map info) throws DAOException {
+        logger.debug("查询缴费审核信息 入参 info : {}",info);
+
+        List<Map> businessPayFeeAuditInfos = sqlSessionTemplate.selectList("payFeeAuditServiceDaoImpl.getPayFeeAuditInfo",info);
+
+        return businessPayFeeAuditInfos;
+    }
+
+
+    /**
+     * 修改缴费审核信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updatePayFeeAuditInfo(Map info) throws DAOException {
+        logger.debug("修改缴费审核信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("payFeeAuditServiceDaoImpl.updatePayFeeAuditInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改缴费审核信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询缴费审核数量
+     * @param info 缴费审核信息
+     * @return 缴费审核数量
+     */
+    @Override
+    public int queryPayFeeAuditsCount(Map info) {
+        logger.debug("查询缴费审核数据 入参 info : {}",info);
+
+        List<Map> businessPayFeeAuditInfos = sqlSessionTemplate.selectList("payFeeAuditServiceDaoImpl.queryPayFeeAuditsCount", info);
+        if (businessPayFeeAuditInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessPayFeeAuditInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 83 - 0
service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeAuditInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.fee.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.fee.dao.IPayFeeAuditServiceDao;
+import com.java110.intf.IPayFeeAuditInnerServiceSMO;
+import com.java110.po.payFeeAudit.PayFeeAuditPo;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 缴费审核内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class PayFeeAuditInnerServiceSMOImpl extends BaseServiceSMO implements IPayFeeAuditInnerServiceSMO {
+
+    @Autowired
+    private IPayFeeAuditServiceDao payFeeAuditServiceDaoImpl;
+
+
+    @Override
+    public int savePayFeeAudit(@RequestBody PayFeeAuditPo payFeeAuditPo) {
+        int saveFlag = 1;
+        payFeeAuditServiceDaoImpl.savePayFeeAuditInfo(BeanConvertUtil.beanCovertMap(payFeeAuditPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updatePayFeeAudit(@RequestBody PayFeeAuditPo payFeeAuditPo) {
+        int saveFlag = 1;
+        payFeeAuditServiceDaoImpl.updatePayFeeAuditInfo(BeanConvertUtil.beanCovertMap(payFeeAuditPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deletePayFeeAudit(@RequestBody PayFeeAuditPo payFeeAuditPo) {
+        int saveFlag = 1;
+        payFeeAuditPo.setStatusCd("1");
+        payFeeAuditServiceDaoImpl.updatePayFeeAuditInfo(BeanConvertUtil.beanCovertMap(payFeeAuditPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<PayFeeAuditDto> queryPayFeeAudits(@RequestBody PayFeeAuditDto payFeeAuditDto) {
+
+        //校验是否传了 分页信息
+
+        int page = payFeeAuditDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            payFeeAuditDto.setPage((page - 1) * payFeeAuditDto.getRow());
+        }
+
+        List<PayFeeAuditDto> payFeeAudits = BeanConvertUtil.covertBeanList(payFeeAuditServiceDaoImpl.getPayFeeAuditInfo(BeanConvertUtil.beanCovertMap(payFeeAuditDto)), PayFeeAuditDto.class);
+
+        return payFeeAudits;
+    }
+
+
+    @Override
+    public int queryPayFeeAuditsCount(@RequestBody PayFeeAuditDto payFeeAuditDto) {
+        return payFeeAuditServiceDaoImpl.queryPayFeeAuditsCount(BeanConvertUtil.beanCovertMap(payFeeAuditDto));
+    }
+
+    public IPayFeeAuditServiceDao getPayFeeAuditServiceDaoImpl() {
+        return payFeeAuditServiceDaoImpl;
+    }
+
+    public void setPayFeeAuditServiceDaoImpl(IPayFeeAuditServiceDao payFeeAuditServiceDaoImpl) {
+        this.payFeeAuditServiceDaoImpl = payFeeAuditServiceDaoImpl;
+    }
+}