20200526 代码提交

xiaoyong931011

2020-05-26 7bad1a49ff295fb7f2a44c859d7f3b5c9dd6d20f

20200526  代码提交

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

@@ -139,8 +139,11 @@
     */

    @ApiOperation(value = "币币是否自选", notes = "币币是否自选")

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

    @PostMapping(value="/checkIsCollect")

    public Result  checkIsCollect(@ApiParam(name="symbol",value="币种",required=true)String symbol) {

    @ApiImplicitParams({

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

    })

    @GetMapping(value = "/checkIsCollect")

    public Result  checkIsCollect(String symbol) {

        return orderCoinService.checkIsCollect(symbol);

    }

    


 src/main/java/com/xcong/excoin/modules/coin/mapper/OrderWalletCoinDealMapper.java

@@ -1,14 +1,16 @@
package com.xcong.excoin.modules.coin.mapper;



import org.mapstruct.Mapper;

import org.mapstruct.factory.Mappers;



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

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



@Mapper

public abstract class OrderWalletCoinDealMapper {

    

    public static final OrderWalletCoinDealMapper INSTANCE = Mappers.getMapper(OrderWalletCoinDealMapper.class);

    

    public abstract OrderWalletCoinDealVo entityToVo(OrderCoinsDealEntity orderCoinsDealEntity);

    public abstract OrderWalletCoinDealVo entityToVoOrder(OrderCoinsDealEntity orderCoinsDealEntity);



}


 src/main/java/com/xcong/excoin/modules/coin/mapper/OrderWalletCoinMapper.java

@@ -1,10 +1,12 @@
package com.xcong.excoin.modules.coin.mapper;



import org.mapstruct.Mapper;

import org.mapstruct.factory.Mappers;



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

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



@Mapper

public abstract class OrderWalletCoinMapper {



    public static final OrderWalletCoinMapper INSTANCE = Mappers.getMapper(OrderWalletCoinMapper.class);


 src/main/java/com/xcong/excoin/modules/coin/parameter/dto/SubmitSalesWalletCoinOrderDto.java

@@ -16,7 +16,7 @@
    private String symbol;



    @NotNull(message = "交易类型不能为空")

    @ApiModelProperty(value = "买入卖出类型买入:1,卖出:2", example = "USDT")

    @ApiModelProperty(value = "买入卖出类型买入:1,卖出:2", example = "1")

    private Integer type;

    

    @NotNull(message = "交易方式不能为空")


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

@@ -1,6 +1,9 @@
package com.xcong.excoin.modules.coin.parameter.vo;



import java.math.BigDecimal;

import java.util.Date;



import com.fasterxml.jackson.annotation.JsonFormat;



import io.swagger.annotations.ApiModel;

import io.swagger.annotations.ApiModelProperty;

@@ -36,4 +39,8 @@
    @ApiModelProperty(value = "状态【0:待审核 1：成功2：失败】")

    private int status;



    @ApiModelProperty(value = "时间")

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

    private Date updateTime;



}


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

@@ -349,6 +349,7 @@
                memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());

                memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());

                memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());

                memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());

                arrayList.add(memberAccountMoneyChangeInfoVo);

            }

        }

@@ -371,6 +372,7 @@
                memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());

                memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());

                memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());

                memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());

                arrayList.add(memberAccountMoneyChangeInfoVo);

            }

        }

@@ -395,6 +397,7 @@
                memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());

                memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());

                memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());

                memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());

                arrayList.add(memberAccountMoneyChangeInfoVo);

            }

        }


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

@@ -397,7 +397,7 @@
        List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrder(memberId);

        if(CollUtil.isNotEmpty(selectAllWalletCoinOrder)) {

            for(OrderCoinsDealEntity orderCoinsDealEntity: selectAllWalletCoinOrder) {

                OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVo(orderCoinsDealEntity);

                OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVoOrder(orderCoinsDealEntity);

                arrayList.add(entityToVo);

            }

        }

@@ -410,7 +410,7 @@
        //获取用户ID

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

        OrderCoinsDealEntity selectWalletCoinOrder = orderCoinDealDao.selectWalletCoinOrder(orderId,memberId);

        OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVo(selectWalletCoinOrder);

        OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVoOrder(selectWalletCoinOrder);

        return Result.ok(entityToVo);

    }



@@ -428,6 +428,7 @@
        }else {

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

            columnMap.put("symbol", symbol);

            columnMap.put("member_id", memberId);

            memberSelectSymbolsDao.deleteByMap(columnMap);;

            return Result.ok(MessageSourceUtils.getString("order_service_0016"));

        }


 src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml

@@ -6,14 +6,14 @@
         select * from coins_order_deal 

         <where>

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

                  and memberid = #{memberId}

                  and member_id = #{memberId}

             </if>

         </where>

         order by id desc

    </select>

    

    <select id="selectWalletCoinOrder" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">

        select * from coins_order_deal where order_id= #{orderId} and memberid = #{memberId}

        select * from coins_order_deal where order_id= #{orderId} and member_id = #{memberId}

    </select>

    

</mapper>


 src/test/java/com/xcong/excoin/mapper/MapStructMapper.java

@@ -4,6 +4,10 @@
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

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

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

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



import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -86,4 +90,13 @@
        log.info(entities.toString());
    }

    @Test

    public void walletCoinTest() {

        OrderCoinsDealEntity orderCoinsDealEntity = new OrderCoinsDealEntity();

        orderCoinsDealEntity.setMemberId(1L);

        orderCoinsDealEntity.setOrderNo("123445");

        OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVoOrder(orderCoinsDealEntity);

        System.out.println(entityToVo);

    }



}