angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:a46ec5257e64a5c2a3409cff1fff5cbec070d893
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
...
compare: angelo:2bd224b3d4f6f70837d2cc037737302890ac48f8
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

2 Commits
a46ec5257e ... 2bd224b3d4

Author SHA1 Message Date
sangelxiu1 2bd224b3d4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 09:39:32 +08:00
sangelxiu1 2615f517de ## Fix - 盒数(小区盒数) & 市场动态-本月盒数(日结.MONTH_BOX_NUM + TEAM_MONTH_BOX_NUM + 秒结.NEW_BOX_NUM + TEAM_NEW_BOX_NUM) 2025-06-17 09:39:25 +08:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
View File

@ -180,7 +180,7 @@ public class DataStatisticsUtil {
.memberCode(SELF_VIRTUAL_NAME) .memberCode(SELF_VIRTUAL_NAME)
.totalBoxNum( .totalBoxNum(
detailVO.getConsumeBoxNum() detailVO.getConsumeBoxNum()
+ detailVO.getNewBoxNum() // + detailVO.getNewBoxNum()
+ detailVO.getSNewBoxNum() + detailVO.getSNewBoxNum()
) )
.totalPv( .totalPv(

2
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
View File

@ -887,7 +887,7 @@
NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + NVL( currentMonth.TEAM_NEW_PV, 0 ), 0 ) yesterdayPv, NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + NVL( currentMonth.TEAM_NEW_PV, 0 ), 0 ) yesterdayPv,
NVL( NVL( currentMonth.NEW_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_NEW_BOX_NUM, 0 ), 0 ) yesterdayBoxNum, NVL( NVL( currentMonth.NEW_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_NEW_BOX_NUM, 0 ), 0 ) yesterdayBoxNum,
NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentDay.NEW_CONSUME_PV, 0 ) + NVL( currentDay.TEAM_NEW_PV, 0 ), 0 ) currentMonthPv, NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentDay.NEW_CONSUME_PV, 0 ) + NVL( currentDay.TEAM_NEW_PV, 0 ), 0 ) currentMonthPv,
NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) currentMonthBoxNum, NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_MONTH_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) currentMonthBoxNum,
NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv, NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv,
NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum, NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum,
NVL( NVL( currentMonth.CONSUME_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) totalBoxNum NVL( NVL( currentMonth.CONSUME_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) totalBoxNum