20200607 代码提交

xiaoyong931011

2020-06-07 88cd2c98f695945309ed9a0b52b11771653aa8c6

20200607  代码提交

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

@@ -6,6 +6,7 @@
import javax.validation.Valid;



import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletAgentInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo;

@@ -139,6 +140,17 @@
    }

    

    /**

     *  获取代理资产佣金入账

     * @return

     */

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

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

    @GetMapping(value="/getWalletAgentIntoRecords")

    public Result  getWalletAgentIntoRecords() {

        return coinService.getWalletAgentIntoRecords();

    }

	
    /**

     * 币币账户USDT划转到合约账户

     * @return

     */


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

@@ -15,4 +15,6 @@


    List<MemberAccountMoneyChange> selectWalletAgentRecordByMemIdTypeSymbol(@Param("symbol")String symbol, @Param("memberId")Long memberId);



    List<MemberAccountMoneyChange> selectWalletAgentIntoRecordsByMemIdTypeSymbol(@Param("memberId")Long memberId);



}


 src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberAgentIntoInfoVo.java

New file
@@ -0,0 +1,16 @@
package com.xcong.excoin.modules.coin.parameter.vo;



import java.util.List;



import io.swagger.annotations.ApiModel;

import io.swagger.annotations.ApiModelProperty;

import lombok.Data;



@Data

@ApiModel(value = "MemberAgentIntoInfoVo", description = "佣金入账记录信息返回")

public class MemberAgentIntoInfoVo {

	
    @ApiModelProperty(value = "资产交易记录详情信息")

    private List<MemberAccountMoneyChangeInfoVo> memberAccountMoneyChangeInfoVo;



}


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

@@ -32,4 +32,6 @@


    public Result getWalletCoinBySymbol(String symbol);



    public Result getWalletAgentIntoRecords();



}


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

@@ -16,6 +16,7 @@
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;

import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;

import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletAgentInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo;

@@ -517,4 +518,30 @@
        return Result.ok(memberWalletAgentInfoVo);

    }



    @Override

    public Result getWalletAgentIntoRecords() {

            //获取用户ID

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



            List<MemberAccountMoneyChange> contractRecordList =

                    memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(memberId);



            MemberAgentIntoInfoVo memberAgentIntoInfoVo = new MemberAgentIntoInfoVo();

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

            if (ObjectUtil.isNotNull(contractRecordList)) {

                for (MemberAccountMoneyChange memberAccountMoneyChange : 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());

                    arrayList.add(memberAccountMoneyChangeInfoVo);

                }

            }

            memberAgentIntoInfoVo.setMemberAccountMoneyChangeInfoVo(arrayList);

            return Result.ok(memberAgentIntoInfoVo);

    }



}


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

@@ -13,6 +13,10 @@
    <select id="selectWalletAgentRecordByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">

        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>