1

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

@@ -38,7 +38,10 @@ import com.idea.paymentManagement.model.PayLog;
 import com.idea.paymentManagement.model.PayLogExample;
 import com.idea.paymentManagement.model.RefundDetail;
 import com.idea.paymentManagement.model.RefundManage;
+import com.idea.transactionRecordManage.mapper.CollectionRecordMapper;
 import com.idea.transactionRecordManage.mapper.ConvertRecordMapper;
+import com.idea.transactionRecordManage.model.CollectionRecord;
+import com.idea.transactionRecordManage.model.CollectionRecordExample;
 import com.idea.transactionRecordManage.model.ConvertRecord;
 import com.idea.transactionRecordManage.model.ConvertRecordExample;
 import com.idea.util.DateUtils;
@@ -108,6 +111,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
     private PayLogExtendMapper payLogExtendMapper;
     @Autowired
     private ConvertRecordMapper convertRecordMapper;
+    @Autowired
+    private CollectionRecordMapper collectionRecordMapper;
 
 
     @Override
@@ -259,7 +264,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
         // 收款记录 新增一条记录
         PayLog payLog = new PayLog();
-        payLog.setId(IdUtil.simpleUUID());
+        String payLogId = IdUtil.simpleUUID();
+        payLog.setId(payLogId);
         payLog.setHouseId(null);
         payLog.setContractId(null);
         payLog.setCustomerManagementId(model.getCustomerManagementId());
@@ -282,6 +288,20 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         payLog.setBankNumber(model.getBankNumber());
         payLogMapper.insertSelective(payLog);
 
+        // TODO: 2025/1/3 具体操作待定
+//        // nc收款记录新增一条记录
+//        CollectionRecord collectionRecord = new CollectionRecord();
+//        BeanUtil.copyProperties(payLog, collectionRecord);
+//        collectionRecord.setId(IdUtil.simpleUUID());
+//        collectionRecord.setGroupId(customerManagement.getGroupId());
+//        collectionRecord.setDiscId(customerManagement.getDiscId());
+//        collectionRecord.setBusinessId(payLogId);
+//        collectionRecord.setBusinessType("pay_log");
+//        collectionRecord.setCreatedAt(new Date());
+//        collectionRecord.setCreatedBy(ShiroUtils.getUserId());
+//        collectionRecord.setNcSubmitStatus(0);
+//        collectionRecordMapper.insertSelective(collectionRecord);
+
         return result;
     }
 
@@ -318,7 +338,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
         // 收款记录 修改一条记录
         PayLogExample payLogExample = new PayLogExample();
-        payLogExample.createCriteria().andCustomerManagementIdEqualTo(model.getCustomerManagementId());
+        payLogExample.createCriteria().andBusinessIdEqualTo(model.getId()).andPayTypeEqualTo(7);
         List<PayLog> payLogs = payLogMapper.selectByExample(payLogExample);
         if(CollectionUtils.isNotEmpty(payLogs)){
             PayLog payLog = payLogs.get(0);
@@ -326,6 +346,21 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
             payLog.setUpdatedAt(new Date());
             payLog.setUpdatedBy(userId);
             payLogMapper.updateByPrimaryKeySelective(payLog);
+
+            // TODO: 2025/1/3 具体操作待定 
+//            // nc收款记录修改一条记录
+//            CollectionRecordExample collectionRecordExample = new CollectionRecordExample();
+//            collectionRecordExample.createCriteria().andBusinessIdEqualTo(payLog.getId());
+//            List<CollectionRecord> collectionRecords = collectionRecordMapper.selectByExample(collectionRecordExample);
+//            if(CollectionUtils.isNotEmpty(collectionRecords)){
+//                CollectionRecord collectionRecord = collectionRecords.get(0);
+//                collectionRecord.setPayMoney(model.getReceivedAmount());
+//                collectionRecord.setUpdatedAt(new Date());
+//                collectionRecord.setUpdatedBy(userId);
+//                collectionRecordMapper.updateByExampleSelective(collectionRecord,collectionRecordExample);
+//            }
+
+
         }
 
         return result;
@@ -540,7 +575,7 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
             receiptManageService.updateByPrimaryKeySelective(manage);
         }
 
-        // 转换记录新增一条记录
+        // nc转换记录新增一条记录
         ConvertRecord convertRecord = new ConvertRecord();
         BeanUtil.copyProperties(model, convertRecord);
         convertRecord.setId(IdUtil.simpleUUID());
@@ -551,8 +586,23 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         convertRecord.setConvertType(1);
         convertRecord.setCreatedAt(new Date());
         convertRecord.setCreatedBy(ShiroUtils.getUserId());
+        convertRecord.setNcSubmitStatus(0);
         convertRecordMapper.insertSelective(convertRecord);
 
+        // TODO: 2025/1/3 具体操作待定
+//        // nc收款记录新增一条记录
+//        CollectionRecord collectionRecord = new CollectionRecord();
+//        BeanUtil.copyProperties(payLog, collectionRecord);
+//        collectionRecord.setId(IdUtil.simpleUUID());
+//        collectionRecord.setGroupId(response.getGroupId());
+//        collectionRecord.setDiscId(response.getDiscId());
+//        collectionRecord.setBusinessId(payLogId);
+//        collectionRecord.setBusinessType("pay_log");
+//        collectionRecord.setCreatedAt(new Date());
+//        collectionRecord.setCreatedBy(ShiroUtils.getUserId());
+//        collectionRecord.setNcSubmitStatus(0);
+//        collectionRecordMapper.insertSelective(collectionRecord);
+
 
         // 转定金
         model.setStatus(2);
@@ -738,142 +788,6 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
 
     }
 
-//    /**
-//     * 收诚意金 凭证推送
-//     *
-//     * @param model
-//     * @return
-//     */
-//    public AjaxResult sendVoucher(IntentionalDepositDto model) {
-//
-//        // 银行流水id
-//        String pkInformerId = model.getPkInformerId();
-//        IntentionalDeposit intentionalDeposit = selectByPrimaryKey(model.getId());
-//        CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(intentionalDeposit.getCustomerManagementId());
-//        BuyerExample buyerExample = new BuyerExample();
-//        buyerExample.setOrderByClause("order_num");
-//        buyerExample.createCriteria().andCustomerManagementIdEqualTo(customerManagement.getId());
-//        List<Buyer> buyers = buyerService.selectByExample(buyerExample);
-//        Buyer buyer = buyers.get(0);
-//
-//        JSONObject json = new JSONObject();
-//        JSONObject ar_gatherbill = new JSONObject();
-//        String srcsystemid = model.getId();
-//        String billdate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-//        ar_gatherbill.put("srcsystemid", srcsystemid); //外系统标识,必选
-//        ar_gatherbill.put("pk_tradetype", InvoiceConstant.INVOICE_BUSINESS_F2_Cxx_06); //交易类型,必选
-//        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是否必填，必选
-//        ar_gatheritemJson.put("customer", buyer.getIdentityCard()); //客商的纳税人识别号
-//        ar_gatheritemJson.put("money_cr", intentionalDeposit.getReceivedAmount()); //金额，必选
-//        ar_gatheritemJson.put("taxrate", "10"); //税率,必选，数字——3/10/6````
-//        ar_gatheritemJson.put("pk_balatype", "0"); //结算方式,必选，看云文档结算方式
-//        ar_gatheritemJson.put("pk_recpaytype", "001"); //付款业务类型传默认值“001”
-//        ar_gatheritemJson.put("prepay", "0"); //收款性质应收款时传"0",收款性质预收款时传"1"
-//        ar_gatheritemJson.put("recaccount", InvoiceUtil.bank_number); //收款银行账号,必填
-////        ar_gatheritemJson.put("invoiceno","fphm"); //发票号码，非必选
-//        ar_gatheritemJson.put("scomment", buyer.getName()); //客户名称，必选
-//        ar_gatheritemJson.put("pk_subjcode", InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ026); //收款类型
-//        ar_gatheritemJson.put("checktype", InvoiceConstant.INVOICE_RECEIPT_TYPE_3); //票据类型，必选，看云文档票据类型
-//        ar_gatheritemJson.put("checkno", intentionalDeposit.getSerialNumber()); //票据号，必选
-//        ar_gatheritemJson.put("def9", InvoiceConstant.INVOICE_BUSINESS_FORMAT_001); //业态，必选，看云文档业态
-////        ar_gatheritemJson.put("def11", ""); //转出前房号编码，收除了诚意金之外的首期等需要选
-//        // TODO: 2024/11/14 具体编码应该是根据小区来的
-//        ar_gatheritemJson.put("def10", InvoiceConstant.INVOICE_MATERIAL_djjy); //项目档案编码，看云文档项目档案对照
-//        ar_gatheritemJson.put("top_billid", pkInformerId); //到账通知生单时,（银行流水中返回的id，见5.2.10到账通知认领查询pk_informer字段）
-//        ar_gatheritem.add(ar_gatheritemJson);
-//        json.put("ar_gatheritem", ar_gatheritem);
-//
-//        try {
-//            String result = InvoiceUtil.gatheringbillAdd(json);
-//            JSONObject jsonObject = JSONObject.parseObject(result);
-//            if (jsonObject.getString("success").equals("true")) {
-//                intentionalDeposit.setNcJson(result);
-//                updateByPrimaryKeySelective(intentionalDeposit);
-//            }
-//
-//        } catch (Exception e) {
-//            log.error("收诚意金凭证推送报错", e);
-//            return AjaxResult.error(e.getMessage());
-//        }
-//        return AjaxResult.success();
-//    }
-
-//    /**
-//     * 诚意金转定金 凭证推送
-//     *
-//     * @param id
-//     * @return
-//     */
-//    public AjaxResult sendToDepositVoucher(String id) {
-//
-//        IntentionalDeposit intentionalDeposit = selectByPrimaryKey(id);
-//        CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(intentionalDeposit.getCustomerManagementId());
-//        BuyerExample buyerExample = new BuyerExample();
-//        buyerExample.setOrderByClause("order_num");
-//        buyerExample.createCriteria().andCustomerManagementIdEqualTo(customerManagement.getId());
-//        List<Buyer> buyers = buyerService.selectByExample(buyerExample);
-//        Buyer buyer = buyers.get(0);
-//
-//        JSONObject json = new JSONObject();
-//        JSONObject ar_gatherbill = new JSONObject();
-//        String srcsystemid = MD5Util.encode(id);
-//        String billdate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
-//        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是否必填，必选
-//        ar_gatheritemJson.put("customer", buyer.getIdentityCard()); //客商的纳税人识别号
-//        ar_gatheritemJson.put("money_cr", intentionalDeposit.getReceivedAmount()); //金额，必选
-//        ar_gatheritemJson.put("taxrate", "10"); //税率,必选，数字——3/10/6````
-//        ar_gatheritemJson.put("pk_balatype", "0"); //结算方式,必选，看云文档结算方式
-//        ar_gatheritemJson.put("pk_recpaytype", "001"); //付款业务类型传默认值“001”
-//        ar_gatheritemJson.put("prepay", "0"); //收款性质应收款时传"0",收款性质预收款时传"1"
-//        ar_gatheritemJson.put("recaccount", InvoiceUtil.bank_number); //收款银行账号,必填
-////        ar_gatheritemJson.put("invoiceno","fphm"); //发票号码，非必选
-//        ar_gatheritemJson.put("scomment", buyer.getName()); //客户名称，必选
-//        ar_gatheritemJson.put("pk_subjcode", InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ001); //收支项目编码，必选，看云文档收支项目对照
-//        ar_gatheritemJson.put("def11", customerManagement.getHouseId()); //转出前房号编码，必选
-//        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", ""); //换票后票据号，换房业务必选
-//        ar_gatheritemJson.put("checktype", InvoiceConstant.INVOICE_RECEIPT_TYPE_3); //票据类型，必选，看云文档票据类型
-//        ar_gatheritemJson.put("checkno", intentionalDeposit.getDepositSerialNumber()); //票据号，必选
-//        // 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);
-//                updateByPrimaryKeySelective(intentionalDeposit);
-//            }
-//
-//        } catch (Exception e) {
-//            log.error("诚意金转定金凭证推送报错", e);
-//            return AjaxResult.error(e.getMessage());
-//        }
-//        return AjaxResult.success();
-//
-//    }
 
 
 }

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

@@ -3,6 +3,7 @@ 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.model.CollectionRecord;
 import com.idea.transactionRecordManage.vo.NccRecordVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,7 +21,9 @@ public interface TransactionRecordMapper {
     List<NccRecordVo> convertRecord(NccRecordVo model);
 
 
-    List<IntentionalDepositDto> convertListByDate(@Param("startDate") String startDate,
-                                                 @Param("endDate") String endDate);
+    List<CollectionRecord> collectionSubmitRecord(NccRecordVo model);
+
+
+
 
 }

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

@@ -278,14 +278,6 @@ public class TransactionRecordService {
         for (PayLog payLog : payLogs) {
             try {
 
-//                CollectionRecord collectionRecord = new CollectionRecord();
-//                BeanUtil.copyProperties(payLog, collectionRecord);
-//                collectionRecord.setId(IdUtil.simpleUUID());
-//                collectionRecord.setBusinessId(payLog.getId());
-//                collectionRecord.setBusinessType("pay_log");
-//                collectionRecord.setCreatedBy(userId);
-//                collectionRecord
-
                 // 只有未推送或推送失败的才进行推送
                 if(payLog.getNcSubmitStatus() == null || payLog.getNcSubmitStatus() == 0 || payLog.getNcSubmitStatus() == 2) {
                     if (customerMap.containsKey(payLog.getCustomerManagementId())) {
@@ -712,5 +704,153 @@ public class TransactionRecordService {
 
     }
 
+    // TODO: 2025/1/3 方法待定
+    @Synchronized
+    public int collectionRecordSubmit2(String ids, String collectionDateFrom, String collectionDateTo) {
+
+
+//        String userId = ShiroUtils.getUserId();
+//        Date date = new Date();
+//
+//        List<CustomerManagement> customerManagements = customerManagementMapper.selectByExample(new CustomerManagementExample());
+//        Map<String, CustomerManagement> customerMap = customerManagements.stream()
+//                .collect(Collectors.toMap(CustomerManagement::getId, item -> item));
+//        List<ParkInfo> parkInfos = parkInfoMapper.selectByExample(new ParkInfoExample());
+//        Map<String, ParkInfo> parkInfoMap = parkInfos.stream().collect(Collectors.toMap(ParkInfo::getId, item -> item));
+//        for (PayLog payLog : payLogs) {
+//            try {
+//
+//                CollectionRecord collectionRecord = new CollectionRecord();
+//                BeanUtil.copyProperties(payLog, collectionRecord);
+//                collectionRecord.setId(IdUtil.simpleUUID());
+//                collectionRecord.setBusinessId(payLog.getId());
+//                collectionRecord.setBusinessType("pay_log");
+//                collectionRecord.setCreatedBy(userId);
+//                collectionRecord.setCreatedAt(date);
+//                collectionRecord.setUpdatedBy(userId);
+//                collectionRecord.setUpdatedAt(null);
+//
+//                // 只有未推送或推送失败的才进行推送
+//                if(payLog.getNcSubmitStatus() == null || payLog.getNcSubmitStatus() == 0 || payLog.getNcSubmitStatus() == 2) {
+//                    if (customerMap.containsKey(payLog.getCustomerManagementId())) {
+//                        CustomerManagement customerManagement = customerMap.get(payLog.getCustomerManagementId());
+//                        // 项目档案编码
+//                        String def10 = "";
+//                        if (parkInfoMap.containsKey(customerManagement.getGroupId())) {
+//                            def10 = parkInfoMap.get(customerManagement.getGroupId()).getArchiveCode();
+//                        }
+//                        // 组织机构编码
+//                        String pk_org = "";
+//                        if (parkInfoMap.containsKey(customerManagement.getGroupId())) {
+//                            pk_org = parkInfoMap.get(customerManagement.getGroupId()).getOrganizationalCode();
+//                        }
+//                        String pk_subjcode = "";
+//                        // 定金
+//                        if (payLog.getContentType() == 1) {
+//                            pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ001;
+//                        }
+//                        // 首付
+//                        if (payLog.getContentType() == 2) {
+//                            pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ002;
+//                        }
+//                        // 银行按揭
+//                        if (payLog.getContentType() == 3) {
+//                            pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ006;
+//                        }
+//                        // 专项维修资金
+//                        if (payLog.getContentType() == 4) {
+//                            pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ015;
+//                        }
+//                        // 楼款
+//                        if (payLog.getContentType() == 5) {
+//                            pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ003;
+//                        }
+//                        // 补差款
+//                        if (payLog.getContentType() == 6) {
+//                            pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ004;
+//                        }
+//                        // 意向金
+//                        if (payLog.getContentType() == 7) {
+//                            pk_subjcode = InvoiceConstant.INVOICE_PAYMENT_TYPE_AJ026;
+//                        }
+//
+//                        String pk_balatype = "";
+//                        // 现金
+//                        if (payLog.getPaymentMethod() == 1) {
+//                            pk_balatype = InvoiceConstant.INVOICE_PAYMENT_METHOD_0;
+//                        }
+//                        // 支付宝
+//                        if (payLog.getPaymentMethod() == 2) {
+//                            pk_balatype = InvoiceConstant.INVOICE_PAYMENT_METHOD_4;
+//                        }
+//                        // 微信
+//                        if (payLog.getPaymentMethod() == 3) {
+//                            pk_balatype = InvoiceConstant.INVOICE_PAYMENT_METHOD_4;
+//                        }
+//                        // 银行卡
+//                        if (payLog.getPaymentMethod() == 3) {
+//                            pk_balatype = InvoiceConstant.INVOICE_PAYMENT_METHOD_4;
+//                        }
+//
+//
+//                        JSONObject json = new JSONObject();
+//                        JSONObject ar_gatherbill = new JSONObject();
+//                        String srcsystemid = payLog.getId();
+//                        String billdate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
+//                        ar_gatherbill.put("srcsystemid", srcsystemid); //外系统标识,必选
+//                        ar_gatherbill.put("pk_tradetype", InvoiceConstant.INVOICE_BUSINESS_F2_Cxx_06); //交易类型,必选
+//                        ar_gatherbill.put("pk_org", 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是否必填，必选
+//                        ar_gatheritemJson.put("customer", customerManagement.getBuyerIdentityCard()); //客商的纳税人识别号
+//                        ar_gatheritemJson.put("money_cr", payLog.getPayMoney()); //金额，必选
+//                        ar_gatheritemJson.put("taxrate", "0"); //税率,必选，数字——3/10/6````
+//                        ar_gatheritemJson.put("pk_balatype", pk_balatype); //结算方式,必选，看云文档结算方式
+//                        ar_gatheritemJson.put("pk_recpaytype", "001"); //付款业务类型传默认值“001”
+//                        ar_gatheritemJson.put("prepay", "1"); //收款性质应收款时传"0",收款性质预收款时传"1"
+//                        ar_gatheritemJson.put("recaccount", payLog.getBankNumber()); //收款银行账号,必填
+//                        ar_gatheritemJson.put("scomment", customerManagement.getBuyerName()); //客户名称，必选
+//                        ar_gatheritemJson.put("pk_subjcode", pk_subjcode); //收款类型
+//                        ar_gatheritemJson.put("checktype", InvoiceConstant.INVOICE_RECEIPT_TYPE_3); //票据类型，必选，看云文档票据类型
+//                        ar_gatheritemJson.put("checkno", payLog.getSerialNumber()); //票据号，必选
+//                        ar_gatheritemJson.put("def9", InvoiceConstant.INVOICE_BUSINESS_FORMAT_001); //业态，必选，看云文档业态
+//                        ar_gatheritemJson.put("def11", payLog.getHouseId()); //转出前房号编码，收除了诚意金之外的首期等需要选
+//                        ar_gatheritemJson.put("def10", def10); //项目档案编码，看云文档项目档案对照
+//                        // TODO: 2024/11/22 银行流水号 待定 暂时不传
+////        ar_gatheritemJson.put("top_billid", pkInformerId); //到账通知生单时,（银行流水中返回的id，见5.2.10到账通知认领查询pk_informer字段）
+//                        ar_gatheritem.add(ar_gatheritemJson);
+//                        json.put("ar_gatheritem", ar_gatheritem);
+//
+//                        log.info("收款凭证推送详情:{}", json.toJSONString());
+//
+//                        String result = InvoiceUtil.gatheringbillAdd(json);
+//                        JSONObject jsonObject = JSONObject.parseObject(result);
+//                        if (jsonObject.getString("success").equals("true")) {
+//                            payLog.setNcSubmitStatus(1);
+//                        } else {
+//                            payLog.setNcSubmitStatus(2);
+//                        }
+//                        payLog.setNcJson(result);
+//                        payLog.setNcSubmitDate(new Date());
+//                        payLog.setNcSubmitName(ShiroUtils.getUser().getTruename());
+//                        payLogMapper.updateByPrimaryKeySelective(payLog);
+//
+//                    }
+//                }
+//
+//            } catch (Exception e) {
+//                log.error("收款凭证推送报错", e);
+//            }
+//        }
+
+        return 1;
+    }
+
 
 }

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

@@ -180,10 +180,16 @@
         </where>
     </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')
-        and ifnull(nc_submit_status,0) = 0
+    <select id="collectionSubmitRecord" resultType="com.idea.transactionRecordManage.model.CollectionRecord">
+        select * from collection_record
+        <where>
+            <if test="idList != null">
+                and collection_record.id in
+                <foreach collection="idList" open="(" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
     </select>