Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-23 071675033dbbb68a48cc0d9001675df8ce3b8231

Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

 src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java

@@ -146,9 +146,9 @@
     */

    @ApiOperation(value="获取代理资产佣金入账", notes="获取代理资产佣金入账")

    @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})

    @GetMapping(value="/getWalletAgentIntoRecords")

    public Result  getWalletAgentIntoRecords() {

        return coinService.getWalletAgentIntoRecords();

    @PostMapping(value="/getWalletAgentIntoRecords")

    public Result  getWalletAgentIntoRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {

        return coinService.getWalletAgentIntoRecords(recordsPageDto);

    }

    

    /**


 src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java

@@ -29,4 +29,7 @@
    IPage<MemberAccountMoneyChange> selectWalletAgentRecordsInPage(Page<OrderCoinsDealEntity> page,

            @Param("record") MemberAccountMoneyChange memberAccountMoneyChange);



    IPage<MemberAccountMoneyChange> selectWalletAgentIntoRecordsByMemIdTypeSymbol(Page<OrderCoinsDealEntity> page,

            @Param("record")MemberAccountMoneyChange memberAccountMoneyChange);



}


 src/main/java/com/xcong/excoin/modules/coin/service/CoinService.java

@@ -29,7 +29,7 @@


    public Result getWalletCoinBySymbol(String symbol);



    public Result getWalletAgentIntoRecords();

    public Result getWalletAgentIntoRecords(@Valid RecordsPageDto recordsPageDto);



    public Result getWalletCoinRecords(@Valid RecordsPageDto recordsPageDto);




 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java

@@ -4,6 +4,7 @@
import java.util.ArrayList;

import java.util.List;

import javax.annotation.Resource;

import javax.validation.Valid;



import com.xcong.excoin.modules.platform.entity.PlatformCnyUsdtExchangeEntity;

import org.springframework.stereotype.Service;

@@ -479,31 +480,34 @@
    }



    @Override

    public Result getWalletAgentIntoRecords() {

    public Result getWalletAgentIntoRecords(RecordsPageDto recordsPageDto) {

            //获取用户ID

            Long memberId = LoginUserUtils.getAppLoginUser().getId();



            List<MemberAccountMoneyChange> contractRecordList =

                    memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(memberId);



            MemberAgentIntoInfoVo memberAgentIntoInfoVo = new MemberAgentIntoInfoVo();

	        
            Page<OrderCoinsDealEntity> page = new Page<>(recordsPageDto.getPageNum(), recordsPageDto.getPageSize());

            MemberAccountMoneyChange memberAccountMoneyChange = new MemberAccountMoneyChange();

            memberAccountMoneyChange.setMemberId(memberId);

            IPage<MemberAccountMoneyChange> list = memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(page, memberAccountMoneyChange);

            List<MemberAccountMoneyChange> contractRecordList = list.getRecords();

            List<MemberAccountMoneyChangeInfoVo> arrayList = new ArrayList<>();

            if(CollUtil.isNotEmpty(contractRecordList)) {

                if (ObjectUtil.isNotNull(contractRecordList)) {

                    for (MemberAccountMoneyChange memberAccountMoneyChange : contractRecordList) {

                    for (MemberAccountMoneyChange memberAccountMoneyChanges : contractRecordList) {

                        MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();

                        memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChange.getAmount());

                        memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChange.getContent());

                        memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());

                        memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());

                        memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());

                        memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());

                        memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChanges.getAmount());

                        memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChanges.getContent());

                        memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChanges.getStatus());

                        memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChanges.getSymbol());

                        memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChanges.getType());

                        memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChanges.getUpdateTime());

                        arrayList.add(memberAccountMoneyChangeInfoVo);

                    }

                }

            }

            memberAgentIntoInfoVo.setMemberAccountMoneyChangeInfoVo(arrayList);

            return Result.ok(memberAgentIntoInfoVo);

            Page<MemberAccountMoneyChangeInfoVo> pageEntityToPageVo = new Page<>();

            pageEntityToPageVo.setRecords(arrayList);

	        
            return Result.ok(pageEntityToPageVo);

    }



}


 src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml

@@ -14,10 +14,6 @@
        select * from member_account_money_change where type = 3 and member_id = #{memberId}  order by id desc

    </select>

    

    <select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">

        select * from member_account_money_change where type = 3 and content like '%佣金到账%' and member_id = #{memberId}  order by id desc

    </select>

	
    <select id="selectWalletCoinRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">

        select * from member_account_money_change

        <if test="record != null">

@@ -54,5 +50,18 @@
        </if>

        order by id desc

    </select>

    
    <select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">

        select * from member_account_money_change <if test="record != null">

            <where>

                type = 3

                and content like '%佣金到账%'

                <if test="record.memberId != null" >

                    and member_id=#{record.memberId}

                </if>

            </where>

        </if>

        order by id desc

    </select>



</mapper>