xiaoyong931011
2021-09-26 3e4cfdd9da5ed748292e7da7ec42a64d0fe4b75c
Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
2 files modified
10 ■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java 2 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml 8 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.mall.entity.AgentInfo;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
@@ -110,6 +111,7 @@
    @Override
    public void returnMoneyToAgent(Long orderId) {
        MallOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
    }
}
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -10,9 +10,13 @@
    <select id="selectApiMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
        select
            a.*,
            b.phone
            case when a.rt_member_id is null then (select n.phone from mall_member n where n.id=a.member_id)
                 when a.rt_member_id is not null then (select m.phone from mall_member m where m.id=a.rt_member_id)
            end phone,
            c.description memberLevel
        from mall_money_flow a
            inner join mall_member b on a.member_id=b.id
            left join mall_member b on a.rt_member_id=b.id
            left join data_dictionary_custom c on b.level = c.code and c.type='AGENT_LEVEL'
        <where>
            <if test="record.type == 3">
                and a.amount > 0