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

Compare commits

base: angelo:ce8a8fd222f2255ef7f83111930147f572d53bd4
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
..
compare: angelo:2d85c510a3b8d7b65d0ec1ad620db38a59689938
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

No commits in common. "ce8a8fd222f2255ef7f83111930147f572d53bd4" and "2d85c510a3b8d7b65d0ec1ad620db38a59689938" have entirely different histories.
ce8a8fd222 ... 2d85c510a3

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

2
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml
View File

@ -400,7 +400,7 @@
) b ) b
left join sa_order so left join sa_order so
on so.pk_id = b.pk_order on so.pk_id = b.pk_order
LEFT JOIN cu_member tar ON b.pk_member = tar.pk_id LEFT JOIN cu_member tar ON b.PK_SOURCE_MEMBER = tar.pk_id
LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id
left join cu_member_settle_period cp left join cu_member_settle_period cp
on b.period = cp.pk_id on b.period = cp.pk_id

2
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml
View File

@ -89,7 +89,7 @@
<if test="bonusParam.orderType != null"> <if test="bonusParam.orderType != null">
and so.order_type = #{bonusParam.orderType} and so.order_type = #{bonusParam.orderType}
</if> </if>
LEFT JOIN cu_member tar ON b.pk_member = tar.pk_id LEFT JOIN cu_member tar ON b.PK_SOURCE_MEMBER = tar.pk_id
LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id
left join cu_member_settle_period cp left join cu_member_settle_period cp
on b.period = cp.pk_id on b.period = cp.pk_id