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

Compare commits

base: angelo:e86e8a05d7c5a346f6983cfb47ec20d1c1e79035
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
..
compare: angelo:bd7d788769dfebb23f594aafc86089917e39e151
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
angelo:master

No commits in common. "e86e8a05d7c5a346f6983cfb47ec20d1c1e79035" and "bd7d788769dfebb23f594aafc86089917e39e151" have entirely different histories.
e86e8a05d7 ... bd7d788769

1 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

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

@ -445,7 +445,7 @@
<!--开始大小区业绩 以累计为准 --> <!--开始大小区业绩 以累计为准 -->
<select id="selectMemberOrderSumAchieveByPkMember" resultType="com.hzs.retail.member.vo.CuMemberRetailAchieveVO"> <select id="selectMemberOrderSumAchieveByPkMember" resultType="com.hzs.retail.member.vo.CuMemberRetailAchieveVO">
SELECT sum(arealPv) arealPv SELECT sum(arealPv) arealPv
FROM (SELECT (NVL(mr.CONSUME_PV, 0) + NVL( mr.TEAM_CONSUME_PV, 0 )) arealPv FROM (SELECT NVL(mr.CONSUME_PV, 0) arealPv
FROM ${memberRetailTable} mr FROM ${memberRetailTable} mr
WHERE mr.category = 0 WHERE mr.category = 0
AND mr.pk_member = #{pkMember} AND mr.pk_member = #{pkMember}
@ -496,13 +496,13 @@
<foreach collection="pkMemberList" item="pkMember" separator="union all"> <foreach collection="pkMemberList" item="pkMember" separator="union all">
SELECT SUM(t1.arealPv) arealPv ,#{pkMember} pkMember SELECT SUM(t1.arealPv) arealPv ,#{pkMember} pkMember
FROM ( FROM (
SELECT NVL(mr.CONSUME_PV + mr.ALL_TEAM_CONSUME_PV,0) arealPv SELECT NVL(mr.CONSUME_PV + mr.TEAM_CONSUME_PV,0) arealPv
FROM ${memberRetailTable} mr FROM ${memberRetailTable} mr
WHERE mr.category = 0 WHERE mr.category = 0
AND mr.pk_member = #{pkMember} AND mr.pk_member = #{pkMember}
UNION ALL UNION ALL
SELECT SELECT
NVL( mrs.NEW_CONSUME_PV + mrs.ALL_TEAM_NEW_PV, 0 ) arealPv NVL( mrs.NEW_CONSUME_PV + mrs.TEAM_NEW_PV, 0 ) arealPv
FROM FROM
${memberRetailSTable} mrs ${memberRetailSTable} mrs
WHERE mrs.pk_member = #{pkMember} WHERE mrs.pk_member = #{pkMember}
@ -844,13 +844,13 @@
mr.ENABLE_STATUS, mr.ENABLE_STATUS,
NVL( mr.CONSUME_PV, 0 ) consumePv, NVL( mr.CONSUME_PV, 0 ) consumePv,
NVL( mr.NEW_CONSUME_PV, 0 ) newConsumePv, NVL( mr.NEW_CONSUME_PV, 0 ) newConsumePv,
NVL( mr.All_TEAM_CONSUME_PV, 0 ) teamConsumePv, NVL( mr.TEAM_CONSUME_PV, 0 ) teamConsumePv,
NVL( mr.All_TEAM_NEW_PV, 0 ) teamNewPv, NVL( mr.TEAM_NEW_PV, 0 ) teamNewPv,
NVL( mr.CONSUME_BOX_NUM, 0 ) consumeBoxNum, NVL( mr.CONSUME_BOX_NUM, 0 ) consumeBoxNum,
NVL( mr.NEW_BOX_NUM, 0 ) newBoxNum, NVL( mr.NEW_BOX_NUM, 0 ) newBoxNum,
NVL( mr.All_TEAM_BOX_NUM, 0 ) teamBoxNum, NVL( mr.TEAM_BOX_NUM, 0 ) teamBoxNum,
NVL( mr.All_TEAM_NEW_BOX_NUM, 0 ) teamNewBoxNum, NVL( mr.TEAM_NEW_BOX_NUM, 0 ) teamNewBoxNum,
NVL( mr.BIG_BOX_NUM, 0 ) bigBoxNum, NVL( mr.BIG_BOX_NUM, 0 ) bigBoxNum,
NVL( mr.SMALL_BOX_NUM, 0 ) smallBoxNum, NVL( mr.SMALL_BOX_NUM, 0 ) smallBoxNum,