csm

docs/databases/table_create_customer-cashed.sql

@@ -191,3 +191,132 @@ CREATE TABLE `csm_cash_report_sales_yesterday` (
 	`accountCycle` VARCHAR(100) DEFAULT '-' COMMENT '回款周期',
 	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB COMMENT='每日回款审核报告-附件：昨日销售报表' ;
+
+DROP TABLE IF EXISTS `csm_cash_disbursement`;
+CREATE TABLE `csm_cash_disbursement` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+	
+	`name` varchar(100) DEFAULT NULL COMMENT '名称',
+	
+	`charge` double(12,2) DEFAULT 0 COMMENT '手续费（%）',
+	`chargeRule` VARCHAR(100) DEFAULT NULL COMMENT '手续费扣除规则',
+	
+	`cycleType` int(1) DEFAULT '0' COMMENT '周期计算方式：0=不计算,1=天数,2=指定日期',
+	`tnumber` int(11) DEFAULT '1' COMMENT '天数',
+	`tday` int(11) DEFAULT '19' COMMENT '指定日期(每月几号)',
+	`accountCycle` VARCHAR(100) DEFAULT '-' COMMENT '回款周期',
+	`cashedType` VARCHAR(100) DEFAULT '-' COMMENT '回款方式(手动，自动)',
+	
+	`CompanySid` VARCHAR(100) DEFAULT NULL COMMENT '对应公司主体Sid',
+	`CompanyName` VARCHAR(100) DEFAULT NULL COMMENT '对应公司主体名称',
+
+	`bankName` VARCHAR(100) DEFAULT '' COMMENT '绑定银行',
+	`bankAccount` VARCHAR(100) DEFAULT '-' COMMENT '绑定银行账号',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='支付渠道说明' ;
+insert into csm_cash_disbursement(sid,name,cycleType,tnumber,tday,accountCycle,cashedType,CompanyName,bankName,bankAccount,remarks) values
+('1','现金','2','0','19','每月19日归集','手动','-','','','每月23/25日对账，直营店、内加盟'),
+('2','鼎付通_微信','1','1','0','T+1','自动','源蜂-汇融','汇融','监管户','包括加盟店的柜面销售金额，T+3要返款给加盟主'),
+('3','鼎付通_支付宝','1','2','0','T+2','自动','源蜂-汇融','汇融','监管户','包括加盟店的柜面销售金额，T+3要返款给加盟主'),
+('4','云闪付_银联','1','1','0','T+1','自动','源蜂-汇融','汇融','','包括加盟店的柜面销售金额，T+3要返款给加盟主；T+1，节假日顺延后集中回'),
+('5','磁条卡','0','0','0','-','','-','','','包括加盟店的柜面销售金额，T+3要返款给加盟主；新发卡视为一般商品销售'),
+('6','电子礼品卡','0','0','0','-','','-','','','包括加盟店的柜面销售金额，T+3要返款给加盟主，新发卡收入单独账户查询回款，支付方式为微信。'),
+('7','鼎力云券','0','0','0','-','','-','','','营销费用，不回款。'),
+('8','大宗','2','0','19','每月19日归集','','-','','','每月23/25日对账'),
+('9','生日提货券','0','0','0','-','','-','','','是公司福利（以前公司给过生日员工发的福利券）'),
+('10','贵宾礼券','0','0','0','-','','-','','','每月23/25日对账，本应该为现金，错选择贵宾礼券'),
+('11','广电中心卡','0','0','0','-','','-','','',''),
+('12','银联POS卡','2','0','19','每月19日归集','手动','生活通-北京','银联POS北京','','每月23/25日对账'),
+('13','农信E支付','1','1','0','T+1','自动','源蜂-汇融','汇融','','动植物园销售按照直营店，汇融银行二维码销售收入每天人工入系统；其他方式收入19号集中人工入系统。后由于对不清账，5.23改为销售入机分别为公司的支付宝和微信。'),
+('14','鼎付通_翼支付','1','1','0','T+1（节假日顺延后集中回）','手动','生活通-天津','翼支付天津','','包括加盟店的柜面销售金额，T+3要返款给加盟主；T+1（节假日顺延后集中回，每月19日集中归集）'),
+('15','鼎付通_招行支付','1','1','0','T+1','手动','','招行APP河北（冻结）','','包括加盟店的柜面销售金额，T+3要返款给加盟主'),
+('16','鼎付通_龙支付','1','1','0','T+1','手动','','','建行（冻结）','包括加盟店的柜面销售金额，T+3要返款给加盟主'),
+('17','积分抵现','0','0','0','-','','-','','',''),
+('18','批发_美团','1','3','0','结算周期为3天一周期','手动','生活通-河北','','','美团外卖结算周期为3天一周期，如4月20-22三天应结账单，于4月23日一笔到账，以此类推。'),
+('19','批发_饿百','1','3','0','T+3','自动','源蜂-汇融','汇融','','T+3，不分节假日'),
+('20','批发_京东','1','1','0','T+1','自动','源蜂-汇融','汇融','','分两个渠道：京东到家和京东小时购。京东到家账期：T+5、京东小时购账期：T+1，到账时间节假日（周末）顺延。到账形式分三部分：货款、商品补贴款（94%）和暂扣款（商品补贴款6%，定期由源蜂公司开发票后另行结算）。'),
+('21','批发_分销单','2','0','19','每月19日归集','','-','','','每月23/25日对账'),
+('22','批发_配送中心','2','0','19','每月19日归集','','-','','','每月23/25日对账'),
+('23','加盟店入库','2','0','19','每月19日归集','','-','','','加盟店入库+动植物园入库，底数还没有摸清。');
+
+DROP TABLE IF EXISTS `csm_cash_collection`;
+CREATE TABLE `csm_cash_collection` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+	`name` varchar(100) DEFAULT NULL COMMENT '名称',	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='回款渠道' ;
+insert into csm_cash_collection(sid,name) values
+('1','微信'),
+('2','美团'),
+('3','京东到家'),
+('4','归集款里的批发款'),
+('5','饿了么'),
+('6','支付宝'),
+('7','京东小时购');
+
+DROP TABLE IF EXISTS `csm_cash_coll_link_disb`;
+CREATE TABLE `csm_cash_coll_link_disb` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`collSid` VARCHAR(100) DEFAULT NULL COMMENT '回款渠道Sid',
+	`collName` VARCHAR(100) DEFAULT NULL COMMENT '回款渠道名称',
+	`disbSid` VARCHAR(100) DEFAULT NULL COMMENT '支付渠道Sid',
+	`disbName` VARCHAR(100) DEFAULT NULL COMMENT '支付渠道名称',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='回款渠道与支付渠道对应表' ;
+insert into csm_cash_coll_link_disb(collSid,collName,disbSid,disbName) values
+('4','归集款里的批发款','1','现金'),
+('1','微信','2','鼎付通_微信'),
+('6','支付宝','3','鼎付通_支付宝'),
+('4','归集款里的批发款','4','云闪付_银联'),
+('4','归集款里的批发款','5','磁条卡'),
+('4','归集款里的批发款','6','电子礼品卡'),
+('4','归集款里的批发款','7','鼎力云券'),
+('4','归集款里的批发款','8','大宗'),
+('4','归集款里的批发款','9','生日提货券'),
+('4','归集款里的批发款','10','贵宾礼券'),
+('4','归集款里的批发款','11','广电中心卡'),
+('4','归集款里的批发款','12','银联POS卡'),
+('4','归集款里的批发款','13','农信E支付'),
+('4','归集款里的批发款','14','鼎付通_翼支付'),
+('4','归集款里的批发款','15','鼎付通_招行支付'),
+('4','归集款里的批发款','16','鼎付通_龙支付'),
+('4','归集款里的批发款','17','积分抵现'),
+('2','美团','18','批发_美团'),
+('5','饿了么','19','批发_饿百'),
+('3','京东到家','20','批发_京东'),
+('7','京东小时购','20','批发_京东'),
+('4','归集款里的批发款','21','批发_分销单'),
+('4','归集款里的批发款','22','批发_配送中心'),
+('4','归集款里的批发款','23','加盟店入库');
+
+-- 未使用
+DROP TABLE IF EXISTS `csm_cash_cycle`;
+CREATE TABLE `csm_cash_cycle` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+	
+	`tips` VARCHAR(100) DEFAULT '-' COMMENT '描述',
+	`cycleType` int(1) DEFAULT '0' COMMENT '周期计算方式：0=不计算,1=天数,2=指定日期',
+	
+	`tnumber` int(11) DEFAULT '1' COMMENT '天数',
+	`tday` int(11) DEFAULT '19' COMMENT '指定日期(每月几号)',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='回款周期';
+insert into csm_cash_cycle(sid,tips,cycleType,tnumber,tday,remarks) values
+('1','-',0,0,0,''),
+('2','T+1',1,1,0,'包括加盟店的柜面销售金额，T+3要返款给加盟主'),
+('3','T+2',1,2,0,''),
+('4','T+3',1,3,0,''),
+('5','T+5',1,5,0,''),
+('6','每月19号归集',2,0,19,'每月23/25日对账，直营店、内加盟');

supervise-customer-ui/src/api/customer/csmcash.js

@@ -54,5 +54,23 @@ export default {
       url: '/customer/csmcash/coverLog',
       params: params
     })
+  },
+  // 查询分页列表
+  incomeListSave: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/csmcash/incomeListSave',
+      method: 'post',
+      data: params
+    })
+  },
+  // 查询分页列表
+  salesListSave: function(params) {
+    return request({
+      baseURL: '/api',
+      url: '/customer/csmcash/salesListSave',
+      method: 'post',
+      data: params
+    })
   }
 }

supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue

@@ -17,10 +17,13 @@
       <el-collapse value="1">
         <el-collapse-item title="1. 每日回款核对" name="1" class="formadd">
           <div class="title">
-            <div>每日回款核对</div>
+            <div>昨日销售数据</div>
             <div>
               <span style="padding-right: 20px">合计数量:{{ saleslist.length }}</span>
-              <span>合计金额:{{ sumSalesAmount }}</span>
+              <span style="padding-right: 20px">合计金额:{{ sumSalesAmount }}</span>
+              <span style="padding-right: 20px">
+                <el-button plain size="small" type="danger" icon="el-icon-circle-check" @click="salesListSave">保存销售记录</el-button>
+              </span>
             </div>
           </div>
           <el-table show-summary :data="saleslist" border style="width: 100%">
@@ -30,7 +33,15 @@
             <el-table-column label="金额（元）" align="center" width="120" prop="amount" />
             <el-table-column label="对应公司主体" align="center" width="200" prop="CompanyName" />
             <el-table-column label="到账周期" align="center" width="100" prop="accountCycleDays" />
-            <el-table-column label="预计回款日期" align="center" width="120" prop="antipateCashedDate" />
+            <el-table-column
+              prop="antipateCashedDate"
+              label="日期"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <el-date-picker v-model="scope.row.antipateCashedDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" />
+              </template>
+            </el-table-column>
             <el-table-column label="财务到账金额" align="center" width="120" prop="inaccountAmount" />
             <el-table-column label="到账差额" align="center" width="120" prop="differentAmount" />
             <el-table-column label="差额预计到账时间" align="center" width="150" prop="antipateDifferentDate" />
@@ -41,7 +52,7 @@
       <el-collapse value="2">
         <el-collapse-item title="2. 每日回款台账" name="2" class="formadd">
           <div class="title">
-            <div>每日回款台账</div>
+            <div>当日回款台账</div>
             <div>
               <span style="padding-right: 20px">合计数量:{{ incomelist.length }}</span>
               <span style="padding-right: 20px">合计金额:{{ sumIncomeAmount }}</span>
@@ -70,7 +81,7 @@
       <el-collapse value="3">
         <el-collapse-item title="3. 每日回款分析" name="3" class="formadd">
           <div class="title">
-            <div>每日回款分析</div>
+            <div>回款分析</div>
             <div>
               <span style="padding-right: 20px">合计数量:</span>
               <span>合计金额:</span>
@@ -313,13 +324,34 @@
       showIncomeAdd() {
         this.dialogVisible = true
       },
+      salesListSave() {
+        const _this = this
+        req.salesListSave(this.saleslist)
+          .then(resp => {
+            _this.$message({
+              showClose: true,
+              type: 'success',
+              message: '销售数据保存成功'
+            })
+            _this.loadListSales()
+          })
+          .catch(e => {
+            console.log('salesListSave -- error: ', e)
+          })
+      },
       incomeListSave() {
+        const _this = this
         req.incomeListSave(this.incomelist)
           .then(resp => {
-            this.differentlist = resp.data
+            _this.$message({
+              showClose: true,
+              type: 'success',
+              message: '回款信息保存成功'
+            })
+            _this.loadListIncome()
           })
           .catch(e => {
-            console.log('loadListDifferent -- error: ', e)
+            console.log('incomeListSave -- error: ', e)
           })
       },
       incomeClose() {

warehousing-system/project_web_ui/.gitignore

@@ -15,4 +15,4 @@ tests/**/coverage/
 *.njsproj
 *.sln
 
-risk-ui/
+warehouse-ui/

warehousing-system/project_web_ui/src/layout/index.vue

@@ -11,7 +11,7 @@
     <div class="main-container">
       <div class="home-box">
         <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
-        <a href="javascript:void(0);" class="text-center">风控管理</a>
+        <a href="javascript:void(0);" class="text-center">云仓管理</a>
       </div>
       <sidebar class="sidebar-container" />
       <!--菜单-->

warehousing-system/project_web_ui/vue.config.js

@@ -24,8 +24,8 @@ module.exports = {
    *在大多数情况下，请使用“/”！！！
    *详细信息：https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production' ? '/risk/' : '/',
-  outputDir: 'risk-ui',
+  publicPath: process.env.NODE_ENV === 'production' ? '/warehouse/' : '/',
+  outputDir: 'warehouse-ui',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,

yxt-supervise-dbcenter/docs/databases/data_modify.sql

@@ -0,0 +1,3 @@
+
+INSERT INTO `enp_store` (`sid`, `code`, `name`, `enpSid`, `enpCode`, `enpName`, `brandSid`, `brandCode`, `brandName`) VALUES
+	('10010302', '10010302', '(翟营店)裕华区翟营大街分公司', '1001', '1001', '中鸿记', '100103', '100103', '杨麻子大饼');

yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/ZhjSpider.java

@@ -19,7 +19,7 @@ public class ZhjSpider {
     private static String url = "https://bi.aliyuncs.com/api/v2/biPlatform/query/byQueryParam";
     private static String reportId = "85c4af04-1910-4005-8e47-742af1acb713";
 //    private static String olapQueryParam_salesAmount = "{\"componentId\":\"52dece2d-ba6d-452e-8497-f94baff096c4\",\"componentName\":\"指标看板-熟溢香支付方式_knief\",\"configs\":[{\"type\":\"field\",\"config\":{\"fields\":[{\"guid\":\"31ce439f-747c-45d0-8f35-51fe9daea91e\",\"fid\":\"5805bc15e1\",\"areaType\":\"row\"},{\"guid\":\"6e8c6afd-038a-4644-85c1-ffb813dc8614\",\"fid\":\"fa1b7a0d21\",\"areaType\":\"column\",\"aggregate\":\"sum\"}]},\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\"},{\"type\":\"paging\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"limit\":1000,\"offset\":0,\"pagedByAllDim\":true}},{\"type\":\"beforeAggregateCondition\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"3fd928d207\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"POS点餐\"},{\"valueType\":\"string\",\"value\":\"会员充值\"},{\"valueType\":\"string\",\"value\":\"扫码点餐\"},{\"valueType\":\"string\",\"value\":\"美团外卖点餐\"},{\"valueType\":\"string\",\"value\":\"饿了么外卖点餐\"}]},{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"15784307a1\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"greaterThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]},{\"field\":{\"fid\":\"15784307a1\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"lessThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]}]}]}},{\"type\":\"queryConfig\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"needCount\":false,\"queryCount\":false,\"queryDetail\":false}},{\"type\":\"advancedParam\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"autoInsightParam\":{\"enable\":false},\"wordCloudParam\":{},\"summarizeParams\":[],\"trendLineParams\":[],\"forecastParams\":[],\"anomalyDetectionParams\":[],\"clusteringParams\":[],\"groupParam\":null}},{\"type\":\"annotationParam\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"measureThresholdParams\":[],\"inflectionPointParams\":[]}}],\"dataType\":\"general\",\"reportId\":\"85c4af04-1910-4005-8e47-742af1acb713\"}";
-    private static String olapQueryParam_salesAmount = "{\"componentId\":\"52dece2d-ba6d-452e-8497-f94baff096c4\",\"componentName\":\"指标看板-熟溢香支付方式_knief\",\"configs\":[{\"type\":\"field\",\"config\":{\"fields\":[{\"guid\":\"fede5a50-ecc9-4a4e-964e-cfef899a8653\",\"fid\":\"5c96f44f41\",\"areaType\":\"row\"},{\"guid\":\"881950c9-ae3a-46d4-bb43-cb9467a2669b\",\"fid\":\"25d1d226d2\",\"areaType\":\"column\",\"aggregate\":\"sum\"}]},\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\"},{\"type\":\"paging\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"limit\":1000,\"offset\":0,\"pagedByAllDim\":true}},{\"type\":\"beforeAggregateCondition\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"5c96f44f41\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"熟溢香振头店\"},{\"valueType\":\"string\",\"value\":\"馍馍卤振岗店\"},{\"valueType\":\"string\",\"value\":\"馍馍卤雅清街店\"},{\"valueType\":\"string\",\"value\":\"桥西区杨麻子大饼三饭店(红旗店)\"},{\"valueType\":\"string\",\"value\":\"(红旗店)桥西区红旗大街分公司\"}]},{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"96c82ad449\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"greaterThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]},{\"field\":{\"fid\":\"96c82ad449\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"lessThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]}]}]}},{\"type\":\"queryConfig\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"needCount\":false,\"queryCount\":false,\"queryDetail\":false}},{\"type\":\"advancedParam\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"autoInsightParam\":{\"enable\":false},\"wordCloudParam\":{},\"summarizeParams\":[],\"trendLineParams\":[],\"forecastParams\":[],\"anomalyDetectionParams\":[],\"clusteringParams\":[],\"groupParam\":null}},{\"type\":\"annotationParam\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"measureThresholdParams\":[],\"inflectionPointParams\":[]}}],\"dataType\":\"general\",\"reportId\":\"85c4af04-1910-4005-8e47-742af1acb713\"}";
+    private static String olapQueryParam_salesAmount = "{\"componentId\":\"52dece2d-ba6d-452e-8497-f94baff096c4\",\"componentName\":\"指标看板-熟溢香支付方式_knief\",\"configs\":[{\"type\":\"field\",\"config\":{\"fields\":[{\"guid\":\"fede5a50-ecc9-4a4e-964e-cfef899a8653\",\"fid\":\"5c96f44f41\",\"areaType\":\"row\"},{\"guid\":\"881950c9-ae3a-46d4-bb43-cb9467a2669b\",\"fid\":\"25d1d226d2\",\"areaType\":\"column\",\"aggregate\":\"sum\"}]},\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\"},{\"type\":\"paging\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"limit\":1000,\"offset\":0,\"pagedByAllDim\":true}},{\"type\":\"beforeAggregateCondition\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"5c96f44f41\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"熟溢香振头店\"},{\"valueType\":\"string\",\"value\":\"馍馍卤振岗店\"},{\"valueType\":\"string\",\"value\":\"馍馍卤雅清街店\"},{\"valueType\":\"string\",\"value\":\"(翟营店)裕华区翟营大街分公司\"},{\"valueType\":\"string\",\"value\":\"裕华杨麻子大饼饭店(翟营店)\"}]},{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"96c82ad449\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"greaterThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]},{\"field\":{\"fid\":\"96c82ad449\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"lessThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]}]}]}},{\"type\":\"queryConfig\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"needCount\":false,\"queryCount\":false,\"queryDetail\":false}},{\"type\":\"advancedParam\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"autoInsightParam\":{\"enable\":false},\"wordCloudParam\":{},\"summarizeParams\":[],\"trendLineParams\":[],\"forecastParams\":[],\"anomalyDetectionParams\":[],\"clusteringParams\":[],\"groupParam\":null}},{\"type\":\"annotationParam\",\"cubeId\":\"90bb4e6c-c315-465b-9c3b-74a22a0d84e6\",\"config\":{\"measureThresholdParams\":[],\"inflectionPointParams\":[]}}],\"dataType\":\"general\",\"reportId\":\"85c4af04-1910-4005-8e47-742af1acb713\"}";
 //    private static String olapQueryParam_salesDishes = "{\"componentId\":\"8d8a8363-89d8-4bec-9a58-c7c13ae63f15\",\"componentName\":\"菜品销量\",\"configs\":[{\"type\":\"field\",\"config\":{\"fields\":[{\"guid\":\"f8e0f500-ffc6-4821-9190-5cd3b3c906e9\",\"fid\":\"19a1d100cc\",\"areaType\":\"row\"},{\"guid\":\"1c13f425-828d-48ad-8549-de85dd3c259e\",\"fid\":\"2083fd4437\",\"areaType\":\"row\"},{\"guid\":\"07b482d2-b2e3-4a64-9d8d-3e30c03dfec6\",\"fid\":\"0e325d5eed\",\"areaType\":\"column\",\"granularity\":null,\"aggregate\":\"sum\"},{\"guid\":\"a4cfd195-dfd3-4947-a024-076ca806793f\",\"fid\":\"b9d5c6b646\",\"areaType\":\"column\",\"aggregate\":\"avg\"}]},\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\"},{\"type\":\"paging\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"limit\":1000,\"offset\":0,\"pagedByAllDim\":true}},{\"type\":\"beforeAggregateCondition\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"5e0adf962d\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"bk\"}]},{\"field\":{\"fid\":\"5e0adf962d\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"bk\"}]},{\"field\":{\"fid\":\"e3aec87664\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"V_STORE_NAME\"}]},{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"8e55928f76\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"greaterThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]},{\"field\":{\"fid\":\"8e55928f76\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"lessThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]}]}]}},{\"type\":\"sort\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"sortFields\":[{\"sortType\":\"desc\",\"guid\":\"07b482d2-b2e3-4a64-9d8d-3e30c03dfec6\",\"dimValues\":[],\"groupSort\":false}]}},{\"type\":\"queryConfig\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"needCount\":true,\"queryCount\":false,\"queryDetail\":false}},{\"type\":\"advancedParam\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"autoInsightParam\":{\"enable\":false},\"wordCloudParam\":{},\"summarizeParams\":[],\"trendLineParams\":[],\"forecastParams\":[],\"anomalyDetectionParams\":[],\"clusteringParams\":[],\"groupParam\":null}},{\"type\":\"annotationParam\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"measureThresholdParams\":[],\"inflectionPointParams\":[]}}],\"dataType\":\"pivot\",\"reportId\":\"85c4af04-1910-4005-8e47-742af1acb713\"}";
     private static String olapQueryParam_salesDishes = "{\"componentId\":\"8d8a8363-89d8-4bec-9a58-c7c13ae63f15\",\"componentName\":\"菜品销量\",\"configs\":[{\"type\":\"field\",\"config\":{\"fields\":[{\"guid\":\"f8e0f500-ffc6-4821-9190-5cd3b3c906e9\",\"fid\":\"19a1d100cc\",\"areaType\":\"row\"},{\"guid\":\"1c13f425-828d-48ad-8549-de85dd3c259e\",\"fid\":\"2083fd4437\",\"areaType\":\"row\"},{\"guid\":\"07b482d2-b2e3-4a64-9d8d-3e30c03dfec6\",\"fid\":\"0e325d5eed\",\"areaType\":\"column\",\"granularity\":null,\"aggregate\":\"sum\"},{\"guid\":\"a4cfd195-dfd3-4947-a024-076ca806793f\",\"fid\":\"b9d5c6b646\",\"areaType\":\"column\",\"aggregate\":\"avg\"}]},\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\"},{\"type\":\"paging\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"limit\":1000,\"offset\":0,\"pagedByAllDim\":true}},{\"type\":\"beforeAggregateCondition\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"5e0adf962d\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"bk\"}]},{\"field\":{\"fid\":\"5e0adf962d\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"bk\"}]},{\"field\":{\"fid\":\"e3aec87664\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"V_STORE_NAME\"}]},{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"8e55928f76\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"greaterThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]},{\"field\":{\"fid\":\"8e55928f76\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"lessThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]}]}]}},{\"type\":\"sort\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"sortFields\":[{\"sortType\":\"desc\",\"guid\":\"07b482d2-b2e3-4a64-9d8d-3e30c03dfec6\",\"dimValues\":[],\"groupSort\":false}]}},{\"type\":\"queryConfig\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"needCount\":true,\"queryCount\":false,\"queryDetail\":false}},{\"type\":\"advancedParam\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"autoInsightParam\":{\"enable\":false},\"wordCloudParam\":{},\"summarizeParams\":[],\"trendLineParams\":[],\"forecastParams\":[],\"anomalyDetectionParams\":[],\"clusteringParams\":[],\"groupParam\":null}},{\"type\":\"annotationParam\",\"cubeId\":\"a16139f4-8f21-4172-afb9-5de69719590e\",\"config\":{\"measureThresholdParams\":[],\"inflectionPointParams\":[]}}],\"dataType\":\"pivot\",\"reportId\":\"85c4af04-1910-4005-8e47-742af1acb713\"}";
 //    private static String olapQueryParam_purchase = "{\"componentId\":\"1cdfd850-7d65-48ca-b71d-03c9e1b979ac\",\"componentName\":\"采购明细表\",\"configs\":[{\"type\":\"field\",\"config\":{\"fields\":[{\"guid\":\"899dd166-55f9-4ada-9f32-856f86cab0ce\",\"fid\":\"5f2e64d20f\",\"areaType\":\"column\"},{\"guid\":\"bf3d46dd-3759-49a2-a035-424023202ce8\",\"fid\":\"6dd7171857\",\"areaType\":\"column\",\"dateTrunc\":\"day\"},{\"guid\":\"82f79e88-5328-40f6-9ea8-9a5a91c389cd\",\"fid\":\"22b739da7f\",\"areaType\":\"column\"},{\"guid\":\"f563a6d0-6604-4b12-915a-94421dca00d6\",\"fid\":\"c6139dca5d\",\"areaType\":\"column\"},{\"guid\":\"17c3dfb5-a9b5-4d16-965b-36ce7ab704c9\",\"fid\":\"dde06772b7\",\"areaType\":\"column\"},{\"guid\":\"26c3dcd5-3e1e-46cd-8a0a-7af9c0871efa\",\"fid\":\"118f5bd47e\",\"areaType\":\"column\"},{\"guid\":\"665a4b3d-30d0-42bd-a4c6-7096bb252e4e\",\"fid\":\"a112247f18\",\"areaType\":\"column\"}]},\"cubeId\":\"de60b1eb-37fa-4d0c-b02a-47c6f00b061b\"},{\"type\":\"paging\",\"cubeId\":\"de60b1eb-37fa-4d0c-b02a-47c6f00b061b\",\"config\":{\"limit\":1000,\"offset\":0,\"pagedByAllDim\":true}},{\"type\":\"beforeAggregateCondition\",\"cubeId\":\"de60b1eb-37fa-4d0c-b02a-47c6f00b061b\",\"config\":{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"18913ee52b\"},\"functionalOperator\":\"in\",\"args\":[{\"valueType\":\"string\",\"value\":\"bk\"}]},{\"logicalOperator\":\"AND\",\"conditions\":[{\"field\":{\"fid\":\"6dd7171857\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"greaterThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]},{\"field\":{\"fid\":\"6dd7171857\",\"dateTrunc\":\"day\"},\"functionalOperator\":\"lessThanOrEqual\",\"args\":[{\"valueType\":\"string\",\"value\":\"VAR_DATE_STR\"}]}]}]}},{\"type\":\"queryConfig\",\"cubeId\":\"de60b1eb-37fa-4d0c-b02a-47c6f00b061b\",\"config\":{\"needCount\":true,\"queryCount\":false,\"queryDetail\":true}},{\"type\":\"advancedParam\",\"cubeId\":\"de60b1eb-37fa-4d0c-b02a-47c6f00b061b\",\"config\":{\"autoInsightParam\":{\"enable\":false},\"wordCloudParam\":{},\"summarizeParams\":[],\"trendLineParams\":[],\"forecastParams\":[],\"anomalyDetectionParams\":[],\"clusteringParams\":[],\"groupParam\":null}},{\"type\":\"annotationParam\",\"cubeId\":\"de60b1eb-37fa-4d0c-b02a-47c6f00b061b\",\"config\":{\"measureThresholdParams\":[],\"inflectionPointParams\":[]}}],\"dataType\":\"general\",\"reportId\":\"85c4af04-1910-4005-8e47-742af1acb713\"}";

yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesDishes/CrawlSalesDishesService.java

@@ -58,7 +58,10 @@ public class CrawlSalesDishesService extends ServiceImpl<CrawlSalesDishesMapper,
         String zhjDate = currDay.replace("-", "");
         List<EnpStore> list = enpStoreService.list();
         List<String> storeNameList = new ArrayList<>();
-        list.forEach(enpStore -> storeNameList.add(enpStore.getName()));
+        list.forEach(enpStore -> {
+            if (enpStore.getIsEnable().equals(1))
+                storeNameList.add(enpStore.getName());
+        });
         List<CrawlSalesDishes> entityList = new ArrayList<>();
         for (String storeName : storeNameList) {
             List<RespSalesDishes> respList1 = ZhjSpider.crawlSalesDishes(zhjDate, storeName);

yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/test/java/com/yxt/supervise/dbcenter/YxtSuperviseDbcenterApplicationTests.java

@@ -24,10 +24,10 @@ class YxtSuperviseDbcenterApplicationTests {
 
     @Test
     void contextLoads() {
-        String currDay = "2023-07-11";
+        String currDay = "2023-07-20";
 
-        crawlSalesAmountService.pullData(currDay);
-        crawlSalesDishesService.pullData(currDay);
+//        crawlSalesAmountService.pullData(currDay);
+//        crawlSalesDishesService.pullData(currDay);
         crawlPurchaseService.pullData(currDay);
 
     }

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashCollLinkDisb.java

@@ -0,0 +1,15 @@
+package com.yxt.supervise.customer.biz.csmcash;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
+
+@Data
+@TableName("csm_cash_coll_link_disb")
+public class CsmCashCollLinkDisb extends EntityWithId {
+
+    private String collSid; // 回款渠道Sid',
+    private String collName; // 回款渠道名称',
+    private String disbSid; // 支付渠道Sid',
+    private String disbName; // 支付渠道名称',
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashCollLinkDisbMapper.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 CsmCashCollLinkDisbMapper extends BaseMapper<CsmCashCollLinkDisb> {
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashCollLinkDisbService.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 CsmCashCollLinkDisbService extends ServiceImpl<CsmCashCollLinkDisbMapper, CsmCashCollLinkDisb> {
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashCollection.java

@@ -0,0 +1,22 @@
+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_collection")
+public class CsmCashCollection 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 name; // 名称',
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashCollectionMapper.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 CsmCashCollectionMapper extends BaseMapper<CsmCashCollection> {
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashCollectionService.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 CsmCashCollectionService extends ServiceImpl<CsmCashCollectionMapper,CsmCashCollection> {
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDisbursement.java

@@ -0,0 +1,39 @@
+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_disbursement")
+public class CsmCashDisbursement 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 name; // 名称',
+
+    private double charge = 0; // 手续费（%）',
+    private String chargeRule; // 手续费扣除规则',
+
+    private int cycleType = 0; // 周期计算方式：0=不计算,1=天数,2=指定日期',
+    private int tnumber = 1; // 天数',
+    private int tday = 19; // 指定日期(每月几号)',
+    private String accountCycle; // 回款周期',
+    private String cashedType; // 回款方式(手动，自动)',
+
+    private String CompanySid; // 对应公司主体Sid',
+    private String CompanyName; // 对应公司主体名称',
+
+    private String bankName; // 绑定银行',
+    private String bankAccount; // 绑定银行账号',
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDisbursementMapper.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 CsmCashDisbursementMapper extends BaseMapper<CsmCashDisbursement> {
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashDisbursementService.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.customer.biz.csmcash;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CsmCashDisbursementService extends ServiceImpl<CsmCashDisbursementMapper, CsmCashDisbursement> {
+    public CsmCashDisbursement fetchByName(String accountName) {
+        QueryWrapper<CsmCashDisbursement> qw = new QueryWrapper<>();
+        qw.eq("name", accountName);
+        return baseMapper.selectOne(qw);
+    }
+
+    private static Map<String, CsmCashDisbursement> cache = null;
+
+    public CsmCashDisbursement fetchByNameFromCache(String accountName) {
+        if (cache == null) {
+            cache = new HashMap<>();
+            List<CsmCashDisbursement> list = super.list();
+            list.forEach(m -> cache.put(m.getName(), m));
+        }
+        return cache.get(accountName);
+    }
+}

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncome.java

@@ -27,6 +27,10 @@ public class CsmCashIncome extends EntityWithId {
     private String collectionChannelName; // 回款渠道名称',
     private double amount = 0; // 回款金额（元）',
 
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
     private Date saleDate; // 销售日期',
 
     private String logsid; // 日志记录的SID',

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashIncomeService.java

@@ -17,4 +17,13 @@ public class CsmCashIncomeService extends ServiceImpl<CsmCashIncomeMapper, CsmCa
         qw.eq("logsid", logsid);
         return baseMapper.selectList(qw);
     }
+
+    public boolean cleanAndSaveBatch(List<CsmCashIncome> list) {
+        if (list == null || list.isEmpty())
+            return false;
+        CsmCashIncome csmCashIncome = list.get(0);
+        baseMapper.clearByDay(csmCashIncome.getDataDate());
+        super.saveBatch(list);
+        return true;
+    }
 }

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashRest.java

@@ -3,17 +3,12 @@ package com.yxt.supervise.customer.biz.csmcash;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.supervise.customer.api.gdinventorylog.GdInventoryLog;
-import com.yxt.supervise.customer.api.supplierbankinfo.SupplierBankInfoDetailsVo;
-import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto;
-import com.yxt.supervise.customer.api.supplierindex.SupplierIndexDetailsVo;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @RestController("com.yxt.supervise.customer.biz.csmcash.CsmCashRest")
@@ -99,4 +94,23 @@ public class CsmCashRest {
         return rb.success().setData(vo);
     }
 
+    @ApiOperation("保存回款信息列表")
+    @PostMapping("/incomeListSave")
+    public ResultBean incomeListSave(@RequestBody List<CsmCashIncome> list) {
+        ResultBean rb = ResultBean.fireFail();
+        boolean sok = csmCashIncomeService.cleanAndSaveBatch(list);
+        if (sok)
+            return rb.success();
+        return rb;
+    }
+
+    @ApiOperation("保存回款信息列表")
+    @PostMapping("/salesListSave")
+    public ResultBean salesListSave(@RequestBody List<CsmCashSales> list) {
+        ResultBean rb = ResultBean.fireFail();
+        boolean sok = csmCashSalesService.cleanAndSaveBatch(list);
+        if (sok)
+            return rb.success();
+        return rb;
+    }
 }

yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/csmcash/CsmCashSalesService.java

@@ -1,36 +1,85 @@
 package com.yxt.supervise.customer.biz.csmcash;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service
 public class CsmCashSalesService extends ServiceImpl<CsmCashSalesMapper, CsmCashSales> {
+
+    @Autowired
+    private CsmCashDisbursementService csmCashDisbursementService;
+
     public void clearAndCreateOfDay(String dataDate, List<CsmCashGd> gdList) {
         baseMapper.clearOfDay(dataDate);
         List<CsmCashSales> 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());
+            if (gd.getAccountAmount() != 0) {
+                CsmCashSales ccs = initSales(gd);
                 ccs.setSerialNumber(sn);
                 sn++;
-                ccs.setDisbursementChannelName(gd.getAccountName());
-                ccs.setAmount(gd.getAccountAmount());
                 list.add(ccs);
             }
         }
         super.saveBatch(list);
     }
 
+    private CsmCashSales initSales(CsmCashGd gd) {
+
+        CsmCashSales ccs = new CsmCashSales();
+        ccs.setLogsid(gd.getLogsid());
+        ccs.setDataDate(gd.getDataDate());
+        ccs.setAmount(gd.getAccountAmount());
+        String accountName = gd.getAccountName();
+        ccs.setDisbursementChannelName(accountName);
+        CsmCashDisbursement ccd = csmCashDisbursementService.fetchByName(accountName);
+        ccs.setDisbursementChannelSid(ccd.getSid());
+        ccs.setCompanyName(ccd.getCompanyName());
+        ccs.setAccountCycle(ccd.getAccountCycle());
+        if (1 == ccd.getCycleType()) { // 按天数计算预计到款日期
+            int tnumber = ccd.getTnumber();
+            DateTime offset = DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, tnumber);
+            ccs.setAntipateCashedDate(offset);
+        }
+        if (2 == ccd.getCycleType()) { // 按每月指定日期计算预计到款日期
+            int tday = ccd.getTday();
+            int currday = DateUtil.dayOfMonth(new Date());
+            String cday = DateUtil.format(new Date(), "yyyy-MM-dd");
+            if (currday >= tday) {
+                cday = DateUtil.format(DateUtil.offset(new Date(), DateField.MONTH, 1), "yyyy-MM-dd");
+            }
+            String stday = "" + tday;
+            if (tday < 10) {
+                stday = "0" + tday;
+            }
+            String dd = cday.substring(0, 8) + stday;
+            ccs.setAntipateCashedDate(DateUtil.parse(dd, "yyyy-MM-dd"));
+        }
+
+        return ccs;
+    }
+
     public List<CsmCashSales> listByLogsid(String logsid) {
         QueryWrapper<CsmCashSales> qw = new QueryWrapper<>();
         qw.eq("logsid", logsid);
         return baseMapper.selectList(qw);
     }
+
+    public boolean cleanAndSaveBatch(List<CsmCashSales> list) {
+        if (list == null || list.isEmpty())
+            return false;
+        CsmCashSales csmCashSales = list.get(0);
+        baseMapper.clearOfDay(csmCashSales.getDataDate());
+        super.saveBatch(list);
+        return true;
+    }
 }

yxt_supervise/supervise-system/supervise-system-biz/pom.xml

@@ -114,12 +114,12 @@
         <artifactId>fastcsv</artifactId>
         <version>2.2.1</version>
     </dependency>
-        <dependency>
-            <groupId>com.yxt.supervise</groupId>
-            <artifactId>supervise-flowable-api</artifactId>
-            <version>0.0.1</version>
-            <scope>compile</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yxt.supervise</groupId>-->
+<!--            <artifactId>supervise-flowable-api</artifactId>-->
+<!--            <version>0.0.1</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
         <!--        <dependency>-->
 <!--            <groupId>com.yxt.supervise</groupId>-->
 <!--            <artifactId>supervise-flowable-api</artifactId>-->