20200720 代码提交

xiaoyong931011

2020-07-20 3887ddd1e3b26afdedc58d9adaef8905391435b6

20200720  代码提交

 src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java

@@ -212,17 +212,15 @@
        IPage<MemberAccountMoneyChangeEntity> findMemberAccountInfoListInPage = 

                memberAccountMoneyChangeMapper.findMemberAgentReturnInfoAloneInPage(page, memberAccountMoneyChangeEntity);

        

        Map<String, Object> columnMaps = new HashMap<>();

        columnMaps.put("member_id", 8);

        List<MemberAccountMoneyChangeEntity> selectByMap2 = memberAccountMoneyChangeMapper.selectByMap(columnMaps);

        MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity2 = selectByMap2.get(0);

        String selectYJByMemberId = agentReturnMapper.selectYJByMemberId();

        memberAccountMoneyChangeEntity2.setAllAmount(selectYJByMemberId);

		
        List<MemberAccountMoneyChangeEntity> records = findMemberAccountInfoListInPage.getRecords();

        if(records != null && records.size() > 0) {

            String selectYJByMemberId = agentReturnMapper.selectYJByMemberId();

            for(MemberAccountMoneyChangeEntity accountMoneyChangeEntity : records) {

                Long memberId = accountMoneyChangeEntity.getMemberId();

                if(memberId == 8 || "8".equals(memberId)) {

                    accountMoneyChangeEntity.setAmount(BigDecimal.ZERO);

                    accountMoneyChangeEntity.setAllAmount(selectYJByMemberId);

                }

                String allAmount = memberAccountMoneyChangeMapper.selectAccountMoneyChangeByMemberId(memberId);

                Map<String, Object> columnMap = new HashMap<>();

                columnMap.put("member_id", memberId);

@@ -237,7 +235,6 @@
                accountMoneyChangeEntity.setAllAmount(allAmount);

            }

        }

        records.add(memberAccountMoneyChangeEntity2);

        return findMemberAccountInfoListInPage;

    }

    


 src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml

@@ -45,7 +45,7 @@
        LEFT JOIN member m ON m.id = s.member_id

        <where>

        s.type = 3 

        and (FIND_IN_SET('22015141', m.referer_ids) or m.id in (10))

        and (FIND_IN_SET('22015141', m.referer_ids) or m.id in (8,10))

        and s.content like '%佣金到账%' 

            <if test="record != null" >

                <if test="record.account!=null and record.account!=''">