From 12652f5ab2b844afea669078909f22f0e84a991c Mon Sep 17 00:00:00 2001 From: liupopo Date: Fri, 7 Jul 2023 15:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_create_customer-cashed.sql | 4 ++ docs/databases/table_create_storehouse.sql | 4 ++ .../biz/csmcash/CsmCashDifferent.java | 43 +++++++++++++++++++ .../biz/csmcash/CsmCashDifferentMapper.java | 8 ++++ .../biz/csmcash/CsmCashDifferentService.java | 8 ++++ .../customer/biz/csmcash/CsmCashIncome.java | 33 ++++++++++++++ .../biz/csmcash/CsmCashIncomeMapper.java | 8 ++++ .../biz/csmcash/CsmCashIncomeService.java | 8 ++++ .../customer/biz/csmcash/CsmCashLogQuery.java | 24 +++++++++++ .../customer/biz/csmcash/CsmCashSales.java | 40 +++++++++++++++++ .../biz/csmcash/CsmCashSalesMapper.java | 13 ++++++ .../biz/csmcash/CsmCashSalesService.java | 29 +++++++++++++ 12 files changed, 222 insertions(+) create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferent.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentMapper.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncome.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogQuery.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSales.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesMapper.java create mode 100644 yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesService.java diff --git a/docs/databases/table_create_customer-cashed.sql b/docs/databases/table_create_customer-cashed.sql index f3088242..769adc2d 100644 --- a/docs/databases/table_create_customer-cashed.sql +++ b/docs/databases/table_create_customer-cashed.sql @@ -32,6 +32,7 @@ CREATE TABLE `csm_cash_gd` ( `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息', `status` INT(11) NOT NULL DEFAULT '0' COMMENT '状态：0=未核对，1=已核对(核对后数据不可再更改)', + `logsid` varchar(64) DEFAULT NULL COMMENT '日志记录的SID', `dataDate` varchar(100) DEFAULT NULL COMMENT '日期', `accountName` varchar(100) DEFAULT NULL COMMENT '账户名称', `accountAmount` double(12,2) DEFAULT 0 COMMENT '金额', @@ -46,6 +47,7 @@ CREATE TABLE `csm_cash_sales` ( `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', `remarks` VARCHAR(256) DEFAULT NULL COMMENT '备注说明', + `logsid` varchar(64) DEFAULT NULL COMMENT '日志记录的SID', `dataDate` varchar(100) DEFAULT NULL COMMENT '日期', `serialNumber` INT(11) NOT NULL DEFAULT '0' COMMENT '序号', @@ -73,6 +75,7 @@ CREATE TABLE `csm_cash_income` ( `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', `remarks` VARCHAR(256) DEFAULT NULL COMMENT '备注说明', + `logsid` varchar(64) DEFAULT NULL COMMENT '日志记录的SID', `dataDate` varchar(100) DEFAULT NULL COMMENT '日期', `serialNumber` INT(11) NOT NULL DEFAULT '0' COMMENT '序号', @@ -93,6 +96,7 @@ CREATE TABLE `csm_cash_different` ( `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', `remarks` VARCHAR(256) DEFAULT NULL COMMENT '备注说明', + `logsid` varchar(64) DEFAULT NULL COMMENT '日志记录的SID', `dataDate` varchar(100) DEFAULT NULL COMMENT '日期', `serialNumber` INT(11) NOT NULL DEFAULT '0' COMMENT '序号', diff --git a/docs/databases/table_create_storehouse.sql b/docs/databases/table_create_storehouse.sql index b0f390f8..bbb0a007 100644 --- a/docs/databases/table_create_storehouse.sql +++ b/docs/databases/table_create_storehouse.sql @@ -28,6 +28,10 @@ CREATE TABLE `sh_storehouse` ( `regionName` VARCHAR(100) DEFAULT NULL COMMENT '区域名称，不同级用逗号(,)分隔，如河北省,石家庄市,长安区', `address` VARCHAR(100) DEFAULT NULL COMMENT '详细地址', + `lon` VARCHAR(100) DEFAULT NULL COMMENT '经度', + `lat` VARCHAR(100) DEFAULT NULL COMMENT '纬度', + `lonAndLat` VARCHAR(100) DEFAULT NULL COMMENT '经度和纬度，逗号分隔', + `acreage` VARCHAR(100) DEFAULT NULL COMMENT '库房面积', `storeyHeight` VARCHAR(100) DEFAULT NULL COMMENT '层高', `monthlyPrice` VARCHAR(100) DEFAULT NULL COMMENT '月租金', diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferent.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferent.java new file mode 100644 index 00000000..ec094963 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferent.java @@ -0,0 +1,43 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("csm_cash_different") +public class CsmCashDifferent extends EntityWithId { + + private String sid = IdUtil.fastSimpleUUID(); // sid + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss", + timezone = "GMT+8" + ) + private Date createTime = new Date(); // 记录创建时间 + private String remarks; // 备注说明', + + private String dataDate; // 日期', + + private int serialNumber = 0; // 序号', + private Date saleDate; // 销售日期', + private String disbursementChannelSid; // 支付渠道Sid', + private String disbursementChannelName; // 支付渠道名称', + private double amount = 0; // 金额（元）', + private String CompanySid; // 对应公司主体Sid', + private String CompanyName; // 对应公司主体名称', + + private String accountCycle = "-"; // 回款周期', + private int accountCycleDays = 0; // 回款周期天数', + private Date antipateCashedDate; // 应回款日期', + private Date realCashedDate; // 实际回款日期', + private double cashedAmount = 0; // 回款金额', + private double differentAmount = 0; // 回款差额', + private Date antipateDifferentDate; // 差额预计到账日期', + + private String logsid; // 日志记录的SID', + +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentMapper.java new file mode 100644 index 00000000..da433919 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentMapper.java @@ -0,0 +1,8 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CsmCashDifferentMapper extends BaseMapper { +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java new file mode 100644 index 00000000..e58461fc --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDifferentService.java @@ -0,0 +1,8 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class CsmCashDifferentService extends ServiceImpl { +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncome.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncome.java new file mode 100644 index 00000000..62ae4ed6 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncome.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("csm_cash_income") +public class CsmCashIncome extends EntityWithId { + + private String sid = IdUtil.fastSimpleUUID(); // sid + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss", + timezone = "GMT+8" + ) + private Date createTime = new Date(); // 记录创建时间 + private String remarks; // 备注说明', + + private String dataDate; // 日期', + + private int serialNumber = 0; // 序号', + private String collectionChannelSid; // 回款渠道Sid', + private String collectionChannelName; // 回款渠道名称', + private double amount = 0; // 回款金额（元）', + + private Date saleDate; // 销售日期', + + private String logsid; // 日志记录的SID', +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java new file mode 100644 index 00000000..e1d79706 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeMapper.java @@ -0,0 +1,8 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CsmCashIncomeMapper extends BaseMapper { +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java new file mode 100644 index 00000000..11309ab1 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java @@ -0,0 +1,8 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class CsmCashIncomeService extends ServiceImpl { +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogQuery.java new file mode 100644 index 00000000..8d0bc64a --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashLogQuery.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.yxt.common.core.query.Query; + +public class CsmCashLogQuery implements Query { + private String dataDateStart; // 数据日期 + private String dataDateEnd; // 数据日期 + + public String getDataDateStart() { + return dataDateStart; + } + + public void setDataDateStart(String dataDateStart) { + this.dataDateStart = dataDateStart; + } + + public String getDataDateEnd() { + return dataDateEnd; + } + + public void setDataDateEnd(String dataDateEnd) { + this.dataDateEnd = dataDateEnd; + } +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSales.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSales.java new file mode 100644 index 00000000..f66a5871 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSales.java @@ -0,0 +1,40 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("csm_cash_sales") +public class CsmCashSales extends EntityWithId { + + private String sid = IdUtil.fastSimpleUUID(); // sid + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间 + private String remarks; // 备注说明', + + private String dataDate; // 日期', + + private int serialNumber = 0; // 序号', + private String disbursementChannelSid; // 支付渠道Sid', + private String disbursementChannelName; // 支付渠道名称', + private double amount = 0; // 金额（元）', + private String CompanySid; // 对应公司主体Sid', + private String CompanyName; // 对应公司主体名称', + + private String accountCycle = "-"; //到账周期', + private int accountCycleDays = 0; // 到账周期天数', + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date antipateCashedDate; // 预计回款日期', + private double inaccountAmount = 0; // 财务到账金额', + private double differentAmount = 0; // 到账差额', + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date antipateDifferentDate; // 差额预计到账时间', + + private String logsid; // 日志记录的SID', +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesMapper.java new file mode 100644 index 00000000..c4d1e42e --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesMapper.java @@ -0,0 +1,13 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface CsmCashSalesMapper extends BaseMapper { + + @Delete("delete from csm_cash_sales where dataDate=#{dataDate} ") + void clearOfDay(@Param("dataDate") String dataDate); +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesService.java new file mode 100644 index 00000000..72170680 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesService.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.customer.biz.csmcash; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class CsmCashSalesService extends ServiceImpl { + public void clearAndCreateOfDay(String dataDate, List gdList) { + baseMapper.clearOfDay(dataDate); + List list = new ArrayList<>(); + int sn = 1; + for (CsmCashGd gd : gdList) { + if (gd.getAccountAmount() > 0) { + CsmCashSales ccs = new CsmCashSales(); + ccs.setLogsid(gd.getLogsid()); + ccs.setDataDate(gd.getDataDate()); + ccs.setSerialNumber(sn); + sn++; + ccs.setDisbursementChannelName(gd.getAccountName()); + ccs.setAmount(gd.getAccountAmount()); + list.add(ccs); + } + } + super.saveBatch(list); + } +}