1

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

@@ -105,7 +105,7 @@ public class IntentionalDepositController extends BaseController {
     @PostMapping(value = "toDeposit",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult toDeposit(IntentionalDeposit model){
-        int result = modelService.toDeposit(model);
+        int result = modelService.toDeposit(model,null);
         return result(result);
     }
 

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

@@ -70,7 +70,7 @@ public class RoomSelectionInfoController extends BaseController {
     @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult add(RoomSelectionInfoDto model){
-        int result = modelService.add(model);
+        int result = modelService.add(model,null);
         return result(result);
     }
 
@@ -82,7 +82,7 @@ public class RoomSelectionInfoController extends BaseController {
     @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     public AjaxResult edit(RoomSelectionInfoDto model){
-        int result = modelService.edit(model);
+        int result = modelService.edit(model,null);
         return result(result);
     }
 

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class RoomSelectionInfoDto extends RoomSelectionInfo {
@@ -44,4 +45,10 @@ public class RoomSelectionInfoDto extends RoomSelectionInfo {
 
     private String pkInformerId;
 
+    private String discIds;
+
+    private List<String> discIdList;
+
+    private String roomSelectionDate;
+
 }

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

@@ -74,8 +74,12 @@ public class IntentionalDeposit implements Serializable {
 
     private String houseName;
 
-    private String ncJson;
+    private Integer ncSubmitStatus;
+
+    private Date ncSubmitDate;
 
-    private String turnNcJson;
+    private String ncSubmitName;
+
+    private String ncJson;
 
 }

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

@@ -1545,6 +1545,196 @@ public class IntentionalDepositExample {
             addCriterion("house_name not between", value1, value2, "houseName");
             return (Criteria) this;
         }
+
+        public Criteria andNcSubmitStatusIsNull() {
+            addCriterion("nc_submit_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusIsNotNull() {
+            addCriterion("nc_submit_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusEqualTo(Integer value) {
+            addCriterion("nc_submit_status =", value, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusNotEqualTo(Integer value) {
+            addCriterion("nc_submit_status <>", value, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusGreaterThan(Integer value) {
+            addCriterion("nc_submit_status >", value, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("nc_submit_status >=", value, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusLessThan(Integer value) {
+            addCriterion("nc_submit_status <", value, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("nc_submit_status <=", value, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusIn(List<Integer> values) {
+            addCriterion("nc_submit_status in", values, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusNotIn(List<Integer> values) {
+            addCriterion("nc_submit_status not in", values, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusBetween(Integer value1, Integer value2) {
+            addCriterion("nc_submit_status between", value1, value2, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("nc_submit_status not between", value1, value2, "ncSubmitStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateIsNull() {
+            addCriterion("nc_submit_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateIsNotNull() {
+            addCriterion("nc_submit_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateEqualTo(Date value) {
+            addCriterion("nc_submit_date =", value, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateNotEqualTo(Date value) {
+            addCriterion("nc_submit_date <>", value, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateGreaterThan(Date value) {
+            addCriterion("nc_submit_date >", value, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("nc_submit_date >=", value, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateLessThan(Date value) {
+            addCriterion("nc_submit_date <", value, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateLessThanOrEqualTo(Date value) {
+            addCriterion("nc_submit_date <=", value, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateIn(List<Date> values) {
+            addCriterion("nc_submit_date in", values, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateNotIn(List<Date> values) {
+            addCriterion("nc_submit_date not in", values, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateBetween(Date value1, Date value2) {
+            addCriterion("nc_submit_date between", value1, value2, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitDateNotBetween(Date value1, Date value2) {
+            addCriterion("nc_submit_date not between", value1, value2, "ncSubmitDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameIsNull() {
+            addCriterion("nc_submit_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameIsNotNull() {
+            addCriterion("nc_submit_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameEqualTo(String value) {
+            addCriterion("nc_submit_name =", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameNotEqualTo(String value) {
+            addCriterion("nc_submit_name <>", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameGreaterThan(String value) {
+            addCriterion("nc_submit_name >", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameGreaterThanOrEqualTo(String value) {
+            addCriterion("nc_submit_name >=", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameLessThan(String value) {
+            addCriterion("nc_submit_name <", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameLessThanOrEqualTo(String value) {
+            addCriterion("nc_submit_name <=", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameLike(String value) {
+            addCriterion("nc_submit_name like", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameNotLike(String value) {
+            addCriterion("nc_submit_name not like", value, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameIn(List<String> values) {
+            addCriterion("nc_submit_name in", values, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameNotIn(List<String> values) {
+            addCriterion("nc_submit_name not in", values, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameBetween(String value1, String value2) {
+            addCriterion("nc_submit_name between", value1, value2, "ncSubmitName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcSubmitNameNotBetween(String value1, String value2) {
+            addCriterion("nc_submit_name not between", value1, value2, "ncSubmitName");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -112,7 +112,7 @@ public class ContractManageService implements BaseService<ContractManage, Contra
      * @param roomSelectionInfo
      * @return
      */
-    public int addContract(RoomSelectionInfo roomSelectionInfo,String contractId){
+    public int addContract(RoomSelectionInfo roomSelectionInfo,String contractId,String userId){
 
         ParkRoom parkRoom = parkRoomService.selectByPrimaryKey(roomSelectionInfo.getHouseId());
         ParkFloorDisc parkFloorDisc = parkFloorDiscService.selectByPrimaryKey(parkRoom.getDiscId());
@@ -120,6 +120,9 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         if(StringUtils.isEmpty(contractId)){
             contractId =  IdUtil.simpleUUID();
         }
+        if(StringUtils.isEmpty(userId)){
+            userId = ShiroUtils.getUserId();
+        }
         ContractManage contractManage = new ContractManage();
         contractManage.setId(contractId);
         contractManage.setCustomerManagementId(roomSelectionInfo.getCustomerManagementId());
@@ -136,7 +139,7 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         contractManage.setContractStatus(1);
         contractManage.setFundCollectionStatus(1);
         contractManage.setCreatedAt(new Date());
-        contractManage.setCreatedId(ShiroUtils.getUserId());
+        contractManage.setCreatedId(userId);
         
         // 拼接买受人名称
         BuyerExample buyerExample = new BuyerExample();

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

@@ -145,6 +145,19 @@ public class CustomerManagementService implements BaseService<CustomerManagement
         return pageInfo;
     }
 
+    public List<CustomerManagementDto> listAll(CustomerManagementDto model, DateTrans dt) {
+        if(StringUtils.isNotEmpty(model.getGroupIds())){
+            model.setGroupIdList(Arrays.asList(model.getGroupIds().split(",")));
+        }
+        if(StringUtils.isNotEmpty(model.getDiscIds())){
+            model.setDiscIdList(Arrays.asList(model.getDiscIds().split(",")));
+        }
+        List<CustomerManagementDto> list = extendMapper.listByModel(model);
+        return list;
+    }
+
+
+
     /**
      * 新增轮号客户
      * @param model

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

@@ -236,7 +236,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         receiptManage.setReceiptMoney(model.getReceivedAmount());
         receiptManage.setReceiptNumber(model.getSerialNumber());
         receiptManage.setCreatedId(userId);
-        receiptManageService.add(receiptManage);
+        receiptManageService.add(receiptManage,userId);
 
         // 收款记录 新增一条记录
         PayLog payLog = new PayLog();
@@ -353,9 +353,11 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
      * @return
      */
     @Transactional
-    public int toDeposit(IntentionalDeposit model) {
-
+    public int toDeposit(IntentionalDeposit model,String uerId) {
 
+        if (StringUtils.isEmpty(uerId)){
+            uerId = ShiroUtils.getUserId();
+        }
         // 转定金
         model.setStatus(2);
         model.setHandleId(ShiroUtils.getUserId());
@@ -402,7 +404,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
         // 转定金后生产合同
         String contractId = IdUtil.simpleUUID();
-        contractManageService.addContract(roomSelectionInfo, contractId);
+        contractManageService.addContract(roomSelectionInfo, contractId,null);
 
         // 新增一条定金收款记录
         PayLog payLog = new PayLog();
@@ -444,7 +446,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         receiptManage.setReceiptNumber(model.getDepositSerialNumber());
         // 已开
         receiptManage.setReceiptStatus(1);
-        receiptManageService.add(receiptManage);
+        receiptManageService.add(receiptManage,uerId);
         // 更新关联的意向金数据 更新意向金票据关联票号
         ReceiptManageExample receiptManageExample = new ReceiptManageExample();
         receiptManageExample.createCriteria().andBusinessIdEqualTo(model.getId());

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

@@ -19,11 +19,13 @@ import com.idea.customerManagement.mapper.RoomSelectionInfoExtendMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
 import com.idea.customerManagement.model.*;
 import com.idea.invoice.model.ReceiptManage;
+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.PayLogMapper;
 import com.idea.paymentManagement.model.PayLog;
+import com.idea.paymentManagement.model.PayLogExample;
 import com.idea.util.DateUtils;
 import com.idea.util.MoneyUtils;
 import com.idea.util.ReplaceWord;
@@ -223,17 +225,20 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
      * @return
      */
     @Transactional
-    public int add(RoomSelectionInfoDto model) {
+    public int add(RoomSelectionInfoDto model,String userId) {
 
+        if(StringUtils.isEmpty(userId)){
+            userId = ShiroUtils.getUserId();
+        }
         model.setUpdatedAt(new Date());
-        model.setUpdatedId(ShiroUtils.getUserId());
+        model.setUpdatedId(userId);
         model.setStatus(2);
-        model.setCollectionId(ShiroUtils.getUserId());
+        model.setCollectionId(userId);
         model.setCollectionTime(new Date());
         int result = updateByPrimaryKeySelective(model);
         // 生成合同
         String contractId = IdUtil.simpleUUID();
-        contractManageService.addContract(model, contractId);
+        contractManageService.addContract(model, contractId,userId);
         // 修改房间已收状态 已认购
         ParkRoom parkRoom = new ParkRoom();
         parkRoom.setId(model.getHouseId());
@@ -242,6 +247,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         // 新增一条定金收款记录
         PayLog payLog = new PayLog();
         payLog.setId(IdUtil.simpleUUID());
+        payLog.setBusinessId(payLog.getId());
         payLog.setHouseId(model.getHouseId());
         payLog.setContractId(contractId);
         payLog.setCustomerManagementId(model.getCustomerManagementId());
@@ -254,7 +260,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         payLog.setPaymentMethod(model.getPaymentMethod());
         payLog.setStatus(0);
         payLog.setCreatedAt(new Date());
-        payLog.setCreatedBy(ShiroUtils.getUserId());
+        payLog.setCreatedBy(userId);
         payLog.setSerialNumber(model.getSerialNumber());
         payLogMapper.insertSelective(payLog);
         // 票据管理 新增一条记录
@@ -269,7 +275,7 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         receiptManage.setReceiptType("2");
         receiptManage.setReceiptMoney(model.getReceivedAmount());
         receiptManage.setReceiptNumber(model.getSerialNumber());
-        receiptManageService.add(receiptManage);
+        receiptManageService.add(receiptManage,userId);
         return result;
     }
 
@@ -279,12 +285,38 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
      * @param model
      * @return
      */
-    public int edit(RoomSelectionInfoDto model) {
+    @Transactional
+    public int edit(RoomSelectionInfoDto model,String userId) {
 
+        if (StringUtils.isEmpty(userId)){
+            userId = ShiroUtils.getUserId();
+        }
         model.setUpdatedAt(new Date());
-        model.setUpdatedId(ShiroUtils.getUserId());
-        model.setCollectionId(ShiroUtils.getUserId());
-        return updateByPrimaryKeySelective(model);
+        model.setUpdatedId(userId);
+        model.setCollectionId(userId);
+        int result = updateByPrimaryKeySelective(model);
+
+        // 收款记录 定金数值调整
+        PayLogExample payLogExample = new PayLogExample();
+        payLogExample.createCriteria().andBusinessIdEqualTo(model.getId());
+        List<PayLog> payLogs = payLogMapper.selectByExample(payLogExample);
+        if(CollectionUtils.isNotEmpty(payLogs)){
+            PayLog payLog = payLogs.get(0);
+            payLog.setPayMoney(model.getReceivedAmount());
+            payLogMapper.updateByPrimaryKeySelective(payLog);
+        }
+
+        // 票据管理 定金数值调整
+        ReceiptManageExample receiptManageExample = new ReceiptManageExample();
+        receiptManageExample.createCriteria().andBusinessIdEqualTo(model.getId()).andReceiptTypeEqualTo("2");
+        List<ReceiptManage> receiptManages = receiptManageService.selectByExample(receiptManageExample);
+        if (CollectionUtils.isNotEmpty(receiptManages)) {
+            ReceiptManage manage = receiptManages.get(0);
+            manage.setReceiptMoney(model.getReceivedAmount());
+            receiptManageService.updateByPrimaryKeySelective(manage);
+        }
+
+        return result;
     }
 
     /**
@@ -351,6 +383,10 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
     public PageInfo<RoomSelectionInfoDto> listByModel(Tablepar tablepar, RoomSelectionInfoDto model, DateTrans dt) {
         PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
         List<RoomSelectionInfoDto> list = extendMapper.listByModel(model);
+        if(StringUtils.isNotEmpty(model.getDiscIds())){
+            List<String> ids = Arrays.asList(model.getDiscIds().split(","));
+            model.setDiscIdList(ids);
+        }
         PageInfo<RoomSelectionInfoDto> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }

pro-base/src/main/java/com/idea/invoice/service/InvoiceManageService.java

@@ -544,7 +544,7 @@ public class InvoiceManageService implements BaseService<InvoiceManage, InvoiceM
         }
         receiptManage.setReceiptMoney(model.getInvoiceAmount());
         receiptManage.setReceiptNumber(model.getInvoiceNo());
-        int result = receiptManageService.add(receiptManage);
+        int result = receiptManageService.add(receiptManage,ShiroUtils.getUserId());
         return result;
     }
 

pro-base/src/main/java/com/idea/invoice/service/ReceiptManageService.java

@@ -129,14 +129,17 @@ public class ReceiptManageService implements BaseService<ReceiptManage, ReceiptM
      * @param model
      * @return
      */
-    public int add(ReceiptManage model) {
+    public int add(ReceiptManage model,String userId) {
 
         if (model.getReceiptStatus() == null) {
             // 默认 已开
             model.setReceiptStatus(1);
         }
+        if(StringUtils.isEmpty(userId)){
+            userId = ShiroUtils.getUserId();
+        }
         model.setCreatedAt(new Date());
-        model.setCreatedId(model.getCreatedId() == null ? ShiroUtils.getUserId() : model.getCreatedId());
+        model.setCreatedId(userId);
         int result = insertSelective(model);
         return result;
     }

pro-base/src/main/java/com/idea/invoice/util/InvoiceUtil.java

@@ -1,11 +1,8 @@
 package com.idea.invoice.util;
 
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.idea.invoice.model.InvoiceManage;
 import com.idea.util.DateUtils;
 import com.rockstar.util.SnowflakeIdWorker;
 import com.rockstar.util.StringUtils;

pro-base/src/main/java/com/idea/paymentManagement/controller/PayLogController.java

@@ -73,7 +73,7 @@ public class PayLogController extends BaseController {
     @ResponseBody
     public AjaxResult add(PayLog record){
 
-        int result = modelService.add(record);
+        int result = modelService.add(record,null);
         return result(result);
     }
 

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

@@ -14,6 +14,8 @@ public class PayLog implements Serializable {
 
     private String houseId;
 
+    private String businessId;
+
     private String contractId;
 
     private String customerManagementId;

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

@@ -176,6 +176,76 @@ public class PayLogExample {
             return (Criteria) this;
         }
 
+        public Criteria andBusinessIdIsNull() {
+            addCriterion("business_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIsNotNull() {
+            addCriterion("business_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdEqualTo(String value) {
+            addCriterion("business_id =", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotEqualTo(String value) {
+            addCriterion("business_id <>", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdGreaterThan(String value) {
+            addCriterion("business_id >", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdGreaterThanOrEqualTo(String value) {
+            addCriterion("business_id >=", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLessThan(String value) {
+            addCriterion("business_id <", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLessThanOrEqualTo(String value) {
+            addCriterion("business_id <=", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdLike(String value) {
+            addCriterion("business_id like", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotLike(String value) {
+            addCriterion("business_id not like", value, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdIn(List<String> values) {
+            addCriterion("business_id in", values, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotIn(List<String> values) {
+            addCriterion("business_id not in", values, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdBetween(String value1, String value2) {
+            addCriterion("business_id between", value1, value2, "businessId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIdNotBetween(String value1, String value2) {
+            addCriterion("business_id not between", value1, value2, "businessId");
+            return (Criteria) this;
+        }
+
         public Criteria andHouseIdIsNull() {
             addCriterion("house_id is null");
             return (Criteria) this;

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

@@ -52,6 +52,8 @@ public class RefundManage implements Serializable {
 
     private Integer isHide;
 
+    private String houseName;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -1295,6 +1295,76 @@ public class RefundManageExample {
             addCriterion("is_hide not between", value1, value2, "isHide");
             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 static class Criteria extends GeneratedCriteria {

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

@@ -158,11 +158,14 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
      * @return
      */
     @Transactional
-    public int add(PayLog model) {
+    public int add(PayLog model,String userId) {
 
+        if(StringUtils.isEmpty(userId)){
+            userId = ShiroUtils.getUserId();
+        }
         String serialNumber = getSerialNumber(model);
         String id = IdUtil.simpleUUID();
-        model.setCreatedBy(ShiroUtils.getUserId());
+        model.setCreatedBy(userId);
         model.setCreatedAt(new Date());
         model.setStatus(0);
         model.setId(id);
@@ -199,7 +202,7 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
                     invoiceManage.setInvoiceStatus("0");
                     invoiceManage.setInvoiceTax(null);
                     invoiceManage.setRemark(null);
-                    invoiceManage.setCreateUser(ShiroUtils.getUserId());
+                    invoiceManage.setCreateUser(userId);
                     invoiceManage.setCreateTime(new Date());
                     invoiceManageService.insertSelective(invoiceManage);
                 }
@@ -230,7 +233,7 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         receiptManage.setReceiptType(receiptType);
         receiptManage.setReceiptMoney(model.getPayMoney());
         receiptManage.setReceiptNumber(serialNumber);
-        receiptManageService.add(receiptManage);
+        receiptManageService.add(receiptManage,userId);
 
         return result;
     }

pro-base/src/main/java/com/idea/transactionRecordManage/controller/TransactionRecordController.java

@@ -68,6 +68,29 @@ public class TransactionRecordController extends BaseController  {
         return list;
     }
 
+    /**
+     * 转换记录
+     * @param tablepar
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "convertRecord", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object convertRecord(Tablepar tablepar, NccRecordVo model) {
+        PageInfo<NccRecordVo> page = modelService.convertRecord(tablepar, model);
+        TableSplitResult<NccRecordVo> result = new TableSplitResult<NccRecordVo>(page.getPageNum(), page.getTotal(), page.getList());
+        return result;
+    }
+
+    @PostMapping(value = "convertRecordListAll", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object convertRecordListAll(NccRecordVo model) {
+        List<NccRecordVo> list = modelService.convertRecordListAll(model);
+        return list;
+    }
+
+
+
     /**
      * 收款记录 ncc提交
      * @param collectionDateFrom
@@ -95,5 +118,16 @@ public class TransactionRecordController extends BaseController  {
         return AjaxResult.success();
     }
 
-
+    /**
+     * 转换记录 ncc提交
+     * @param collectionDateFrom
+     * @param collectionDateTo
+     * @return
+     */
+    @PostMapping(value = "convertRecordSubmit", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult convertRecordSubmit(String collectionDateFrom, String collectionDateTo) {
+        modelService.convertRecordSubmit(collectionDateFrom, collectionDateTo);
+        return AjaxResult.success();
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.idea.transactionRecordManage.mapper;
 
+import com.idea.customerManagement.dto.IntentionalDepositDto;
 import com.idea.paymentManagement.dto.RefundManageDto;
 import com.idea.paymentManagement.model.PayLog;
 import com.idea.transactionRecordManage.vo.NccRecordVo;
@@ -21,4 +22,10 @@ public interface TransactionRecordMapper {
     List<RefundManageDto> refundListByDate(@Param("startDate") String startDate,
                                      @Param("endDate") String endDate);
 
+    List<NccRecordVo> convertRecord(NccRecordVo model);
+
+
+    List<IntentionalDepositDto> convertListByDate(@Param("startDate") String startDate,
+                                                 @Param("endDate") String endDate);
+
 }

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

@@ -6,7 +6,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.response.ParkRoomResponse;
+import com.idea.customerManagement.dto.IntentionalDepositDto;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
+import com.idea.customerManagement.mapper.IntentionalDepositMapper;
 import com.idea.customerManagement.model.Buyer;
 import com.idea.customerManagement.model.BuyerExample;
 import com.idea.customerManagement.model.CustomerManagement;
@@ -26,6 +28,7 @@ import com.rockstar.common.domain.AjaxResult;
 import com.rockstar.frame.model.extend.Tablepar;
 import com.rockstar.shiro.util.ShiroUtils;
 import com.rockstar.system.service.SysDictService;
+import com.rockstar.util.MD5Util;
 import com.rockstar.util.SnowflakeIdWorker;
 import com.rockstar.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -53,6 +56,8 @@ public class TransactionRecordService {
     private PayLogMapper payLogMapper;
     @Autowired
     private RefundDetailMapper refundDetailMapper;
+    @Autowired
+    private IntentionalDepositMapper intentionalDepositMapper;
 
     /**
      * 收款记录
@@ -141,6 +146,36 @@ public class TransactionRecordService {
         return list;
     }
 
+    /**
+     * 转换记录
+     * @param tablepar
+     * @param model
+     * @return
+     */
+    public PageInfo<NccRecordVo> convertRecord(Tablepar tablepar, NccRecordVo model) {
+
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        if(StringUtils.isNotEmpty(model.getDiscIds())){
+            List<String> list = Arrays.asList(model.getDiscIds().split(","));
+            model.setDiscIdList(list);
+        }
+        // 收款记录
+        List<NccRecordVo> list = modelMapper.convertRecord(model);
+        PageInfo<NccRecordVo> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+    public List<NccRecordVo> convertRecordListAll(NccRecordVo model) {
+
+        if(StringUtils.isNotEmpty(model.getDiscIds())){
+            List<String> list = Arrays.asList(model.getDiscIds().split(","));
+            model.setDiscIdList(list);
+        }
+        // 收款记录
+        List<NccRecordVo> list = modelMapper.convertRecord(model);
+        return list;
+    }
+
 
     /**
      * 收款记录 ncc提交
@@ -358,4 +393,88 @@ public class TransactionRecordService {
 
     }
 
+    /**
+     * 转换记录 ncc提交
+     * @param collectionDateFrom
+     * @param collectionDateTo
+     * @return
+     */
+    public int convertRecordSubmit(String collectionDateFrom, String collectionDateTo) {
+
+        Map<String, String> cusIdMap = buyerService.getCusIdMap();
+
+        List<IntentionalDepositDto> intentionalDeposits = modelMapper.convertListByDate(collectionDateFrom, collectionDateTo);
+        for (IntentionalDepositDto intentionalDeposit : intentionalDeposits){
+            String billdate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+            String number = SnowflakeIdWorker.getUUID();
+            String scomment = "";
+            if (cusIdMap.containsKey(intentionalDeposit.getCustomerManagementId())){
+                scomment = cusIdMap.get(intentionalDeposit.getCustomerManagementId());
+            }
+
+            // 目前只有意向金
+            String pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ026;
+
+            JSONObject json = new JSONObject();
+            JSONObject ar_gatherbill = new JSONObject();
+            String srcsystemid = intentionalDeposit.getId();
+            ar_gatherbill.put("srcsystemid", srcsystemid); //外系统标识,必选
+            ar_gatherbill.put("pk_tradetype", InvoiceConstant.INVOICE_BUSINESS_F2_Cxx_07); //交易类型,必选
+            ar_gatherbill.put("pk_org", InvoiceUtil.pk_org); //组织编码,必选
+            ar_gatherbill.put("billdate", billdate); //单据日期
+            ar_gatherbill.put("def2", srcsystemid); //外系统单据号，必填，
+            json.put("ar_gatherbill", ar_gatherbill);
+
+            JSONArray ar_gatheritem = new JSONArray();
+            JSONObject ar_gatheritemJson = new JSONObject();
+            ar_gatheritemJson.put("srcsystemid", srcsystemid); //外系统子表标识
+            ar_gatheritemJson.put("objtype", "0"); //0=客户，1=供应商--判断customer和supplier是否必填，必选
+            // TODO: 2024/11/20 客商纳税人识别号 待定
+            ar_gatheritemJson.put("customer", ""); //客商的纳税人识别号
+            ar_gatheritemJson.put("money_cr", intentionalDeposit.getReceivedAmount()); //金额，必选
+            // TODO: 2024/11/20 税率 待定
+            ar_gatheritemJson.put("taxrate", ""); //税率,必选，数字——3/10/6````
+            // TODO: 2024/11/20 结算方式 待定
+            ar_gatheritemJson.put("pk_balatype", "0"); //结算方式,必选，看云文档结算方式
+            ar_gatheritemJson.put("pk_recpaytype", "001"); //付款业务类型传默认值“001”
+            ar_gatheritemJson.put("prepay", "0"); //收款性质应收款时传"0",收款性质预收款时传"1"
+            // TODO: 2024/11/20 意向金暂无收款账号 待定
+            ar_gatheritemJson.put("recaccount", ""); //收款银行账号,必填
+//        ar_gatheritemJson.put("invoiceno","fphm"); //发票号码，非必选
+            ar_gatheritemJson.put("scomment", scomment); //客户名称，必选
+            ar_gatheritemJson.put("pk_subjcode", InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ001); //收支项目编码，必选，看云文档收支项目对照
+            // TODO: 2024/11/20 房间户编号待定 
+            ar_gatheritemJson.put("def11", ""); //转出前房号编码，必选
+            ar_gatheritemJson.put("def9", InvoiceConstant.INVOICE_BUSINESS_FORMAT_001); //业态，必选，看云文档业态
+//        ar_gatheritemJson.put("def12", ""); //转出后房号编码，换房业务时要选
+            ar_gatheritemJson.put("def14", InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ026); //原收支项目编码，定金转违约金项目时 必选
+//        ar_gatheritemJson.put("def13", ""); //换票后票据号，换房业务必选
+            // TODO: 2024/11/20 票据类型 待定
+            ar_gatheritemJson.put("checktype", InvoiceConstant.INVOICE_RECEIPT_TYPE_3); //票据类型，必选，看云文档票据类型
+            ar_gatheritemJson.put("checkno", intentionalDeposit.getSerialNumber()); //票据号，必选
+            // TODO: 2024/11/14 具体编码 未定
+            ar_gatheritemJson.put("def10", InvoiceConstant.INVOICE_MATERIAL_djjy); //项目档案编码，看云文档项目档案对照
+            ar_gatheritem.add(ar_gatheritemJson);
+            json.put("ar_gatheritem", ar_gatheritem);
+
+            try {
+                String result = InvoiceUtil.gatheringbillTurn(json);
+                JSONObject jsonObject = JSONObject.parseObject(result);
+                if (jsonObject.getString("success").equals("true")) {
+                    intentionalDeposit.setNcJson(result);
+                    intentionalDeposit.setNcSubmitStatus(1);
+                    intentionalDeposit.setNcSubmitDate(new Date());
+                    intentionalDeposit.setNcSubmitName(ShiroUtils.getLoginName());
+                    intentionalDepositMapper.updateByPrimaryKeySelective(intentionalDeposit);
+                }
+
+            } catch (Exception e) {
+                log.error("诚意金转定金凭证推送报错", e);
+            }
+
+        }
+        return 1;
+
+    }
+
 }

pro-base/src/main/java/com/idea/transactionRecordManage/vo/NccRecordVo.java

@@ -79,4 +79,8 @@ public class NccRecordVo {
 
     private String collectionDateTo;
 
+    private String handleDateFrom;
+
+    private String handleDateTo;
+
 }

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

@@ -24,6 +24,9 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="refund_money" jdbcType="DECIMAL" property="refundMoney" />
     <result column="house_name" jdbcType="VARCHAR" property="houseName" />
+    <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" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.customerManagement.model.IntentionalDeposit">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -32,7 +35,6 @@
     <result column="file_list" jdbcType="LONGVARCHAR" property="fileList" />
     <result column="paper_receipts" jdbcType="LONGVARCHAR" property="paperReceipts" />
     <result column="nc_json" jdbcType="LONGVARCHAR" property="ncJson" />
-    <result column="turn_nc_json" jdbcType="LONGVARCHAR" property="turnNcJson" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -96,10 +98,10 @@
     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
+    status, refund_money, house_name, nc_submit_status, nc_submit_date, nc_submit_name
   </sql>
   <sql id="Blob_Column_List">
-    remark, deposit_remark, refund_remark, file_list, paper_receipts, nc_json, turn_nc_json
+    remark, deposit_remark, refund_remark, file_list, paper_receipts, nc_json
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.idea.customerManagement.model.IntentionalDepositExample" resultMap="ResultMapWithBLOBs">
     select
@@ -157,10 +159,10 @@
                                      created_id, created_at, updated_at,
                                      updated_id, handle_id, handle_date,
                                      refund_handle_id, refund_handle_date, status,
-                                     refund_money, house_name, remark,
+                                     refund_money, house_name, nc_submit_status,
+                                     nc_submit_date, nc_submit_name, remark,
                                      deposit_remark, refund_remark, file_list,
-                                     paper_receipts, nc_json, turn_nc_json
-    )
+                                     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},
@@ -168,10 +170,10 @@
             #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
             #{updatedId,jdbcType=VARCHAR}, #{handleId,jdbcType=VARCHAR}, #{handleDate,jdbcType=TIMESTAMP},
             #{refundHandleId,jdbcType=VARCHAR}, #{refundHandleDate,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
-            #{refundMoney,jdbcType=DECIMAL}, #{houseName,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR},
+            #{refundMoney,jdbcType=DECIMAL}, #{houseName,jdbcType=VARCHAR}, #{ncSubmitStatus,jdbcType=INTEGER},
+            #{ncSubmitDate,jdbcType=TIMESTAMP}, #{ncSubmitName,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR},
             #{depositRemark,jdbcType=LONGVARCHAR}, #{refundRemark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR},
-            #{paperReceipts,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR}, #{turnNcJson,jdbcType=LONGVARCHAR}
-           )
+            #{paperReceipts,jdbcType=LONGVARCHAR}, #{ncJson,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
     insert into intentional_deposit
@@ -242,6 +244,15 @@
       <if test="houseName != null">
         house_name,
       </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="remark != null">
         remark,
       </if>
@@ -260,9 +271,6 @@
       <if test="ncJson != null">
         nc_json,
       </if>
-      <if test="turnNcJson != null">
-        turn_nc_json,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -331,6 +339,15 @@
       <if test="houseName != null">
         #{houseName,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="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -349,9 +366,6 @@
       <if test="ncJson != null">
         #{ncJson,jdbcType=LONGVARCHAR},
       </if>
-      <if test="turnNcJson != null">
-        #{turnNcJson,jdbcType=LONGVARCHAR},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.idea.customerManagement.model.IntentionalDepositExample" resultType="java.lang.Long">
@@ -429,6 +443,15 @@
       <if test="record.houseName != null">
         house_name = #{record.houseName,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.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -447,9 +470,6 @@
       <if test="record.ncJson != null">
         nc_json = #{record.ncJson,jdbcType=LONGVARCHAR},
       </if>
-      <if test="record.turnNcJson != null">
-        turn_nc_json = #{record.turnNcJson,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -479,13 +499,15 @@
     status = #{record.status,jdbcType=INTEGER},
     refund_money = #{record.refundMoney,jdbcType=DECIMAL},
     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},
     remark = #{record.remark,jdbcType=LONGVARCHAR},
     deposit_remark = #{record.depositRemark,jdbcType=LONGVARCHAR},
     refund_remark = #{record.refundRemark,jdbcType=LONGVARCHAR},
     file_list = #{record.fileList,jdbcType=LONGVARCHAR},
     paper_receipts = #{record.paperReceipts,jdbcType=LONGVARCHAR},
-    nc_json = #{record.ncJson,jdbcType=LONGVARCHAR},
-    turn_nc_json = #{record.turnNcJson,jdbcType=LONGVARCHAR}
+    nc_json = #{record.ncJson,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -513,7 +535,10 @@
     refund_handle_date = #{record.refundHandleDate,jdbcType=TIMESTAMP},
     status = #{record.status,jdbcType=INTEGER},
     refund_money = #{record.refundMoney,jdbcType=DECIMAL},
-    house_name = #{record.houseName,jdbcType=VARCHAR}
+    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}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -584,6 +609,15 @@
       <if test="houseName != null">
         house_name = #{houseName,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="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -602,9 +636,6 @@
       <if test="ncJson != null">
         nc_json = #{ncJson,jdbcType=LONGVARCHAR},
       </if>
-      <if test="turnNcJson != null">
-        turn_nc_json = #{turnNcJson,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -631,13 +662,15 @@
         status = #{status,jdbcType=INTEGER},
         refund_money = #{refundMoney,jdbcType=DECIMAL},
         house_name = #{houseName,jdbcType=VARCHAR},
+        nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
+        nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
+        nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR},
         remark = #{remark,jdbcType=LONGVARCHAR},
         deposit_remark = #{depositRemark,jdbcType=LONGVARCHAR},
         refund_remark = #{refundRemark,jdbcType=LONGVARCHAR},
         file_list = #{fileList,jdbcType=LONGVARCHAR},
         paper_receipts = #{paperReceipts,jdbcType=LONGVARCHAR},
-        nc_json = #{ncJson,jdbcType=LONGVARCHAR},
-        turn_nc_json = #{turnNcJson,jdbcType=LONGVARCHAR}
+        nc_json = #{ncJson,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.customerManagement.model.IntentionalDeposit">
@@ -662,7 +695,10 @@
         refund_handle_date = #{refundHandleDate,jdbcType=TIMESTAMP},
         status = #{status,jdbcType=INTEGER},
         refund_money = #{refundMoney,jdbcType=DECIMAL},
-        house_name = #{houseName,jdbcType=VARCHAR}
+        house_name = #{houseName,jdbcType=VARCHAR},
+        nc_submit_status = #{ncSubmitStatus,jdbcType=INTEGER},
+        nc_submit_date = #{ncSubmitDate,jdbcType=TIMESTAMP},
+        nc_submit_name = #{ncSubmitName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -27,6 +27,7 @@
                park_room.room_no,
                frame_user.truename createdName,
                cm.buyer_name,
+        date_format(cm.room_selection_date,'%Y-%m-%d') as room_selection_date,
         concat(park_info.group_name,'-',park_floor_disc.name) groupDiscName
         from room_selection_info
         left join park_room on park_room.id = room_selection_info.house_id
@@ -39,6 +40,15 @@
             <if test="buyerName != null and buyerName != ''">
                 and room_selection_info.customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
             </if>
+            <if test="discIdList != null">
+                and room_selection_info.disc_id in
+                <foreach collection="discIdList" item="discId" separator="," open="(" close=")">
+                    #{discId}
+                </foreach>
+            </if>
+            <if test="customerManagementId !=null and customerManagementId != ''">
+                and room_selection_info.customer_management_id = #{customerManagementId}
+            </if>
         </where>
         order by created_at desc
     </select>

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.idea.paymentManagement.mapper.PayLogMapper">
   <resultMap id="BaseResultMap" type="com.idea.paymentManagement.model.PayLog">
     <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="business_id" jdbcType="VARCHAR" property="businessId" />
     <result column="house_id" jdbcType="VARCHAR" property="houseId" />
     <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
     <result column="customer_management_id" jdbcType="VARCHAR" property="customerManagementId" />
@@ -90,10 +91,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    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
+    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
   </sql>
   <sql id="Blob_Column_List">
     file_list, nc_json
@@ -147,24 +148,26 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.idea.paymentManagement.model.PayLog">
-    insert into pay_log (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)
-    values (#{id,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})
+    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
+    )
+    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}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.paymentManagement.model.PayLog">
     insert into pay_log
@@ -172,6 +175,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="businessId != null">
+        business_id,
+      </if>
       <if test="houseId != null">
         house_id,
       </if>
@@ -252,6 +258,9 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="businessId != null">
+        #{businessId,jdbcType=VARCHAR},
+      </if>
       <if test="houseId != null">
         #{houseId,jdbcType=VARCHAR},
       </if>
@@ -341,6 +350,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
+      <if test="record.businessId != null">
+        business_id = #{record.businessId,jdbcType=VARCHAR},
+      </if>
       <if test="record.houseId != null">
         house_id = #{record.houseId,jdbcType=VARCHAR},
       </if>
@@ -424,6 +436,7 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update pay_log
     set id = #{record.id,jdbcType=VARCHAR},
+    business_id = #{record.businessId,jdbcType=VARCHAR},
     house_id = #{record.houseId,jdbcType=VARCHAR},
     contract_id = #{record.contractId,jdbcType=VARCHAR},
     customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
@@ -456,6 +469,7 @@
   <update id="updateByExample" parameterType="map">
     update pay_log
     set id = #{record.id,jdbcType=VARCHAR},
+    business_id = #{record.businessId,jdbcType=VARCHAR},
     house_id = #{record.houseId,jdbcType=VARCHAR},
     contract_id = #{record.contractId,jdbcType=VARCHAR},
     customer_management_id = #{record.customerManagementId,jdbcType=VARCHAR},
@@ -486,6 +500,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.idea.paymentManagement.model.PayLog">
     update pay_log
     <set>
+      <if test="businessId != null">
+        business_id = #{businessId,jdbcType=VARCHAR},
+      </if>
       <if test="houseId != null">
         house_id = #{houseId,jdbcType=VARCHAR},
       </if>
@@ -566,7 +583,8 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.paymentManagement.model.PayLog">
     update pay_log
-    set house_id = #{houseId,jdbcType=VARCHAR},
+    set business_id = #{businessId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
         contract_id = #{contractId,jdbcType=VARCHAR},
         customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         pay_type = #{payType,jdbcType=INTEGER},
@@ -595,7 +613,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.idea.paymentManagement.model.PayLog">
     update pay_log
-    set house_id = #{houseId,jdbcType=VARCHAR},
+    set business_id = #{businessId,jdbcType=VARCHAR},
+        house_id = #{houseId,jdbcType=VARCHAR},
         contract_id = #{contractId,jdbcType=VARCHAR},
         customer_management_id = #{customerManagementId,jdbcType=VARCHAR},
         pay_type = #{payType,jdbcType=INTEGER},

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

@@ -20,6 +20,7 @@
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
     <result column="is_hide" jdbcType="INTEGER" property="isHide" />
+    <result column="house_name" jdbcType="VARCHAR" property="houseName" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.idea.paymentManagement.model.RefundManage">
     <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
@@ -86,7 +87,7 @@
   <sql id="Base_Column_List">
     id, house_id, contract_id, customer_management_id, approval_number, applicant, identity_card,
     reason, buyer_name, refund_amount, actual_refund_amount, deductible, bank_number,
-    created_id, created_at, updated_at, updated_id, is_hide
+    created_id, created_at, updated_at, updated_id, is_hide, house_name
   </sql>
   <sql id="Blob_Column_List">
     remark, file_list
@@ -146,14 +147,16 @@
                                refund_amount, actual_refund_amount, deductible,
                                bank_number, created_id, created_at,
                                updated_at, updated_id, is_hide,
-                               remark, file_list)
+                               house_name, remark, file_list
+    )
     values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR},
             #{customerManagementId,jdbcType=VARCHAR}, #{approvalNumber,jdbcType=VARCHAR}, #{applicant,jdbcType=VARCHAR},
             #{identityCard,jdbcType=VARCHAR}, #{reason,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR},
             #{refundAmount,jdbcType=DECIMAL}, #{actualRefundAmount,jdbcType=DECIMAL}, #{deductible,jdbcType=DECIMAL},
             #{bankNumber,jdbcType=VARCHAR}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
             #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR}, #{isHide,jdbcType=INTEGER},
-            #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR})
+            #{houseName,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{fileList,jdbcType=LONGVARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.idea.paymentManagement.model.RefundManage">
     insert into refund_manage
@@ -212,6 +215,9 @@
       <if test="isHide != null">
         is_hide,
       </if>
+      <if test="houseName != null">
+        house_name,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -274,6 +280,9 @@
       <if test="isHide != null">
         #{isHide,jdbcType=INTEGER},
       </if>
+      <if test="houseName != null">
+        #{houseName,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -345,6 +354,9 @@
       <if test="record.isHide != null">
         is_hide = #{record.isHide,jdbcType=INTEGER},
       </if>
+      <if test="record.houseName != null">
+        house_name = #{record.houseName,jdbcType=VARCHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=LONGVARCHAR},
       </if>
@@ -376,6 +388,7 @@
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
     is_hide = #{record.isHide,jdbcType=INTEGER},
+    house_name = #{record.houseName,jdbcType=VARCHAR},
     remark = #{record.remark,jdbcType=LONGVARCHAR},
     file_list = #{record.fileList,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -401,7 +414,8 @@
     created_at = #{record.createdAt,jdbcType=TIMESTAMP},
     updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
     updated_id = #{record.updatedId,jdbcType=VARCHAR},
-    is_hide = #{record.isHide,jdbcType=INTEGER}
+    is_hide = #{record.isHide,jdbcType=INTEGER},
+    house_name = #{record.houseName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -460,6 +474,9 @@
       <if test="isHide != null">
         is_hide = #{isHide,jdbcType=INTEGER},
       </if>
+      <if test="houseName != null">
+        house_name = #{houseName,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=LONGVARCHAR},
       </if>
@@ -488,6 +505,7 @@
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
         is_hide = #{isHide,jdbcType=INTEGER},
+        house_name = #{houseName,jdbcType=VARCHAR},
         remark = #{remark,jdbcType=LONGVARCHAR},
         file_list = #{fileList,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -510,7 +528,8 @@
         created_at = #{createdAt,jdbcType=TIMESTAMP},
         updated_at = #{updatedAt,jdbcType=TIMESTAMP},
         updated_id = #{updatedId,jdbcType=VARCHAR},
-        is_hide = #{isHide,jdbcType=INTEGER}
+        is_hide = #{isHide,jdbcType=INTEGER},
+        house_name = #{houseName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -60,7 +60,11 @@
             r.customer_management_id,
             r.house_id,
             r.buyer_name,
-            r.bank_number
+            r.bank_number,
+            u.truename createdName,
+            d.nc_submit_status,
+            d.nc_submit_date,
+            d.nc_submit_name
         FROM
             refund_detail d
         LEFT JOIN refund_manage r ON d.refund_manage_id = r.id
@@ -89,7 +93,49 @@
     </select>
 
     <select id="refundListByDate" resultType="com.idea.paymentManagement.dto.RefundManageDto">
+        select m.* ,d.content_type,d.actual_refund_amount
+        from refund_manage m
+        left join refund_detail d on m.id = d.refund_manage_id
+        where date_format(m.created_at,'%Y-%m-%d') >= #{startDate}
+        and #{endDate} &lt;= date_format(m.created_at,'%Y-%m-%d')
+    </select>
+
+    <select id="convertRecord" resultType="com.idea.transactionRecordManage.vo.NccRecordVo">
+        select intentional_deposit.*,
+        customer_management.buyer_name,
+        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>
+            <if test="buyerName !=null and buyerName != '' " >
+                and customer_management.buyer_name like concat('%',#{buyerName},'%')
+            </if>
+            <if test="discIdList != null">
+                AND park_floor_disc.id in
+                <foreach collection="discIdList" open="(" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="handleDateFrom !=null and handleDateFrom != '' " >
+                and intentional_deposit.handle_date >= date_format(#{handleDateFrom},'%Y-%m-%d')
+            </if>
+            <if test="handleDateTo !=null and handleDateTo != '' " >
+                and intentional_deposit.handle_date &lt;= date_format(#{handleDateTo},'%Y-%m-%d')
+            </if>
+        </where>
+
+        order by created_at desc
+    </select>
 
+    <select id="convertListByDate" resultType="com.idea.customerManagement.dto.IntentionalDepositDto">
+        select * from intentional_deposit where date_format(handle_date,'%Y-%m-%d') >= #{startDate}
+                                and #{endDate} &lt;= date_format(handle_date,'%Y-%m-%d')
     </select>
 
 

pro-wx/src/main/java/com/idea/pro/wx/controller/customerManagement/WXCustomerManagementController.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Controller
 @RequestMapping(value = "/wx/CustomerManagementController")
 @Api(tags = "客户管理")
-public class WXCustomerManagementController extends BaseController {
+public class WxCustomerManagementController extends BaseController {
 
     @Autowired
     private CustomerManagementService modelService;
@@ -43,6 +43,20 @@ public class WXCustomerManagementController extends BaseController {
         return  result;
     }
 
+    /**
+     * 全部客户
+     * @param model
+     * @param dt
+     * @return
+     */
+    @PostMapping(value = "listAll",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listAll(CustomerManagementDto model, DateTrans dt){
+        List<CustomerManagementDto> result = modelService.listAll(model, dt);
+        return  result;
+    }
+    
+
     /**
      * 新增轮号客户
      * @param record

pro-wx/src/main/java/com/idea/pro/wx/controller/customerManagement/WxIntentionalDepositController.java

@@ -109,8 +109,8 @@ public class WxIntentionalDepositController extends BaseController {
      */
     @PostMapping(value = "toDeposit", produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult toDeposit(IntentionalDeposit model) {
-        int result = modelService.toDeposit(model);
+    public AjaxResult toDeposit(IntentionalDeposit model,String userId) {
+        int result = modelService.toDeposit(model,userId);
         return result(result);
     }
 

pro-wx/src/main/java/com/idea/pro/wx/controller/customerManagement/WxRoomSelectionInfoController.java

@@ -71,8 +71,8 @@ public class WxRoomSelectionInfoController extends BaseController {
      */
     @PostMapping(value = "add",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult add(RoomSelectionInfoDto model){
-        int result = modelService.add(model);
+    public AjaxResult add(RoomSelectionInfoDto model,String userId){
+        int result = modelService.add(model,userId);
         return result(result);
     }
 
@@ -83,8 +83,8 @@ public class WxRoomSelectionInfoController extends BaseController {
      */
     @PostMapping(value = "edit",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public AjaxResult edit(RoomSelectionInfoDto model){
-        int result = modelService.edit(model);
+    public AjaxResult edit(RoomSelectionInfoDto model,String userId){
+        int result = modelService.edit(model,userId);
         return result(result);
     }