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

Compare commits

base: angelo:13e63c34931e086a024c931fd51ae3c6047d3c17
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
..
compare: angelo:d21156bd1cd25e530d8661df83a1a438052d796d
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

No commits in common. "13e63c34931e086a024c931fd51ae3c6047d3c17" and "d21156bd1cd25e530d8661df83a1a438052d796d" have entirely different histories.
13e63c3493 ... d21156bd1c

2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -884,10 +884,10 @@
currentMonth.ENABLE_STATUS,
NVL( currentDay.NEW_CONSUME_PV + currentDay.TEAM_NEW_PV, 0 ) todayPv,
NVL( currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) todayBoxNum,
NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + currentMonth.TEAM_NEW_PV, 0 ) yesterdayPv,
NVL( NVL( currentMonth.NEW_BOX_NUM, 0 ) + currentMonth.TEAM_NEW_BOX_NUM, 0 ) yesterdayBoxNum,
NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + currentDay.NEW_CONSUME_PV + currentDay.TEAM_NEW_PV, 0 ) currentMonthPv,
NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) currentMonthBoxNum,
NVL( currentMonth.NEW_CONSUME_PV + currentMonth.TEAM_NEW_PV, 0 ) yesterdayPv,
NVL( currentMonth.NEW_BOX_NUM + currentMonth.TEAM_NEW_BOX_NUM, 0 ) yesterdayBoxNum,
NVL( currentMonth.MONTH_CONSUME_PV + currentDay.NEW_CONSUME_PV + currentDay.TEAM_NEW_PV , 0 ) currentMonthPv,
NVL( currentMonth.MONTH_BOX_NUM + currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) currentMonthBoxNum,
NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv,
NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum,
NVL( currentMonth.CONSUME_BOX_NUM + currentDay.NEW_BOX_NUM + currentDay.TEAM_NEW_BOX_NUM, 0 ) totalBoxNum

2
bd-business/bd-business-member/src/main/resources/mapper/member/empty/CuMemberEmptyDetailMapper.xml
View File

@ -156,7 +156,7 @@
cmed.product_flag = tmp.product_flag,
cmed.order_type = tmp.order_type,
cmed.pk_modified = #{userId},
cmed.auto_flag = tmp.auto_flag,
cmed.auth_flag = tmp.auto_flag,
cmed.modified_time = sysdate
</update>