1

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

@@ -82,4 +82,10 @@ public class IntentionalDeposit implements Serializable {
 
     private String ncJson;
 
+    private String bankName;
+
+    private String bankBranchName;
+
+    private String bankNumber;
+
 }

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

@@ -1735,6 +1735,216 @@ public class IntentionalDepositExample {
             addCriterion("nc_submit_name not between", value1, value2, "ncSubmitName");
             return (Criteria) this;
         }
+
+        public Criteria andBankNameIsNull() {
+            addCriterion("bank_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIsNotNull() {
+            addCriterion("bank_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameEqualTo(String value) {
+            addCriterion("bank_name =", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotEqualTo(String value) {
+            addCriterion("bank_name <>", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThan(String value) {
+            addCriterion("bank_name >", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_name >=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThan(String value) {
+            addCriterion("bank_name <", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_name <=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLike(String value) {
+            addCriterion("bank_name like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotLike(String value) {
+            addCriterion("bank_name not like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIn(List<String> values) {
+            addCriterion("bank_name in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotIn(List<String> values) {
+            addCriterion("bank_name not in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameBetween(String value1, String value2) {
+            addCriterion("bank_name between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotBetween(String value1, String value2) {
+            addCriterion("bank_name not between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIsNull() {
+            addCriterion("bank_branch_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIsNotNull() {
+            addCriterion("bank_branch_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameEqualTo(String value) {
+            addCriterion("bank_branch_name =", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotEqualTo(String value) {
+            addCriterion("bank_branch_name <>", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameGreaterThan(String value) {
+            addCriterion("bank_branch_name >", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_branch_name >=", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLessThan(String value) {
+            addCriterion("bank_branch_name <", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_branch_name <=", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLike(String value) {
+            addCriterion("bank_branch_name like", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotLike(String value) {
+            addCriterion("bank_branch_name not like", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIn(List<String> values) {
+            addCriterion("bank_branch_name in", values, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotIn(List<String> values) {
+            addCriterion("bank_branch_name not in", values, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameBetween(String value1, String value2) {
+            addCriterion("bank_branch_name between", value1, value2, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotBetween(String value1, String value2) {
+            addCriterion("bank_branch_name not between", value1, value2, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNull() {
+            addCriterion("bank_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNotNull() {
+            addCriterion("bank_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberEqualTo(String value) {
+            addCriterion("bank_number =", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotEqualTo(String value) {
+            addCriterion("bank_number <>", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThan(String value) {
+            addCriterion("bank_number >", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_number >=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThan(String value) {
+            addCriterion("bank_number <", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThanOrEqualTo(String value) {
+            addCriterion("bank_number <=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLike(String value) {
+            addCriterion("bank_number like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotLike(String value) {
+            addCriterion("bank_number not like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIn(List<String> values) {
+            addCriterion("bank_number in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotIn(List<String> values) {
+            addCriterion("bank_number not in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberBetween(String value1, String value2) {
+            addCriterion("bank_number between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotBetween(String value1, String value2) {
+            addCriterion("bank_number not between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -58,6 +58,12 @@ public class RoomSelectionInfo implements Serializable {
 
     private String ncJson;
 
+    private String bankName;
+
+    private String bankBranchName;
+
+    private String bankNumber;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -1295,6 +1295,216 @@ public class RoomSelectionInfoExample {
             addCriterion("nc_code not between", value1, value2, "ncCode");
             return (Criteria) this;
         }
+
+        public Criteria andBankNameIsNull() {
+            addCriterion("bank_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIsNotNull() {
+            addCriterion("bank_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameEqualTo(String value) {
+            addCriterion("bank_name =", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotEqualTo(String value) {
+            addCriterion("bank_name <>", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThan(String value) {
+            addCriterion("bank_name >", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_name >=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThan(String value) {
+            addCriterion("bank_name <", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_name <=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLike(String value) {
+            addCriterion("bank_name like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotLike(String value) {
+            addCriterion("bank_name not like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIn(List<String> values) {
+            addCriterion("bank_name in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotIn(List<String> values) {
+            addCriterion("bank_name not in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameBetween(String value1, String value2) {
+            addCriterion("bank_name between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotBetween(String value1, String value2) {
+            addCriterion("bank_name not between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIsNull() {
+            addCriterion("bank_branch_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIsNotNull() {
+            addCriterion("bank_branch_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameEqualTo(String value) {
+            addCriterion("bank_branch_name =", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotEqualTo(String value) {
+            addCriterion("bank_branch_name <>", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameGreaterThan(String value) {
+            addCriterion("bank_branch_name >", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_branch_name >=", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLessThan(String value) {
+            addCriterion("bank_branch_name <", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_branch_name <=", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameLike(String value) {
+            addCriterion("bank_branch_name like", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotLike(String value) {
+            addCriterion("bank_branch_name not like", value, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameIn(List<String> values) {
+            addCriterion("bank_branch_name in", values, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotIn(List<String> values) {
+            addCriterion("bank_branch_name not in", values, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameBetween(String value1, String value2) {
+            addCriterion("bank_branch_name between", value1, value2, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankBranchNameNotBetween(String value1, String value2) {
+            addCriterion("bank_branch_name not between", value1, value2, "bankBranchName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNull() {
+            addCriterion("bank_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIsNotNull() {
+            addCriterion("bank_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberEqualTo(String value) {
+            addCriterion("bank_number =", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotEqualTo(String value) {
+            addCriterion("bank_number <>", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThan(String value) {
+            addCriterion("bank_number >", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_number >=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThan(String value) {
+            addCriterion("bank_number <", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLessThanOrEqualTo(String value) {
+            addCriterion("bank_number <=", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberLike(String value) {
+            addCriterion("bank_number like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotLike(String value) {
+            addCriterion("bank_number not like", value, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberIn(List<String> values) {
+            addCriterion("bank_number in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotIn(List<String> values) {
+            addCriterion("bank_number not in", values, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberBetween(String value1, String value2) {
+            addCriterion("bank_number between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNumberNotBetween(String value1, String value2) {
+            addCriterion("bank_number not between", value1, value2, "bankNumber");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -28,6 +28,7 @@ import com.idea.invoice.model.ReceiptManageExample;
 import com.idea.invoice.service.ReceiptManageService;
 import com.idea.invoice.util.InvoiceConstant;
 import com.idea.invoice.util.InvoiceUtil;
+import com.idea.paymentManagement.mapper.PayLogExtendMapper;
 import com.idea.paymentManagement.mapper.PayLogMapper;
 import com.idea.paymentManagement.mapper.RefundDetailMapper;
 import com.idea.paymentManagement.mapper.RefundManageMapper;
@@ -94,6 +95,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
     private RefundManageMapper refundManageMapper;
     @Autowired
     private RefundDetailMapper refundDetailMapper;
+    @Autowired
+    private PayLogExtendMapper payLogExtendMapper;
 
 
     @Override
@@ -257,6 +260,9 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         payLog.setCreatedBy(userId);
         payLog.setSerialNumber(model.getSerialNumber());
         payLog.setIsHide(1);
+        payLog.setBankName(model.getBankName());
+        payLog.setBankBranchName(model.getBankBranchName());
+        payLog.setBankNumber(model.getBankNumber());
         payLogMapper.insertSelective(payLog);
 
         return result;
@@ -404,13 +410,14 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         roomSelectionInfo.setCollectionTime(model.getCollectionTime());
         roomSelectionInfoMapper.insertSelective(roomSelectionInfo);
 
-        // 转定金后生产合同
+        // 转定金后生成合同
         String contractId = IdUtil.simpleUUID();
         contractManageService.addContract(roomSelectionInfo, contractId,null);
 
         // 新增一条定金收款记录
+        String payLogId = IdUtil.simpleUUID();
         PayLog payLog = new PayLog();
-        payLog.setId(IdUtil.simpleUUID());
+        payLog.setId(payLogId);
         payLog.setBusinessId(roomSelectionInfoId);
         payLog.setHouseId(houseId);
         payLog.setContractId(contractId);
@@ -426,8 +433,21 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         payLog.setCreatedAt(new Date());
         payLog.setCreatedBy(ShiroUtils.getUserId());
         payLog.setSerialNumber(model.getDepositSerialNumber());
+        payLog.setBankName(model.getBankName());
+        payLog.setBankBranchName(model.getBankBranchName());
+        payLog.setBankNumber(model.getBankNumber());
         payLogMapper.insertSelective(payLog);
 
+        // 修改意向金对应的收款记录
+        PayLog modelPayLog = payLogExtendMapper.getByBusinessId(model.getId());
+        modelPayLog.setContractId(contractId);
+        modelPayLog.setHouseId(houseId);
+        modelPayLog.setIsConvert(1);
+        modelPayLog.setConvertPayLogId(payLogId);
+        modelPayLog.setConvertBusinessId(roomSelectionInfoId);
+        payLogMapper.updateByPrimaryKeySelective(modelPayLog);
+
+
         // 更新房间状态
         ParkRoom parkRoom = new ParkRoom();
         parkRoom.setId(response.getId());

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

@@ -262,6 +262,9 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         payLog.setCreatedAt(new Date());
         payLog.setCreatedBy(userId);
         payLog.setSerialNumber(model.getSerialNumber());
+        payLog.setBankName(model.getBankName());
+        payLog.setBankBranchName(model.getBankBranchName());
+        payLog.setBankNumber(model.getBankName());
         payLogMapper.insertSelective(payLog);
         // 票据管理 新增一条记录
         CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(model.getCustomerManagementId());

pro-base/src/main/java/com/idea/paymentManagement/mapper/PayLogExtendMapper.java

@@ -20,5 +20,6 @@ public interface PayLogExtendMapper {
 
     Integer countByGroupId(@Param("groupId") String groupId, @Param("contentType") String contentType);
 
+    PayLog getByBusinessId(String businessId);
 
 }

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

@@ -68,6 +68,14 @@ public class PayLog implements Serializable {
 
     private Integer isHide;
 
+    private String houseName;
+
+    private Integer isConvert;
+
+    private String convertPayLogId;
+
+    private String convertBusinessId;
+
     private static final long serialVersionUID = 1L;
 
 

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

@@ -576,6 +576,76 @@ public class PayLogExample {
             return (Criteria) this;
         }
 
+        public Criteria andHouseNameIsNull() {
+            addCriterion("house_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameIsNotNull() {
+            addCriterion("house_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameEqualTo(String value) {
+            addCriterion("house_name =", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotEqualTo(String value) {
+            addCriterion("house_name <>", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameGreaterThan(String value) {
+            addCriterion("house_name >", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameGreaterThanOrEqualTo(String value) {
+            addCriterion("house_name >=", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameLessThan(String value) {
+            addCriterion("house_name <", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameLessThanOrEqualTo(String value) {
+            addCriterion("house_name <=", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameLike(String value) {
+            addCriterion("house_name like", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotLike(String value) {
+            addCriterion("house_name not like", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameIn(List<String> values) {
+            addCriterion("house_name in", values, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotIn(List<String> values) {
+            addCriterion("house_name not in", values, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameBetween(String value1, String value2) {
+            addCriterion("house_name between", value1, value2, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotBetween(String value1, String value2) {
+            addCriterion("house_name not between", value1, value2, "houseName");
+            return (Criteria) this;
+        }
+
         public Criteria andBankNameIsNull() {
             addCriterion("bank_name is null");
             return (Criteria) this;
@@ -1735,6 +1805,206 @@ public class PayLogExample {
             addCriterion("is_hide not between", value1, value2, "isHide");
             return (Criteria) this;
         }
+
+        public Criteria andIsConvertIsNull() {
+            addCriterion("is_convert is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertIsNotNull() {
+            addCriterion("is_convert is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertEqualTo(Integer value) {
+            addCriterion("is_convert =", value, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertNotEqualTo(Integer value) {
+            addCriterion("is_convert <>", value, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertGreaterThan(Integer value) {
+            addCriterion("is_convert >", value, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_convert >=", value, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertLessThan(Integer value) {
+            addCriterion("is_convert <", value, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertLessThanOrEqualTo(Integer value) {
+            addCriterion("is_convert <=", value, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertIn(List<Integer> values) {
+            addCriterion("is_convert in", values, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertNotIn(List<Integer> values) {
+            addCriterion("is_convert not in", values, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertBetween(Integer value1, Integer value2) {
+            addCriterion("is_convert between", value1, value2, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsConvertNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_convert not between", value1, value2, "isConvert");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdIsNull() {
+            addCriterion("convert_pay_log_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdIsNotNull() {
+            addCriterion("convert_pay_log_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdEqualTo(String value) {
+            addCriterion("convert_pay_log_id =", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdNotEqualTo(String value) {
+            addCriterion("convert_pay_log_id <>", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdGreaterThan(String value) {
+            addCriterion("convert_pay_log_id >", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdGreaterThanOrEqualTo(String value) {
+            addCriterion("convert_pay_log_id >=", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdLessThan(String value) {
+            addCriterion("convert_pay_log_id <", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdLessThanOrEqualTo(String value) {
+            addCriterion("convert_pay_log_id <=", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdLike(String value) {
+            addCriterion("convert_pay_log_id like", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdNotLike(String value) {
+            addCriterion("convert_pay_log_id not like", value, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdIn(List<String> values) {
+            addCriterion("convert_pay_log_id in", values, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdNotIn(List<String> values) {
+            addCriterion("convert_pay_log_id not in", values, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdBetween(String value1, String value2) {
+            addCriterion("convert_pay_log_id between", value1, value2, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertPayLogIdNotBetween(String value1, String value2) {
+            addCriterion("convert_pay_log_id not between", value1, value2, "convertPayLogId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdIsNull() {
+            addCriterion("convert_business_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdIsNotNull() {
+            addCriterion("convert_business_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdEqualTo(String value) {
+            addCriterion("convert_business_id =", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdNotEqualTo(String value) {
+            addCriterion("convert_business_id <>", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdGreaterThan(String value) {
+            addCriterion("convert_business_id >", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdGreaterThanOrEqualTo(String value) {
+            addCriterion("convert_business_id >=", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdLessThan(String value) {
+            addCriterion("convert_business_id <", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdLessThanOrEqualTo(String value) {
+            addCriterion("convert_business_id <=", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdLike(String value) {
+            addCriterion("convert_business_id like", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdNotLike(String value) {
+            addCriterion("convert_business_id not like", value, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdIn(List<String> values) {
+            addCriterion("convert_business_id in", values, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdNotIn(List<String> values) {
+            addCriterion("convert_business_id not in", values, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdBetween(String value1, String value2) {
+            addCriterion("convert_business_id between", value1, value2, "convertBusinessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConvertBusinessIdNotBetween(String value1, String value2) {
+            addCriterion("convert_business_id not between", value1, value2, "convertBusinessId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -154,6 +154,9 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
         payLog.setStatus(0);
         payLog.setCreatedAt(new Date());
         payLog.setCreatedBy(ShiroUtils.getUserId());
+        payLog.setBankName(model.getBankName());
+        payLog.setBankBranchName(model.getBankBranchName());
+        payLog.setBankNumber(model.getBankNumber());
         payLogMapper.insertSelective(payLog);
 
         // 查询合同的房款收款情况

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

@@ -276,7 +276,8 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
     public List<PayLog> payListAll(PayLog model, DateTrans dt) {
         PayLogExample condition = getCondition(model, dt);
         // 剔除意向金
-        condition.createCriteria().andContentTypeNotEqualTo(7);
+        condition.createCriteria().andContentTypeNotEqualTo(7)
+                .andStatusEqualTo(0);
         return modelMapper.selectByExample(condition);
     }
 

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

@@ -70,7 +70,6 @@ public class TransactionRecordService {
      */
     public PageInfo<NccRecordVo> collectionRecord(Tablepar tablepar, NccRecordVo model) {
 
-        List<Map<String, String>> contentType = sysDictService.selectDictList("CONTENT_TYPE");
         PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
         if(StringUtils.isNotEmpty(model.getDiscIds())){
             List<String> list = Arrays.asList(model.getDiscIds().split(","));

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

@@ -27,6 +27,9 @@
     <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="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_branch_name" jdbcType="VARCHAR" property="bankBranchName" />
+    <result column="bank_number" jdbcType="CHAR" property="bankNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.IntentionalDeposit">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -98,7 +101,8 @@
     id, group_id, disc_id, house_id, customer_management_id, receivable_money, received_amount,
     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
+    status, refund_money, house_name, nc_submit_status, nc_submit_date, nc_submit_name,
+    bank_name, bank_branch_name, bank_number
   </sql>
   <sql id="Blob_Column_List">
     remark, deposit_remark, refund_remark, file_list, paper_receipts, nc_json
@@ -160,7 +164,8 @@
                                      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, remark,
+                                     nc_submit_date, nc_submit_name, bank_name,
+                                     bank_branch_name, bank_number, remark,
                                      deposit_remark, refund_remark, file_list,
                                      paper_receipts, nc_json)
     values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
@@ -171,7 +176,8 @@
             #{updatedId,jdbcType=VARCHAR}, #{handleId,jdbcType=VARCHAR}, #{handleDate,jdbcType=TIMESTAMP},
             #{refundHandleId,jdbcType=VARCHAR}, #{refundHandleDate,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
             #{refundMoney,jdbcType=DECIMAL}, #{houseName,jdbcType=VARCHAR}, #{ncSubmitStatus,jdbcType=INTEGER},
-            #{ncSubmitDate,jdbcType=TIMESTAMP}, #{ncSubmitName,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR},
+            #{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})
   </insert>
@@ -253,6 +259,15 @@
       <if test="ncSubmitName != null">
         nc_submit_name,
       </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankBranchName != null">
+        bank_branch_name,
+      </if>
+      <if test="bankNumber != null">
+        bank_number,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -348,6 +363,15 @@
       <if test="ncSubmitName != null">
         #{ncSubmitName,jdbcType=VARCHAR},
       </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranchName != null">
+        #{bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        #{bankNumber,jdbcType=CHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -452,6 +476,15 @@
       <if test="record.ncSubmitName != null">
         nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
       </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankBranchName != null">
+        bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankNumber != null">
+        bank_number = #{record.bankNumber,jdbcType=CHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -502,6 +535,9 @@
     nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
     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},
     remark = #{record.remark,jdbcType=LONGVARCHAR},
     deposit_remark = #{record.depositRemark,jdbcType=LONGVARCHAR},
     refund_remark = #{record.refundRemark,jdbcType=LONGVARCHAR},
@@ -538,7 +574,10 @@
     house_name = #{record.houseName,jdbcType=VARCHAR},
     nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
-    nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR}
+    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}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -618,6 +657,15 @@
       <if test="ncSubmitName != null">
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
       </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranchName != null">
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        bank_number = #{bankNumber,jdbcType=CHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -665,6 +713,9 @@
         nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
+        bank_name = #{bankName,jdbcType=VARCHAR},
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+        bank_number = #{bankNumber,jdbcType=CHAR},
         remark = #{remark,jdbcType=LONGVARCHAR},
         deposit_remark = #{depositRemark,jdbcType=LONGVARCHAR},
         refund_remark = #{refundRemark,jdbcType=LONGVARCHAR},
@@ -698,7 +749,10 @@
         house_name = #{houseName,jdbcType=VARCHAR},
         nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
-        nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR}
+        nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
+        bank_name = #{bankName,jdbcType=VARCHAR},
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+        bank_number = #{bankNumber,jdbcType=CHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -19,10 +19,15 @@
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
+    <result column="nc_code" jdbcType="VARCHAR" property="ncCode" />
+    <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" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.RoomSelectionInfo">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
     <result column="file_list" jdbcType="LONGVARCHAR" property="fileList" />
+    <result column="nc_json" jdbcType="LONGVARCHAR" property="ncJson" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -85,10 +90,10 @@
   <sql id="Base_Column_List">
     id, customer_management_id, group_id, disc_id, build_id, house_id, status, receivable_money,
     received_amount, payment_method, serial_number, collection_id, collection_time, created_id,
-    created_at, updated_at, updated_id
+    created_at, updated_at, updated_id, nc_code, bank_name, bank_branch_name, bank_number
   </sql>
   <sql id="Blob_Column_List">
-    remark, file_list
+    remark, file_list, nc_json
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.idea.customerManagement.model.RoomSelectionInfoExample" resultMap="ResultMapWithBLOBs">
     select
@@ -144,15 +149,19 @@
                                      status, receivable_money, received_amount,
                                      payment_method, serial_number, collection_id,
                                      collection_time, created_id, created_at,
-                                     updated_at, updated_id, remark,
-                                     file_list)
+                                     updated_at, updated_id, nc_code,
+                                     bank_name, bank_branch_name, bank_number,
+                                     remark, file_list, nc_json
+    )
     values (#{id,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
             #{discId,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR},
             #{status,jdbcType=INTEGER}, #{receivableMoney,jdbcType=DECIMAL}, #{receivedAmount,jdbcType=DECIMAL},
             #{paymentMethod,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, #{collectionId,jdbcType=VARCHAR},
             #{collectionTime,jdbcType=TIMESTAMP}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
-            #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR},
-            #{fileList,jdbcType=LONGVARCHAR})
+            #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{ncCode,jdbcType=VARCHAR},
+            #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR},
+            #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
     insert into room_selection_info
@@ -208,12 +217,27 @@
       <if test="updatedId != null">
         updated_id,
       </if>
+      <if test="ncCode != null">
+        nc_code,
+      </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankBranchName != null">
+        bank_branch_name,
+      </if>
+      <if test="bankNumber != null">
+        bank_number,
+      </if>
       <if test="remark != null">
         remark,
       </if>
       <if test="fileList != null">
         file_list,
       </if>
+      <if test="ncJson != null">
+        nc_json,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -267,12 +291,27 @@
       <if test="updatedId != null">
         #{updatedId,jdbcType=VARCHAR},
       </if>
+      <if test="ncCode != null">
+        #{ncCode,jdbcType=VARCHAR},
+      </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranchName != null">
+        #{bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        #{bankNumber,jdbcType=CHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
       <if test="fileList != null">
         #{fileList,jdbcType=LONGVARCHAR},
       </if>
+      <if test="ncJson != null">
+        #{ncJson,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.idea.customerManagement.model.RoomSelectionInfoExample" resultType="java.lang.Long">
@@ -335,12 +374,27 @@
       <if test="record.updatedId != null">
         updated_id = #{record.updatedId,jdbcType=VARCHAR},
       </if>
+      <if test="record.ncCode != null">
+        nc_code = #{record.ncCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankBranchName != null">
+        bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankNumber != null">
+        bank_number = #{record.bankNumber,jdbcType=CHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
       <if test="record.fileList != null">
         file_list = #{record.fileList,jdbcType=LONGVARCHAR},
       </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" />
@@ -365,8 +419,13 @@
     created_at = #{record.createdAt,jdbcType=TIMESTAMP},
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    nc_code = #{record.ncCode,jdbcType=VARCHAR},
+    bank_name = #{record.bankName,jdbcType=VARCHAR},
+    bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+    bank_number = #{record.bankNumber,jdbcType=CHAR},
     remark = #{record.remark,jdbcType=LONGVARCHAR},
-    file_list = #{record.fileList,jdbcType=LONGVARCHAR}
+    file_list = #{record.fileList,jdbcType=LONGVARCHAR},
+    nc_json = #{record.ncJson,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -389,7 +448,11 @@
     created_id = #{record.createdId,jdbcType=VARCHAR},
     created_at = #{record.createdAt,jdbcType=TIMESTAMP},
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-    updated_id = #{record.updatedId,jdbcType=VARCHAR}
+    updated_id = #{record.updatedId,jdbcType=VARCHAR},
+    nc_code = #{record.ncCode,jdbcType=VARCHAR},
+    bank_name = #{record.bankName,jdbcType=VARCHAR},
+    bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
+    bank_number = #{record.bankNumber,jdbcType=CHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -445,12 +508,27 @@
       <if test="updatedId != null">
         updated_id = #{updatedId,jdbcType=VARCHAR},
       </if>
+      <if test="ncCode != null">
+        nc_code = #{ncCode,jdbcType=VARCHAR},
+      </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranchName != null">
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNumber != null">
+        bank_number = #{bankNumber,jdbcType=CHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
       <if test="fileList != null">
         file_list = #{fileList,jdbcType=LONGVARCHAR},
       </if>
+      <if test="ncJson != null">
+        nc_json = #{ncJson,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -472,8 +550,13 @@
         created_at = #{createdAt,jdbcType=TIMESTAMP},
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
+        nc_code = #{ncCode,jdbcType=VARCHAR},
+        bank_name = #{bankName,jdbcType=VARCHAR},
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+        bank_number = #{bankNumber,jdbcType=CHAR},
         remark = #{remark,jdbcType=LONGVARCHAR},
-        file_list = #{fileList,jdbcType=LONGVARCHAR}
+        file_list = #{fileList,jdbcType=LONGVARCHAR},
+        nc_json = #{ncJson,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.RoomSelectionInfo">
@@ -493,7 +576,11 @@
         created_id = #{createdId,jdbcType=VARCHAR},
         created_at = #{createdAt,jdbcType=TIMESTAMP},
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-        updated_id = #{updatedId,jdbcType=VARCHAR}
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+        nc_code = #{ncCode,jdbcType=VARCHAR},
+        bank_name = #{bankName,jdbcType=VARCHAR},
+        bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
+        bank_number = #{bankNumber,jdbcType=CHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -66,5 +66,9 @@
         group by content_type
     </select>
 
+    <select id="getByBusinessId" resultType="com.idea.paymentManagement.model.PayLog">
+        select * from pay_log where business_id = #{businessId}
+    </select>
+
 
 </mapper>

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

@@ -9,6 +9,7 @@
     <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
     <result column="pay_type" jdbcType="INTEGER" property="payType" />
     <result column="content_type" jdbcType="INTEGER" property="contentType" />
+    <result column="house_name" jdbcType="VARCHAR" property="houseName" />
     <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" />
@@ -27,6 +28,9 @@
     <result column="nc_submit_date" jdbcType="TIMESTAMP" property="ncSubmitDate" />
     <result column="nc_submit_name" jdbcType="VARCHAR" property="ncSubmitName" />
     <result column="is_hide" jdbcType="INTEGER" property="isHide" />
+    <result column="is_convert" jdbcType="INTEGER" property="isConvert" />
+    <result column="convert_pay_log_id" jdbcType="VARCHAR" property="convertPayLogId" />
+    <result column="convert_business_id" jdbcType="VARCHAR" property="convertBusinessId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.paymentManagement.model.PayLog">
     <result column="file_list" jdbcType="LONGVARCHAR" property="fileList" />
@@ -92,9 +96,10 @@
   </sql>
   <sql id="Base_Column_List">
     id, business_id, house_id, contract_id, customer_management_id, pay_type, content_type,
-    bank_name, bank_branch_name, bank_number, pay_money, pay_time, payment_method, status,
-    payment_status, serial_number, remark, created_by, created_at, updated_by, updated_at,
-    nc_submit_status, nc_submit_date, nc_submit_name, is_hide
+    house_name, bank_name, bank_branch_name, bank_number, pay_money, pay_time, payment_method,
+    status, payment_status, serial_number, remark, created_by, created_at, updated_by,
+    updated_at, nc_submit_status, nc_submit_date, nc_submit_name, is_hide, is_convert,
+    convert_pay_log_id, convert_business_id
   </sql>
   <sql id="Blob_Column_List">
     file_list, nc_json
@@ -150,24 +155,26 @@
   <insert id="insert" parameterType="com.idea.paymentManagement.model.PayLog">
     insert into pay_log (id, business_id, house_id,
                          contract_id, customer_management_id, pay_type,
-                         content_type, bank_name, bank_branch_name,
-                         bank_number, pay_money, pay_time,
-                         payment_method, status, payment_status,
-                         serial_number, remark, created_by,
-                         created_at, updated_by, updated_at,
-                         nc_submit_status, nc_submit_date, nc_submit_name,
-                         is_hide, file_list, nc_json
-    )
+                         content_type, house_name, bank_name,
+                         bank_branch_name, bank_number, pay_money,
+                         pay_time, payment_method, status,
+                         payment_status, serial_number, remark,
+                         created_by, created_at, updated_by,
+                         updated_at, nc_submit_status, nc_submit_date,
+                         nc_submit_name, is_hide, is_convert,
+                         convert_pay_log_id, convert_business_id, file_list,
+                         nc_json)
     values (#{id,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR},
             #{contractId,jdbcType=VARCHAR}, #{customerManagementId,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER},
-            #{contentType,jdbcType=INTEGER}, #{bankName,jdbcType=VARCHAR}, #{bankBranchName,jdbcType=VARCHAR},
-            #{bankNumber,jdbcType=CHAR}, #{payMoney,jdbcType=DECIMAL}, #{payTime,jdbcType=TIMESTAMP},
-            #{paymentMethod,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{paymentStatus,jdbcType=INTEGER},
-            #{serialNumber,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR},
-            #{createdAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR}, #{updatedAt,jdbcType=TIMESTAMP},
-            #{ncSubmitStatus,jdbcType=INTEGER}, #{ncSubmitDate,jdbcType=TIMESTAMP}, #{ncSubmitName,jdbcType=VARCHAR},
-            #{isHide,jdbcType=INTEGER}, #{fileList,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}
-           )
+            #{contentType,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR},
+            #{bankBranchName,jdbcType=VARCHAR}, #{bankNumber,jdbcType=CHAR}, #{payMoney,jdbcType=DECIMAL},
+            #{payTime,jdbcType=TIMESTAMP}, #{paymentMethod,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
+            #{paymentStatus,jdbcType=INTEGER}, #{serialNumber,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
+            #{createdBy,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR},
+            #{updatedAt,jdbcType=TIMESTAMP}, #{ncSubmitStatus,jdbcType=INTEGER}, #{ncSubmitDate,jdbcType=TIMESTAMP},
+            #{ncSubmitName,jdbcType=VARCHAR}, #{isHide,jdbcType=INTEGER}, #{isConvert,jdbcType=INTEGER},
+            #{convertPayLogId,jdbcType=VARCHAR}, #{convertBusinessId,jdbcType=VARCHAR}, #{fileList,jdbcType=LONGVARCHAR},
+            #{ncJson,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.paymentManagement.model.PayLog">
     insert into pay_log
@@ -193,6 +200,9 @@
       <if test="contentType != null">
         content_type,
       </if>
+      <if test="houseName != null">
+        house_name,
+      </if>
       <if test="bankName != null">
         bank_name,
       </if>
@@ -247,6 +257,15 @@
       <if test="isHide != null">
         is_hide,
       </if>
+      <if test="isConvert != null">
+        is_convert,
+      </if>
+      <if test="convertPayLogId != null">
+        convert_pay_log_id,
+      </if>
+      <if test="convertBusinessId != null">
+        convert_business_id,
+      </if>
       <if test="fileList != null">
         file_list,
       </if>
@@ -276,6 +295,9 @@
       <if test="contentType != null">
         #{contentType,jdbcType=INTEGER},
       </if>
+      <if test="houseName != null">
+        #{houseName,jdbcType=VARCHAR},
+      </if>
       <if test="bankName != null">
         #{bankName,jdbcType=VARCHAR},
       </if>
@@ -330,6 +352,15 @@
       <if test="isHide != null">
         #{isHide,jdbcType=INTEGER},
       </if>
+      <if test="isConvert != null">
+        #{isConvert,jdbcType=INTEGER},
+      </if>
+      <if test="convertPayLogId != null">
+        #{convertPayLogId,jdbcType=VARCHAR},
+      </if>
+      <if test="convertBusinessId != null">
+        #{convertBusinessId,jdbcType=VARCHAR},
+      </if>
       <if test="fileList != null">
         #{fileList,jdbcType=LONGVARCHAR},
       </if>
@@ -368,6 +399,9 @@
       <if test="record.contentType != null">
         content_type = #{record.contentType,jdbcType=INTEGER},
       </if>
+      <if test="record.houseName != null">
+        house_name = #{record.houseName,jdbcType=VARCHAR},
+      </if>
       <if test="record.bankName != null">
         bank_name = #{record.bankName,jdbcType=VARCHAR},
       </if>
@@ -422,6 +456,15 @@
       <if test="record.isHide != null">
         is_hide = #{record.isHide,jdbcType=INTEGER},
       </if>
+      <if test="record.isConvert != null">
+        is_convert = #{record.isConvert,jdbcType=INTEGER},
+      </if>
+      <if test="record.convertPayLogId != null">
+        convert_pay_log_id = #{record.convertPayLogId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.convertBusinessId != null">
+        convert_business_id = #{record.convertBusinessId,jdbcType=VARCHAR},
+      </if>
       <if test="record.fileList != null">
         file_list = #{record.fileList,jdbcType=LONGVARCHAR},
       </if>
@@ -442,6 +485,7 @@
     customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     pay_type = #{record.payType,jdbcType=INTEGER},
     content_type = #{record.contentType,jdbcType=INTEGER},
+    house_name = #{record.houseName,jdbcType=VARCHAR},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
     bank_number = #{record.bankNumber,jdbcType=CHAR},
@@ -460,6 +504,9 @@
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
     nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
     is_hide = #{record.isHide,jdbcType=INTEGER},
+    is_convert = #{record.isConvert,jdbcType=INTEGER},
+    convert_pay_log_id = #{record.convertPayLogId,jdbcType=VARCHAR},
+    convert_business_id = #{record.convertBusinessId,jdbcType=VARCHAR},
     file_list = #{record.fileList,jdbcType=LONGVARCHAR},
     nc_json = #{record.ncJson,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -475,6 +522,7 @@
     customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
     pay_type = #{record.payType,jdbcType=INTEGER},
     content_type = #{record.contentType,jdbcType=INTEGER},
+    house_name = #{record.houseName,jdbcType=VARCHAR},
     bank_name = #{record.bankName,jdbcType=VARCHAR},
     bank_branch_name = #{record.bankBranchName,jdbcType=VARCHAR},
     bank_number = #{record.bankNumber,jdbcType=CHAR},
@@ -492,7 +540,10 @@
     nc_submit_status = #{record.ncSubmitStatus,jdbcType=INTEGER},
     nc_submit_date = #{record.ncSubmitDate,jdbcType=TIMESTAMP},
     nc_submit_name = #{record.ncSubmitName,jdbcType=VARCHAR},
-    is_hide = #{record.isHide,jdbcType=INTEGER}
+    is_hide = #{record.isHide,jdbcType=INTEGER},
+    is_convert = #{record.isConvert,jdbcType=INTEGER},
+    convert_pay_log_id = #{record.convertPayLogId,jdbcType=VARCHAR},
+    convert_business_id = #{record.convertBusinessId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -518,6 +569,9 @@
       <if test="contentType != null">
         content_type = #{contentType,jdbcType=INTEGER},
       </if>
+      <if test="houseName != null">
+        house_name = #{houseName,jdbcType=VARCHAR},
+      </if>
       <if test="bankName != null">
         bank_name = #{bankName,jdbcType=VARCHAR},
       </if>
@@ -572,6 +626,15 @@
       <if test="isHide != null">
         is_hide = #{isHide,jdbcType=INTEGER},
       </if>
+      <if test="isConvert != null">
+        is_convert = #{isConvert,jdbcType=INTEGER},
+      </if>
+      <if test="convertPayLogId != null">
+        convert_pay_log_id = #{convertPayLogId,jdbcType=VARCHAR},
+      </if>
+      <if test="convertBusinessId != null">
+        convert_business_id = #{convertBusinessId,jdbcType=VARCHAR},
+      </if>
       <if test="fileList != null">
         file_list = #{fileList,jdbcType=LONGVARCHAR},
       </if>
@@ -589,6 +652,7 @@
         customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         pay_type = #{payType,jdbcType=INTEGER},
         content_type = #{contentType,jdbcType=INTEGER},
+        house_name = #{houseName,jdbcType=VARCHAR},
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
         bank_number = #{bankNumber,jdbcType=CHAR},
@@ -607,6 +671,9 @@
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
         is_hide = #{isHide,jdbcType=INTEGER},
+        is_convert = #{isConvert,jdbcType=INTEGER},
+        convert_pay_log_id = #{convertPayLogId,jdbcType=VARCHAR},
+        convert_business_id = #{convertBusinessId,jdbcType=VARCHAR},
         file_list = #{fileList,jdbcType=LONGVARCHAR},
         nc_json = #{ncJson,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -619,6 +686,7 @@
         customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         pay_type = #{payType,jdbcType=INTEGER},
         content_type = #{contentType,jdbcType=INTEGER},
+        house_name = #{houseName,jdbcType=VARCHAR},
         bank_name = #{bankName,jdbcType=VARCHAR},
         bank_branch_name = #{bankBranchName,jdbcType=VARCHAR},
         bank_number = #{bankNumber,jdbcType=CHAR},
@@ -636,7 +704,10 @@
         nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
         nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
         nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
-        is_hide = #{isHide,jdbcType=INTEGER}
+        is_hide = #{isHide,jdbcType=INTEGER},
+        is_convert = #{isConvert,jdbcType=INTEGER},
+        convert_pay_log_id = #{convertPayLogId,jdbcType=VARCHAR},
+        convert_business_id = #{convertBusinessId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -15,13 +15,14 @@
             p.nc_submit_name,
             p.bank_number,
             u.truename created_name,
-            cm.house_name,
-            cm.buyer_name
+            cm.buyer_name,
+            c.house_name
         FROM
         pay_log p
         LEFT JOIN customer_management cm ON cm.id = p.customer_management_id
         LEFT JOIN frame_user u on u.id = p.created_by
         LEFT JOIN park_room r on r.id = p.house_id
+        LEFT JOIN contract_manage c on c.id = p.contract_id
         <where>
             <if test="discIdList != null">
                 AND r.disc_id in
@@ -106,11 +107,9 @@
         customer_management.house_name,
         frame_user.truename as createdName,
         customer_management.house_id,
-        concat(park_info.group_name,'-',park_floor_disc.name) groupDiscName
         from intentional_deposit
         left join customer_management on customer_management.id = intentional_deposit.customer_management_id
         left join frame_user on frame_user.id = intentional_deposit.created_id
-        left join park_info on park_info.id = intentional_deposit.group_id
         left join park_floor_disc on park_floor_disc.id = intentional_deposit.disc_id
         <where>
                 and intentional_deposit.status != 1