Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-04-09 a9fbfbd5dbabcad09cd06e4b07cda8c5a01183ff

Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java

@@ -372,11 +372,12 @@
    @ApiOperation(value = "提币币种可用资金", notes = "提币币种可用资金")

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

    @ApiImplicitParams({

        @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")

        @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),

        @ApiImplicitParam(name = "label", value = "label", required=false, dataType = "String", paramType="query")

    })

    @GetMapping(value = "/memberAvivableCoinInfo")

    public Result memberAvivableCoinInfo(String symbol) {

        return memberService.memberAvivableCoinInfo(symbol);

    public Result memberAvivableCoinInfo(String symbol,String label) {

        return memberService.memberAvivableCoinInfo(symbol,label);

    }

    

    /**


 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java

@@ -61,7 +61,7 @@


    public Result memberCoinInfoList();



    public Result memberAvivableCoinInfo(String symbol);

    public Result memberAvivableCoinInfo(String symbol,String label);



    public NeedMoneyMemberVo selectFriendRelationUserByMemberId(Long memberId);




 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -872,7 +872,7 @@
    }

    @Override
    public Result memberAvivableCoinInfo(String symbol) {
    public Result memberAvivableCoinInfo(String symbol,String lable) {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
@@ -883,7 +883,7 @@
        List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();


        List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
        List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol,lable);
        if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
            return Result.fail(MessageSourceUtils.getString("member_service_0087"));
        }

 src/main/java/com/xcong/excoin/modules/platform/dao/PlatformFeeSettingDao.java

@@ -13,6 +13,6 @@


    PlatformFeeSettingEntity getFeeSettingByTypeAndSymbol(@Param("type")Integer type,@Param("symbol")String symbol);



    List<PlatformFeeSettingEntity> getFeeSettingsByTypeAndSymbol(@Param("type")int i,@Param("symbol")String symbol);

    List<PlatformFeeSettingEntity> getFeeSettingsByTypeAndSymbol(@Param("type")int i,@Param("symbol")String symbol,@Param("lable")String lable);



}


 src/main/resources/mapper/platform/PlatformFeeSettingDao.xml

@@ -30,6 +30,9 @@
             <if test="symbol != null  and  symbol  != ''">

                 and symbol = #{symbol}

             </if>

             <if test="lable != null  and  lable  != ''">

                 and lable = #{lable}

             </if>

         </where>

     </select>