20200529 代码提交

xiaoyong931011

2020-05-29 864b77ebac060a40bb0a454e53fa851540a4cd19

20200529  代码提交

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

@@ -15,6 +15,7 @@
import com.xcong.excoin.modules.coin.parameter.dto.CancelEntrustWalletCoinOrderDto;

import com.xcong.excoin.modules.coin.parameter.dto.FindCollectDto;

import com.xcong.excoin.modules.coin.parameter.dto.SubmitSalesWalletCoinOrderDto;

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

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

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

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

@@ -147,4 +148,15 @@
        return orderCoinService.checkIsCollect(symbol);

    }

    

    /**

     * 已自选的币种

     * @return

     */

    @ApiOperation(value = "已自选的币种", notes = "已自选的币种")

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

    @GetMapping(value = "/findCollectList")

    public Result  findCollectList() {

        return orderCoinService.findCollectList();

    }

	
}


 src/main/java/com/xcong/excoin/modules/coin/parameter/vo/FindCollectListVo.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 = "FindCollectListVo", description = "币币是否自选返回")

public class FindCollectListVo {



    @ApiModelProperty(value = "币币自选")

    private List<MemberSelectSymbolsVo> memberSelectSymbolsVo;



}


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

@@ -13,6 +13,11 @@
@ApiModel(value = "OrderWalletCoinVo", description = "订单详情")

public class OrderWalletCoinVo {

    /**

     * 订单ID

     */

    @ApiModelProperty(value = "ID")

    private Long id;

    /**

     * 订单编号

     */

    @ApiModelProperty(value = "订单编号")


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

@@ -27,4 +27,6 @@


    public Result checkIsCollect(String symbol);



    public Result findCollectList();



}


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

@@ -29,6 +29,7 @@
import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;

import com.xcong.excoin.modules.coin.mapper.OrderWalletCoinDealMapper;

import com.xcong.excoin.modules.coin.mapper.OrderWalletCoinMapper;

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

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

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

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

@@ -461,4 +462,26 @@
        return Result.ok(memberSelectSymbolsVo);

    }



    @Override

    public Result findCollectList() {

        //获取用户ID

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

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

        columnMap.put("member_id", memberId);

        List<MemberSelectSymbolsEntity> selectByMap = memberSelectSymbolsDao.selectByMap(columnMap);

		
        FindCollectListVo findCollectListVo = new FindCollectListVo();

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

        if(CollUtil.isNotEmpty(selectByMap)) {

            for(MemberSelectSymbolsEntity memberSelectSymbolsEntity : selectByMap) {

                MemberSelectSymbolsVo memberSelectSymbolsVo = new MemberSelectSymbolsVo();

                memberSelectSymbolsVo.setSymbol(memberSelectSymbolsEntity.getSymbol());

                arrayList.add(memberSelectSymbolsVo);

            }

        }

        findCollectListVo.setMemberSelectSymbolsVo(arrayList);

		
        return Result.ok(findCollectListVo);

    }



}