ylj/wechat_yxcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复每日营收推送BUG

Browse Source
This commit is contained in:
zzy 2023-04-14 10:51:32 +08:00
parent ba0c7dcb56
commit f612ac80e7
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/everdayRenven/AnhuiIndex.vue
View File

@ -455,12 +455,6 @@
let _this = this let _this = this
const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] = const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] =
await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据 await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
console.log('reginList',reginList)
console.log('totalData',totalData)
console.log('busniessTypePie',busniessTypePie)
console.log('busniessTradePie',busniessTradePie)
console.log('busniessAreaPie',busniessAreaPie)
console.log('bayonetPie',bayonetPie)
if (this.theRequest.GroupType !== 1010) { if (this.theRequest.GroupType !== 1010) {
this.regionList = reginList // 营收上传列表 reginListModel[] this.regionList = reginList // 营收上传列表 reginListModel[]

17
pages/everdayRenven/components/anhuiYestodayRevenueData.js
View File

@ -20,10 +20,17 @@ const methods = {
Statistics_Month: obj.month , Statistics_Month: obj.month ,
Province_Code: obj.ProvinceCode , Province_Code: obj.ProvinceCode ,
pushProvinceCode: obj.ProvinceCode , pushProvinceCode: obj.ProvinceCode ,
Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : '', Serverpart_ID: obj.GroupType != 1020 ? obj.ServerpartIds : '',
SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '', SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '',
// Revenue_Include: 1 // Revenue_Include: 1
} }
const requestParamasBudget = {
Statistics_Date: obj.time ,
Statistics_Month: obj.month ,
Province_Code: obj.ProvinceCode ,
pushProvinceCode: obj.ProvinceCode ,
Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : ''
}
this.provinceCode = obj.ProvinceCode this.provinceCode = obj.ProvinceCode
// 营收数据 // 营收数据
const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas) const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas)
@ -38,13 +45,17 @@ const methods = {
if (tradeData.Result_Code != 100) return if (tradeData.Result_Code != 100) return
// 计划营收金额 // 计划营收金额
const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamas) const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamasBudget)
if (budgetAmount.Result_Code != 100) return if (budgetAmount.Result_Code != 100) return
// 移动支付分账数据 // 移动支付分账数据
const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas) const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas)
if (mobileShare.Result_Code != 100) return if (mobileShare.Result_Code != 100) return
// 万佳商城配送数据
const mallDeliver = await request.$webGet('CommercialApi/Revenue/GetMallDeliver', requestParamas)
if (mallDeliver.Result_Code != 100) return
// 片区车流量 // 片区车流量
const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas) const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas)
if (bayonetCount.Result_Code != 100) return if (bayonetCount.Result_Code != 100) return
@ -55,7 +66,7 @@ const methods = {
} }
return _this.getReginList(data.Result_Data.List, busniessCounts.Result_Data.List, return _this.getReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
tradeData.Result_Data.List, budgetAmount.Result_Data.List, tradeData.Result_Data.List, budgetAmount.Result_Data.List,
bayonetCount.Result_Data.List, mobileShare.Result_Data) bayonetCount.Result_Data.List, mobileShare.Result_Data, mallDeliver.Result_Data)
// [reginList, totalData, busniessTypePie, busniessTradePie] // [reginList, totalData, busniessTypePie, busniessTradePie]
}, },