1

pro-base/src/main/java/com/idea/customerManagement/controller/BuyerController.java

@@ -32,5 +32,10 @@ public class BuyerController extends BaseController {
         return buyers;
     }
 
-
+    @PostMapping(value = "numberList",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object numberList(){
+        List<String> buyers = modelService.numberList();
+        return buyers;
+    }
 }

pro-base/src/main/java/com/idea/customerManagement/mapper/BuyerExtendMapper.java

@@ -0,0 +1,14 @@
+package com.idea.customerManagement.mapper;
+
+import com.idea.customerManagement.model.Buyer;
+import com.idea.customerManagement.model.BuyerExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface BuyerExtendMapper {
+
+    List<String> idNumberList();
+
+
+}

pro-base/src/main/java/com/idea/customerManagement/service/BuyerService.java

@@ -1,6 +1,7 @@
 package com.idea.customerManagement.service;
 
 import cn.hutool.core.util.IdUtil;
+import com.idea.customerManagement.mapper.BuyerExtendMapper;
 import com.idea.customerManagement.mapper.BuyerMapper;
 import com.idea.customerManagement.model.Buyer;
 import com.idea.customerManagement.model.BuyerExample;
@@ -11,12 +12,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class BuyerService implements BaseService<Buyer, BuyerExample> {
 
     @Autowired
     private BuyerMapper modelMapper;
+    @Autowired
+    private BuyerExtendMapper extendMapper;
 
 
     @Override
@@ -81,7 +85,14 @@ public class BuyerService implements BaseService<Buyer, BuyerExample> {
         return example;
     }
 
-
+    /**
+     * 查询所有身份证号 去重
+     * @return
+     */
+    public List<String> numberList() {
+        List<String> numberList = extendMapper.idNumberList();
+        return numberList;
+    }
 
 
 

pro-base/src/main/java/com/idea/customerManagement/service/RoomSelectionInfoService.java

@@ -14,6 +14,8 @@ import com.idea.customerManagement.mapper.CustomerManagementMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoExtendMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
 import com.idea.customerManagement.model.*;
+import com.idea.paymentManagement.mapper.PayLogMapper;
+import com.idea.paymentManagement.model.PayLog;
 import com.idea.util.DateUtils;
 import com.idea.util.ReplaceWord;
 import com.rockstar.common.base.BaseService;
@@ -45,6 +47,8 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     private BuyerService buyerService;
     @Autowired
     private ParkRoomMapper parkRoomMapper;
+    @Autowired
+    private PayLogMapper payLogMapper;
 
 
     @Override
@@ -205,12 +209,28 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         model.setCollectionTime(new Date());
         int result = updateByPrimaryKeySelective(model);
         // 生成合同
-        contractManageService.addContract(model,null);
+        String contractId = IdUtil.simpleUUID();
+        contractManageService.addContract(model,contractId);
         // 修改房间已收状态 已认购
         ParkRoom parkRoom = new ParkRoom();
         parkRoom.setId(model.getHouseId());
         parkRoom.setSoldStatus(2);
         parkRoomMapper.updateByPrimaryKeySelective(parkRoom);
+        // 新增一条定金收款记录
+        PayLog payLog = new PayLog();
+        payLog.setId(IdUtil.simpleUUID());
+        payLog.setHouseId(model.getHouseId());
+        payLog.setContractId(contractId);
+        payLog.setCustomerManagementId(model.getCustomerManagementId());
+        // 收款类型 预收款
+        payLog.setPayType(1);
+        // 款项内容 定金
+        payLog.setContentType(1);
+        payLog.setPayMoney(model.getReceivedAmount());
+        payLog.setPayTime(new Date());
+        payLog.setPaymentMethod(model.getPaymentMethod());
+        payLog.setStatus(0);
+        payLogMapper.insertSelective(payLog);
         return result;
     }
 

pro-base/src/main/java/com/idea/paymentManagement/model/MaintenanceFundsManagement.java

@@ -10,8 +10,12 @@ import java.util.Date;
 public class MaintenanceFundsManagement implements Serializable {
     private String id;
 
+    private String houseId;
+
     private String contractId;
 
+    private String customerManagementId;
+
     private Integer paymentMethod;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -42,6 +46,22 @@ public class MaintenanceFundsManagement implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId;
+    }
+
+    public String getCustomerManagementId() {
+        return customerManagementId;
+    }
+
+    public void setCustomerManagementId(String customerManagementId) {
+        this.customerManagementId = customerManagementId;
+    }
+
     public String getId() {
         return id;
     }

pro-base/src/main/java/com/idea/paymentManagement/model/MaintenanceFundsManagementExample.java

@@ -176,6 +176,76 @@ public class MaintenanceFundsManagementExample {
             return (Criteria) this;
         }
 
+        public Criteria andHouseIdIsNull() {
+            addCriterion("house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNotNull() {
+            addCriterion("house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdEqualTo(String value) {
+            addCriterion("house_id =", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotEqualTo(String value) {
+            addCriterion("house_id <>", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThan(String value) {
+            addCriterion("house_id >", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThanOrEqualTo(String value) {
+            addCriterion("house_id >=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThan(String value) {
+            addCriterion("house_id <", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThanOrEqualTo(String value) {
+            addCriterion("house_id <=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLike(String value) {
+            addCriterion("house_id like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotLike(String value) {
+            addCriterion("house_id not like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<String> values) {
+            addCriterion("house_id in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotIn(List<String> values) {
+            addCriterion("house_id not in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdBetween(String value1, String value2) {
+            addCriterion("house_id between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotBetween(String value1, String value2) {
+            addCriterion("house_id not between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
         public Criteria andContractIdIsNull() {
             addCriterion("contract_id is null");
             return (Criteria) this;
@@ -246,6 +316,76 @@ public class MaintenanceFundsManagementExample {
             return (Criteria) this;
         }
 
+        public Criteria andCustomerManagementIdIsNull() {
+            addCriterion("customer_management_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIsNotNull() {
+            addCriterion("customer_management_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdEqualTo(String value) {
+            addCriterion("customer_management_id =", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotEqualTo(String value) {
+            addCriterion("customer_management_id <>", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThan(String value) {
+            addCriterion("customer_management_id >", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdGreaterThanOrEqualTo(String value) {
+            addCriterion("customer_management_id >=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThan(String value) {
+            addCriterion("customer_management_id <", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLessThanOrEqualTo(String value) {
+            addCriterion("customer_management_id <=", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdLike(String value) {
+            addCriterion("customer_management_id like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotLike(String value) {
+            addCriterion("customer_management_id not like", value, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdIn(List<String> values) {
+            addCriterion("customer_management_id in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotIn(List<String> values) {
+            addCriterion("customer_management_id not in", values, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdBetween(String value1, String value2) {
+            addCriterion("customer_management_id between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCustomerManagementIdNotBetween(String value1, String value2) {
+            addCriterion("customer_management_id not between", value1, value2, "customerManagementId");
+            return (Criteria) this;
+        }
+
         public Criteria andPaymentMethodIsNull() {
             addCriterion("payment_method is null");
             return (Criteria) this;

pro-base/src/main/java/com/idea/paymentManagement/service/MaintenanceFundsManagementService.java

@@ -14,8 +14,10 @@ import com.idea.invoice.model.InvoiceBankExample;
 import com.idea.invoice.service.InvoiceBankService;
 import com.idea.paymentManagement.mapper.MaintenanceFundsManagementExtendMapper;
 import com.idea.paymentManagement.mapper.MaintenanceFundsManagementMapper;
+import com.idea.paymentManagement.mapper.PayLogMapper;
 import com.idea.paymentManagement.model.MaintenanceFundsManagement;
 import com.idea.paymentManagement.model.MaintenanceFundsManagementExample;
+import com.idea.paymentManagement.model.PayLog;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
@@ -41,6 +43,8 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
     private InvoiceBankService invoiceBankService;
     @Autowired
     private ParkRoomMapper parkRoomMapper;
+    @Autowired
+    private PayLogMapper payLogMapper;
 
 
 
@@ -102,12 +106,15 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
      */
     public int add(MaintenanceFundsManagement model){
 
-        model.setCreatedId(ShiroUtils.getUserId());
-        model.setCreatedAt(new Date());
         // 更新合同 专项维修资金收取状态 已收款
         ContractManage contractManage = contractManageMapper.selectByPrimaryKey(model.getContractId());
         contractManage.setFundCollectionStatus(2);
         contractManageMapper.updateByPrimaryKeySelective(contractManage);
+
+        model.setHouseId(contractManage.getHouseId());
+        model.setCustomerManagementId(contractManage.getCustomerManagementId());
+        model.setCreatedId(ShiroUtils.getUserId());
+        model.setCreatedAt(new Date());
         int result = insertSelective(model);
         return result;
     }

pro-base/src/main/java/com/idea/paymentManagement/service/RefundDetailService.java

@@ -90,7 +90,7 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
         List<RefundDetail> refundDetails = new ArrayList<>();
         for(PayLog payLog : payLogs){
             RefundDetail refundDetail = new RefundDetail();
-            refundDetail.setContentType(payLog.getContentType());
+            refundDetail.setType(payLog.getContentType().toString());
             refundDetail.setReceivedAmount(payLog.getPayMoney());
             refundDetails.add(refundDetail);
         }

pro-base/src/main/java/com/idea/paymentManagement/service/RefundManageService.java

@@ -130,7 +130,7 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
 
 
     /**
-     * 新增收款
+     * 新增退款
      * @param model
      * @return
      */
@@ -154,7 +154,7 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
     }
 
     /**
-     * 编辑收款
+     * 编辑退款
      * @param model
      * @return
      */
@@ -185,7 +185,13 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         return result;
     }
 
-
+    /**
+     * 退款列表
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
     public PageInfo<RefundManageDto> listByModel(Tablepar tablepar, RefundManageDto model, DateTrans dt) {
         PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
         List<RefundManageDto> list = extendMapper.listByModel(model);

pro-base/src/main/resources/mybatis/customerManagement/BuyerExtendMapper.xml

@@ -0,0 +1,8 @@
+<?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="com.idea.customerManagement.mapper.BuyerExtendMapper">
+
+  <select id="idNumberList" resultType="java.lang.String">
+    select distinct(identity_card)  from buyer
+  </select>
+</mapper>

pro-base/src/main/resources/mybatis/paymentManagement/MaintenanceFundsManagementMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.idea.paymentManagement.mapper.MaintenanceFundsManagementMapper">
   <resultMap id="BaseResultMap" type="com.idea.paymentManagement.model.MaintenanceFundsManagement">
     <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
     <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
+    <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
     <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
     <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
     <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
@@ -79,8 +81,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, contract_id, payment_method, pay_time, bank_name, bank_branch_name, bank_number,
-    pay_money, receivable_money, created_id, created_at, updated_at, updated_id
+    id, house_id, contract_id, customer_management_id, payment_method, pay_time, bank_name,
+    bank_branch_name, bank_number, pay_money, receivable_money, created_id, created_at,
+    updated_at, updated_id
   </sql>
   <sql id="Blob_Column_List">
     remark, payment_voucher
@@ -134,18 +137,18 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
-    insert into maintenance_funds_management (id, contract_id, payment_method,
-                                              pay_time, bank_name, bank_branch_name,
-                                              bank_number, pay_money, receivable_money,
-                                              created_id, created_at, updated_at,
-                                              updated_id, remark, payment_voucher
-    )
-    values (#{id,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, #{paymentMethod,jdbcType=INTEGER},
-            #{payTime,jdbcType=TIMESTAMP}, #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR},
-            #{bankNumber,jdbcType=CHAR}, #{payMoney,jdbcType=DECIMAL}, #{receivableMoney,jdbcType=DECIMAL},
-            #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
-            #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{paymentVoucher,jdbcType=LONGVARCHAR}
-           )
+    insert into maintenance_funds_management (id, house_id, contract_id,
+                                              customer_management_id, payment_method, pay_time,
+                                              bank_name, bank_branch_name, bank_number,
+                                              pay_money, receivable_money, created_id,
+                                              created_at, updated_at, updated_id,
+                                              remark, payment_voucher)
+    values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR},
+            #{customerManagementId,jdbcType=VARCHAR}, #{paymentMethod,jdbcType=INTEGER}, #{payTime,jdbcType=TIMESTAMP},
+            #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR},
+            #{payMoney,jdbcType=DECIMAL}, #{receivableMoney,jdbcType=DECIMAL}, #{createdId,jdbcType=VARCHAR},
+            #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR},
+            #{remark,jdbcType=LONGVARCHAR}, #{paymentVoucher,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
     insert into maintenance_funds_management
@@ -153,9 +156,15 @@
       <if test="id != null">
         id,
       </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
       <if test="contractId != null">
         contract_id,
       </if>
+      <if test="customerManagementId != null">
+        customer_management_id,
+      </if>
       <if test="paymentMethod != null">
         payment_method,
       </if>
@@ -200,9 +209,15 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=VARCHAR},
+      </if>
       <if test="contractId != null">
         #{contractId,jdbcType=VARCHAR},
       </if>
+      <if test="customerManagementId != null">
+        #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="paymentMethod != null">
         #{paymentMethod,jdbcType=INTEGER},
       </if>
@@ -256,9 +271,15 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=VARCHAR},
+      </if>
       <if test="record.contractId != null">
         contract_id = #{record.contractId,jdbcType=VARCHAR},
       </if>
+      <if test="record.customerManagementId != null">
+        customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="record.paymentMethod != null">
         payment_method = #{record.paymentMethod,jdbcType=INTEGER},
       </if>
@@ -306,7 +327,9 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update maintenance_funds_management
     set id = #{record.id,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
     contract_id = #{record.contractId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     payment_method = #{record.paymentMethod,jdbcType=INTEGER},
     pay_time = #{record.payTime,jdbcType=TIMESTAMP},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
@@ -327,7 +350,9 @@
   <update id="updateByExample" parameterType="map">
     update maintenance_funds_management
     set id = #{record.id,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
     contract_id = #{record.contractId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     payment_method = #{record.paymentMethod,jdbcType=INTEGER},
     pay_time = #{record.payTime,jdbcType=TIMESTAMP},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
@@ -346,9 +371,15 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
     update maintenance_funds_management
     <set>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=VARCHAR},
+      </if>
       <if test="contractId != null">
         contract_id = #{contractId,jdbcType=VARCHAR},
       </if>
+      <if test="customerManagementId != null">
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      </if>
       <if test="paymentMethod != null">
         payment_method = #{paymentMethod,jdbcType=INTEGER},
       </if>
@@ -393,7 +424,9 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
     update maintenance_funds_management
-    set contract_id = #{contractId,jdbcType=VARCHAR},
+    set house_id = #{houseId,jdbcType=VARCHAR},
+        contract_id = #{contractId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         payment_method = #{paymentMethod,jdbcType=INTEGER},
         pay_time = #{payTime,jdbcType=TIMESTAMP},
         bank_name = #{bankName,jdbcType=VARCHAR},
@@ -411,7 +444,9 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.paymentManagement.model.MaintenanceFundsManagement">
     update maintenance_funds_management
-    set contract_id = #{contractId,jdbcType=VARCHAR},
+    set house_id = #{houseId,jdbcType=VARCHAR},
+        contract_id = #{contractId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         payment_method = #{paymentMethod,jdbcType=INTEGER},
         pay_time = #{payTime,jdbcType=TIMESTAMP},
         bank_name = #{bankName,jdbcType=VARCHAR},

pro-base/src/main/resources/mybatis/paymentManagement/RefundManageExtendMapper.xml

@@ -4,7 +4,11 @@
 
 
   <select id="listByModel" resultType="com.idea.paymentManagement.dto.RefundManageDto">
-    select contract_manage.id contractId, contract_manage.buyer_name, contract_manage.house_name, contract_manage.contract_number,
+    select contract_manage.id contractId,
+           contract_manage.buyer_name,
+           contract_manage.house_name,
+           contract_manage.contract_number,
+           contract_manage.customer_management_id,
            refund_manage.*
     from contract_manage
     left join refund_manage on contract_manage.id = refund_manage.contract_id