1

pro-base/src/main/java/com/idea/customerManagement/model/IntentionalDeposit.java

@@ -88,4 +88,6 @@ public class IntentionalDeposit implements Serializable {
 
     private String bankNumber;
 
+    private String roomSelectionInfoId;
+
 }

pro-base/src/main/java/com/idea/customerManagement/model/IntentionalDepositExample.java

@@ -1945,6 +1945,76 @@ public class IntentionalDepositExample {
             addCriterion("bank_number not between", value1, value2, "bankNumber");
             return (Criteria) this;
         }
+
+        public Criteria andRoomSelectionInfoIdIsNull() {
+            addCriterion("room_selection_info_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdIsNotNull() {
+            addCriterion("room_selection_info_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdEqualTo(String value) {
+            addCriterion("room_selection_info_id =", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdNotEqualTo(String value) {
+            addCriterion("room_selection_info_id <>", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdGreaterThan(String value) {
+            addCriterion("room_selection_info_id >", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdGreaterThanOrEqualTo(String value) {
+            addCriterion("room_selection_info_id >=", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdLessThan(String value) {
+            addCriterion("room_selection_info_id <", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdLessThanOrEqualTo(String value) {
+            addCriterion("room_selection_info_id <=", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdLike(String value) {
+            addCriterion("room_selection_info_id like", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdNotLike(String value) {
+            addCriterion("room_selection_info_id not like", value, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdIn(List<String> values) {
+            addCriterion("room_selection_info_id in", values, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdNotIn(List<String> values) {
+            addCriterion("room_selection_info_id not in", values, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdBetween(String value1, String value2) {
+            addCriterion("room_selection_info_id between", value1, value2, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoomSelectionInfoIdNotBetween(String value1, String value2) {
+            addCriterion("room_selection_info_id not between", value1, value2, "roomSelectionInfoId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -366,10 +366,13 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         if (StringUtils.isEmpty(uerId)){
             uerId = ShiroUtils.getUserId();
         }
+        String roomSelectionInfoId = IdUtil.simpleUUID();
+
         // 转定金
         model.setStatus(2);
         model.setHandleId(ShiroUtils.getUserId());
         model.setHandleDate(new Date());
+        model.setRoomSelectionInfoId(roomSelectionInfoId);
         int result = modelMapper.updateByPrimaryKeySelective(model);
 
         String houseId = model.getHouseId();
@@ -391,7 +394,6 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         customerManagementMapper.updateByPrimaryKeySelective(customerManagement);
 
         // 新增选房信息
-        String roomSelectionInfoId = IdUtil.simpleUUID();
         RoomSelectionInfo roomSelectionInfo = new RoomSelectionInfo();
         roomSelectionInfo.setId(roomSelectionInfoId);
         roomSelectionInfo.setCustomerManagementId(customerManagementId);

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

@@ -247,7 +247,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         // 新增一条定金收款记录
         PayLog payLog = new PayLog();
         payLog.setId(IdUtil.simpleUUID());
-        payLog.setBusinessId(payLog.getId());
+        payLog.setBusinessId(model.getId());
         payLog.setHouseId(model.getHouseId());
         payLog.setContractId(contractId);
         payLog.setCustomerManagementId(model.getCustomerManagementId());

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

@@ -30,6 +30,7 @@
     <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
     <result column="bank_branch_name" jdbcType="VARCHAR" property="bankBranchName" />
     <result column="bank_number" jdbcType="CHAR" property="bankNumber" />
+    <result column="room_selection_info_id" jdbcType="VARCHAR" property="roomSelectionInfoId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.IntentionalDeposit">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -102,7 +103,7 @@
     payment_method, serial_number, deposit_serial_number, collection_time, created_id,
     created_at, updated_at, updated_id, handle_id, handle_date, refund_handle_id, refund_handle_date,
     status, refund_money, house_name, nc_submit_status, nc_submit_date, nc_submit_name,
-    bank_name, bank_branch_name, bank_number
+    bank_name, bank_branch_name, bank_number, room_selection_info_id
   </sql>
   <sql id="Blob_Column_List">
     remark, deposit_remark, refund_remark, file_list, paper_receipts, nc_json
@@ -165,9 +166,10 @@
                                      refund_handle_id, refund_handle_date, status,
                                      refund_money, house_name, nc_submit_status,
                                      nc_submit_date, nc_submit_name, bank_name,
-                                     bank_branch_name, bank_number, remark,
-                                     deposit_remark, refund_remark, file_list,
-                                     paper_receipts, nc_json)
+                                     bank_branch_name, bank_number, room_selection_info_id,
+                                     remark, deposit_remark, refund_remark,
+                                     file_list, paper_receipts, nc_json
+    )
     values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
             #{houseId,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{receivableMoney,jdbcType=DECIMAL},
             #{receivedAmount,jdbcType=DECIMAL}, #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR},
@@ -177,9 +179,10 @@
             #{refundHandleId,jdbcType=VARCHAR}, #{refundHandleDate,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
             #{refundMoney,jdbcType=DECIMAL}, #{houseName,jdbcType=VARCHAR}, #{ncSubmitStatus,jdbcType=INTEGER},
             #{ncSubmitDate,jdbcType=TIMESTAMP}, #{ncSubmitName,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR},
-            #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR}, #{remark,jdbcType=LONGVARCHAR},
-            #{depositRemark,jdbcType=LONGVARCHAR}, #{refundRemark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR},
-            #{paperReceipts,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR})
+            #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR}, #{roomSelectionInfoId,jdbcType=VARCHAR},
+            #{remark,jdbcType=LONGVARCHAR}, #{depositRemark,jdbcType=LONGVARCHAR}, #{refundRemark,jdbcType=LONGVARCHAR},
+            #{fileList,jdbcType=LONGVARCHAR}, #{paperReceipts,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     insert into intentional_deposit
@@ -268,6 +271,9 @@
       <if test="bankNumber != null">
         bank_number,
       </if>
+      <if test="roomSelectionInfoId != null">
+        room_selection_info_id,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -372,6 +378,9 @@
       <if test="bankNumber != null">
         #{bankNumber,jdbcType=CHAR},
       </if>
+      <if test="roomSelectionInfoId != null">
+        #{roomSelectionInfoId,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -485,6 +494,9 @@
       <if test="record.bankNumber != null">
         bank_number = #{record.bankNumber,jdbcType=CHAR},
       </if>
+      <if test="record.roomSelectionInfoId != null">
+        room_selection_info_id = #{record.roomSelectionInfoId,jdbcType=VARCHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -538,6 +550,7 @@
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
     bank_number = #{record.bankNumber,jdbcType=CHAR},
+    room_selection_info_id = #{record.roomSelectionInfoId,jdbcType=VARCHAR},
     remark = #{record.remark,jdbcType=LONGVARCHAR},
     deposit_remark = #{record.depositRemark,jdbcType=LONGVARCHAR},
     refund_remark = #{record.refundRemark,jdbcType=LONGVARCHAR},
@@ -577,7 +590,8 @@
     nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
-    bank_number = #{record.bankNumber,jdbcType=CHAR}
+    bank_number = #{record.bankNumber,jdbcType=CHAR},
+    room_selection_info_id = #{record.roomSelectionInfoId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -666,6 +680,9 @@
       <if test="bankNumber != null">
         bank_number = #{bankNumber,jdbcType=CHAR},
       </if>
+      <if test="roomSelectionInfoId != null">
+        room_selection_info_id = #{roomSelectionInfoId,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -716,6 +733,7 @@
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
         bank_number = #{bankNumber,jdbcType=CHAR},
+        room_selection_info_id = #{roomSelectionInfoId,jdbcType=VARCHAR},
         remark = #{remark,jdbcType=LONGVARCHAR},
         deposit_remark = #{depositRemark,jdbcType=LONGVARCHAR},
         refund_remark = #{refundRemark,jdbcType=LONGVARCHAR},
@@ -752,7 +770,8 @@
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
-        bank_number = #{bankNumber,jdbcType=CHAR}
+        bank_number = #{bankNumber,jdbcType=CHAR},
+        room_selection_info_id = #{roomSelectionInfoId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>