意向金bug

pro-base/src/main/java/com/idea/customerManagement/dto/CustomerManagementDto.java

@@ -45,6 +45,11 @@ public class CustomerManagementDto extends CustomerManagement {
      */
     private BigDecimal intentionalDepositMoney;
 
+    /**
+     * 意向金id
+     */
+    private String intentionalDepositId;
+
     private String roomSelectionDateFrom;
 
     private String roomSelectionDateTo;

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

@@ -417,6 +417,7 @@ public class CustomerManagementService implements BaseService<CustomerManagement
             if (intentionalDeposit.getStatus() == 1) {
                 intentionalDepositMoney = intentionalDeposit.getReceivedAmount();
             }
+            result.setIntentionalDepositId(intentionalDeposit.getId());
         }
         result.setIntentionalDepositMoney(intentionalDepositMoney);
         result.setIntentionalDepositStatus(intentionalDepositStatus);

pro-base/src/main/java/com/idea/transactionRecordManage/mapper/CollectionRecordMapper.java

@@ -0,0 +1,37 @@
+package com.idea.transactionRecordManage.mapper;
+
+import java.util.List;
+
+import com.idea.transactionRecordManage.model.CollectionRecord;
+import com.idea.transactionRecordManage.model.CollectionRecordExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CollectionRecordMapper {
+    long countByExample(CollectionRecordExample example);
+
+    int deleteByExample(CollectionRecordExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(CollectionRecord record);
+
+    int insertSelective(CollectionRecord record);
+
+    List<CollectionRecord> selectByExampleWithBLOBs(CollectionRecordExample example);
+
+    List<CollectionRecord> selectByExample(CollectionRecordExample example);
+
+    CollectionRecord selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") CollectionRecord record, @Param("example") CollectionRecordExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") CollectionRecord record, @Param("example") CollectionRecordExample example);
+
+    int updateByExample(@Param("record") CollectionRecord record, @Param("example") CollectionRecordExample example);
+
+    int updateByPrimaryKeySelective(CollectionRecord record);
+
+    int updateByPrimaryKeyWithBLOBs(CollectionRecord record);
+
+    int updateByPrimaryKey(CollectionRecord record);
+}

pro-base/src/main/java/com/idea/transactionRecordManage/model/CollectionRecord.java

@@ -0,0 +1,219 @@
+package com.idea.transactionRecordManage.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CollectionRecord implements Serializable {
+    private String id;
+
+    private String groupId;
+
+    private String discId;
+
+    private String houseId;
+
+    private String customerManagementId;
+
+    private String businessId;
+
+    private String businessType;
+
+    private Integer ncSubmitStatus;
+
+    private Date ncSubmitDate;
+
+    private String ncSubmitName;
+
+    private String createdBy;
+
+    private Date createdAt;
+
+    private String updatedBy;
+
+    private Date updatedAt;
+
+    private Integer contentType;
+
+    private String bankNumber;
+
+    private BigDecimal payMoney;
+
+    private Date payTime;
+
+    private Integer paymentMethod;
+
+    private String ncBankSerialId;
+
+    private String ncJson;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getDiscId() {
+        return discId;
+    }
+
+    public void setDiscId(String discId) {
+        this.discId = discId == null ? null : discId.trim();
+    }
+
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId == null ? null : houseId.trim();
+    }
+
+    public String getCustomerManagementId() {
+        return customerManagementId;
+    }
+
+    public void setCustomerManagementId(String customerManagementId) {
+        this.customerManagementId = customerManagementId == null ? null : customerManagementId.trim();
+    }
+
+    public String getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(String businessId) {
+        this.businessId = businessId == null ? null : businessId.trim();
+    }
+
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType == null ? null : businessType.trim();
+    }
+
+    public Integer getNcSubmitStatus() {
+        return ncSubmitStatus;
+    }
+
+    public void setNcSubmitStatus(Integer ncSubmitStatus) {
+        this.ncSubmitStatus = ncSubmitStatus;
+    }
+
+    public Date getNcSubmitDate() {
+        return ncSubmitDate;
+    }
+
+    public void setNcSubmitDate(Date ncSubmitDate) {
+        this.ncSubmitDate = ncSubmitDate;
+    }
+
+    public String getNcSubmitName() {
+        return ncSubmitName;
+    }
+
+    public void setNcSubmitName(String ncSubmitName) {
+        this.ncSubmitName = ncSubmitName == null ? null : ncSubmitName.trim();
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy == null ? null : createdBy.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy == null ? null : updatedBy.trim();
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Integer getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(Integer contentType) {
+        this.contentType = contentType;
+    }
+
+    public String getBankNumber() {
+        return bankNumber;
+    }
+
+    public void setBankNumber(String bankNumber) {
+        this.bankNumber = bankNumber == null ? null : bankNumber.trim();
+    }
+
+    public BigDecimal getPayMoney() {
+        return payMoney;
+    }
+
+    public void setPayMoney(BigDecimal payMoney) {
+        this.payMoney = payMoney;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Integer getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(Integer paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    public String getNcBankSerialId() {
+        return ncBankSerialId;
+    }
+
+    public void setNcBankSerialId(String ncBankSerialId) {
+        this.ncBankSerialId = ncBankSerialId == null ? null : ncBankSerialId.trim();
+    }
+
+    public String getNcJson() {
+        return ncJson;
+    }
+
+    public void setNcJson(String ncJson) {
+        this.ncJson = ncJson == null ? null : ncJson.trim();
+    }
+}

pro-base/src/main/java/com/idea/transactionRecordManage/service/TransactionRecordService.java

@@ -1,5 +1,6 @@
 package com.idea.transactionRecordManage.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -31,6 +32,7 @@ import com.idea.paymentManagement.model.RefundDetailExample;
 import com.idea.paymentManagement.service.PayLogService;
 import com.idea.transactionRecordManage.mapper.ConvertRecordMapper;
 import com.idea.transactionRecordManage.mapper.TransactionRecordMapper;
+import com.idea.transactionRecordManage.model.CollectionRecord;
 import com.idea.transactionRecordManage.model.ConvertRecord;
 import com.idea.transactionRecordManage.vo.NccRecordVo;
 import com.idea.util.DateUtils;
@@ -259,10 +261,15 @@ public class TransactionRecordService {
     @Synchronized
     public int collectionRecordSubmit(String ids, String collectionDateFrom, String collectionDateTo) {
 
-//        List<PayLog> payLogs = modelMapper.listByDate(collectionDateFrom, collectionDateTo);
+
+        String userId = ShiroUtils.getUserId();
+        Date date = new Date();
+
         PayLogExample payLogExample = new PayLogExample();
         payLogExample.createCriteria().andIdIn(Arrays.asList(ids.split(",")));
         List<PayLog> payLogs = payLogMapper.selectByExample(payLogExample);
+
+
         List<CustomerManagement> customerManagements = customerManagementMapper.selectByExample(new CustomerManagementExample());
         Map<String, CustomerManagement> customerMap = customerManagements.stream()
                 .collect(Collectors.toMap(CustomerManagement::getId, item -> item));
@@ -271,6 +278,14 @@ public class TransactionRecordService {
         for (PayLog payLog : payLogs) {
             try {
 
+//                CollectionRecord collectionRecord = new CollectionRecord();
+//                BeanUtil.copyProperties(payLog, collectionRecord);
+//                collectionRecord.setId(IdUtil.simpleUUID());
+//                collectionRecord.setBusinessId(payLog.getId());
+//                collectionRecord.setBusinessType("pay_log");
+//                collectionRecord.setCreatedBy(userId);
+//                collectionRecord
+
                 // 只有未推送或推送失败的才进行推送
                 if(payLog.getNcSubmitStatus() == null || payLog.getNcSubmitStatus() == 0 || payLog.getNcSubmitStatus() == 2) {
                     if (customerMap.containsKey(payLog.getCustomerManagementId())) {

pro-base/src/main/resources/mybatis/transactionRecord/CollectionRecordMapper.xml

@@ -0,0 +1,537 @@
+<?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.transactionRecordManage.mapper.CollectionRecordMapper">
+  <resultMap id="BaseResultMap" type="com.idea.transactionRecordManage.model.CollectionRecord">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="group_id" jdbcType="VARCHAR" property="groupId" />
+    <result column="disc_id" jdbcType="VARCHAR" property="discId" />
+    <result column="house_id" jdbcType="VARCHAR" property="houseId" />
+    <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
+    <result column="business_id" jdbcType="VARCHAR" property="businessId" />
+    <result column="business_type" jdbcType="VARCHAR" property="businessType" />
+    <result column="nc_submit_status" jdbcType="INTEGER" property="ncSubmitStatus" />
+    <result column="nc_submit_date" jdbcType="TIMESTAMP" property="ncSubmitDate" />
+    <result column="nc_submit_name" jdbcType="VARCHAR" property="ncSubmitName" />
+    <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="content_type" jdbcType="INTEGER" property="contentType" />
+    <result column="bank_number" jdbcType="CHAR" property="bankNumber" />
+    <result column="pay_money" jdbcType="DECIMAL" property="payMoney" />
+    <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
+    <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
+    <result column="nc_bank_serial_id" jdbcType="VARCHAR" property="ncBankSerialId" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.transactionRecordManage.model.CollectionRecord">
+    <result column="nc_json" jdbcType="LONGVARCHAR" property="ncJson" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, group_id, disc_id, house_id, customer_management_id, business_id, business_type,
+    nc_submit_status, nc_submit_date, nc_submit_name, created_by, created_at, updated_by,
+    updated_at, content_type, bank_number, pay_money, pay_time, payment_method, nc_bank_serial_id
+  </sql>
+  <sql id="Blob_Column_List">
+    nc_json
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.idea.transactionRecordManage.model.CollectionRecordExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from collection_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.idea.transactionRecordManage.model.CollectionRecordExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from collection_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from collection_record
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from collection_record
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.transactionRecordManage.model.CollectionRecordExample">
+    delete from collection_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.transactionRecordManage.model.CollectionRecord">
+    insert into collection_record (id, group_id, disc_id,
+                                   house_id, customer_management_id, business_id,
+                                   business_type, nc_submit_status, nc_submit_date,
+                                   nc_submit_name, created_by, created_at,
+                                   updated_by, updated_at, content_type,
+                                   bank_number, pay_money, pay_time,
+                                   payment_method, nc_bank_serial_id, nc_json
+    )
+    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
+            #{houseId,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR},
+            #{businessType,jdbcType=VARCHAR}, #{ncSubmitStatus,jdbcType=INTEGER}, #{ncSubmitDate,jdbcType=TIMESTAMP},
+            #{ncSubmitName,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
+            #{updatedBy,jdbcType=VARCHAR}, #{updatedAt,jdbcType=TIMESTAMP}, #{contentType,jdbcType=INTEGER},
+            #{bankNumber,jdbcType=CHAR}, #{payMoney,jdbcType=DECIMAL}, #{payTime,jdbcType=TIMESTAMP},
+            #{paymentMethod,jdbcType=INTEGER}, #{ncBankSerialId,jdbcType=VARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}
+           )
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.transactionRecordManage.model.CollectionRecord">
+    insert into collection_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="groupId != null">
+        group_id,
+      </if>
+      <if test="discId != null">
+        disc_id,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="customerManagementId != null">
+        customer_management_id,
+      </if>
+      <if test="businessId != null">
+        business_id,
+      </if>
+      <if test="businessType != null">
+        business_type,
+      </if>
+      <if test="ncSubmitStatus != null">
+        nc_submit_status,
+      </if>
+      <if test="ncSubmitDate != null">
+        nc_submit_date,
+      </if>
+      <if test="ncSubmitName != null">
+        nc_submit_name,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedBy != null">
+        updated_by,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="contentType != null">
+        content_type,
+      </if>
+      <if test="bankNumber != null">
+        bank_number,
+      </if>
+      <if test="payMoney != null">
+        pay_money,
+      </if>
+      <if test="payTime != null">
+        pay_time,
+      </if>
+      <if test="paymentMethod != null">
+        payment_method,
+      </if>
+      <if test="ncBankSerialId != null">
+        nc_bank_serial_id,
+      </if>
+      <if test="ncJson != null">
+        nc_json,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null">
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="discId != null">
+        #{discId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="customerManagementId != null">
+        #{customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="businessId != null">
+        #{businessId,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="ncSubmitStatus != null">
+        #{ncSubmitStatus,jdbcType=INTEGER},
+      </if>
+      <if test="ncSubmitDate != null">
+        #{ncSubmitDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ncSubmitName != null">
+        #{ncSubmitName,jdbcType=VARCHAR},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contentType != null">
+        #{contentType,jdbcType=INTEGER},
+      </if>
+      <if test="bankNumber != null">
+        #{bankNumber,jdbcType=CHAR},
+      </if>
+      <if test="payMoney != null">
+        #{payMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="payTime != null">
+        #{payTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentMethod != null">
+        #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="ncBankSerialId != null">
+        #{ncBankSerialId,jdbcType=VARCHAR},
+      </if>
+      <if test="ncJson != null">
+        #{ncJson,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.transactionRecordManage.model.CollectionRecordExample" resultType="java.lang.Long">
+    select count(*) from collection_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update collection_record
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.groupId != null">
+        group_id = #{record.groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.discId != null">
+        disc_id = #{record.discId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerManagementId != null">
+        customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessId != null">
+        business_id = #{record.businessId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessType != null">
+        business_type = #{record.businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ncSubmitStatus != null">
+        nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.ncSubmitDate != null">
+        nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.ncSubmitName != null">
+        nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdBy != null">
+        created_by = #{record.createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedBy != null">
+        updated_by = #{record.updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.contentType != null">
+        content_type = #{record.contentType,jdbcType=INTEGER},
+      </if>
+      <if test="record.bankNumber != null">
+        bank_number = #{record.bankNumber,jdbcType=CHAR},
+      </if>
+      <if test="record.payMoney != null">
+        pay_money = #{record.payMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.payTime != null">
+        pay_time = #{record.payTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.paymentMethod != null">
+        payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="record.ncBankSerialId != null">
+        nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ncJson != null">
+        nc_json = #{record.ncJson,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update collection_record
+    set id = #{record.id,jdbcType=VARCHAR},
+    group_id = #{record.groupId,jdbcType=VARCHAR},
+    disc_id = #{record.discId,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+    business_id = #{record.businessId,jdbcType=VARCHAR},
+    business_type = #{record.businessType,jdbcType=VARCHAR},
+    nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
+    nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
+    nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
+    created_by = #{record.createdBy,jdbcType=VARCHAR},
+    created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+    updated_by = #{record.updatedBy,jdbcType=VARCHAR},
+    updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+    content_type = #{record.contentType,jdbcType=INTEGER},
+    bank_number = #{record.bankNumber,jdbcType=CHAR},
+    pay_money = #{record.payMoney,jdbcType=DECIMAL},
+    pay_time = #{record.payTime,jdbcType=TIMESTAMP},
+    payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+    nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR},
+    nc_json = #{record.ncJson,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update collection_record
+    set id = #{record.id,jdbcType=VARCHAR},
+    group_id = #{record.groupId,jdbcType=VARCHAR},
+    disc_id = #{record.discId,jdbcType=VARCHAR},
+    house_id = #{record.houseId,jdbcType=VARCHAR},
+    customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
+    business_id = #{record.businessId,jdbcType=VARCHAR},
+    business_type = #{record.businessType,jdbcType=VARCHAR},
+    nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
+    nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
+    nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
+    created_by = #{record.createdBy,jdbcType=VARCHAR},
+    created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+    updated_by = #{record.updatedBy,jdbcType=VARCHAR},
+    updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+    content_type = #{record.contentType,jdbcType=INTEGER},
+    bank_number = #{record.bankNumber,jdbcType=CHAR},
+    pay_money = #{record.payMoney,jdbcType=DECIMAL},
+    pay_time = #{record.payTime,jdbcType=TIMESTAMP},
+    payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+    nc_bank_serial_id = #{record.ncBankSerialId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.transactionRecordManage.model.CollectionRecord">
+    update collection_record
+    <set>
+      <if test="groupId != null">
+        group_id = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="discId != null">
+        disc_id = #{discId,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=VARCHAR},
+      </if>
+      <if test="customerManagementId != null">
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+      </if>
+      <if test="businessId != null">
+        business_id = #{businessId,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        business_type = #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="ncSubmitStatus != null">
+        nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
+      </if>
+      <if test="ncSubmitDate != null">
+        nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ncSubmitName != null">
+        nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="contentType != null">
+        content_type = #{contentType,jdbcType=INTEGER},
+      </if>
+      <if test="bankNumber != null">
+        bank_number = #{bankNumber,jdbcType=CHAR},
+      </if>
+      <if test="payMoney != null">
+        pay_money = #{payMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="payTime != null">
+        pay_time = #{payTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentMethod != null">
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="ncBankSerialId != null">
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
+      </if>
+      <if test="ncJson != null">
+        nc_json = #{ncJson,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.transactionRecordManage.model.CollectionRecord">
+    update collection_record
+    set group_id = #{groupId,jdbcType=VARCHAR},
+        disc_id = #{discId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+        business_id = #{businessId,jdbcType=VARCHAR},
+        business_type = #{businessType,jdbcType=VARCHAR},
+        nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
+        nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
+        nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
+        created_by = #{createdBy,jdbcType=VARCHAR},
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+        updated_by = #{updatedBy,jdbcType=VARCHAR},
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+        content_type = #{contentType,jdbcType=INTEGER},
+        bank_number = #{bankNumber,jdbcType=CHAR},
+        pay_money = #{payMoney,jdbcType=DECIMAL},
+        pay_time = #{payTime,jdbcType=TIMESTAMP},
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR},
+        nc_json = #{ncJson,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.transactionRecordManage.model.CollectionRecord">
+    update collection_record
+    set group_id = #{groupId,jdbcType=VARCHAR},
+        disc_id = #{discId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
+        customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
+        business_id = #{businessId,jdbcType=VARCHAR},
+        business_type = #{businessType,jdbcType=VARCHAR},
+        nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
+        nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
+        nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
+        created_by = #{createdBy,jdbcType=VARCHAR},
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+        updated_by = #{updatedBy,jdbcType=VARCHAR},
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+        content_type = #{contentType,jdbcType=INTEGER},
+        bank_number = #{bankNumber,jdbcType=CHAR},
+        pay_money = #{payMoney,jdbcType=DECIMAL},
+        pay_time = #{payTime,jdbcType=TIMESTAMP},
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+        nc_bank_serial_id = #{ncBankSerialId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

pro-wx/src/main/java/com/idea/pro/wx/controller/buildManage/WxParkRoomController.java

@@ -198,13 +198,13 @@ public class WxParkRoomController extends BaseController {
 //        intentionalDepositService.sendToDepositVoucher(id);
 //        List<Map<String, String>> dictList = sysDictService.selectDictList("CONTENT_TYPE");
 //        invoiceTask.sendBuild();
-//        invoiceTask.sendHouse();
+        invoiceTask.sendHouse();
 //        customerManagementService.tempCusUpdate(file);
 //        customerManagementService.tempCusUpdate2(file);
 //        customerManagementService.tempContractUpdate(file);
 //        invoiceTask.sendCustomer();
 //        customerManagementService.tempDepositUpdate(file);
-        invoiceTask.customerAssign();
+//        invoiceTask.customerAssign();
 
         return success();
     }