20200602 代码提交

xiaoyong931011

2020-06-02 987b08f018be10550d6f48242633bd9a1d85a865

20200602  代码提交

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

@@ -102,9 +102,12 @@
     */

    @ApiOperation(value = "获取币币交易历史订单信息", notes = "获取币币交易历史订单信息")

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

    @ApiImplicitParams({

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

    })

    @GetMapping(value = "/findAllWalletCoinOrder")

    public Result  findAllWalletCoinOrder() {

        return orderCoinService.findAllWalletCoinOrder();

    public Result  findAllWalletCoinOrder(String symbol) {

        return orderCoinService.findAllWalletCoinOrder(symbol);

    }

    

    /**


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

@@ -11,6 +11,8 @@
    

    List<OrderCoinsDealEntity> selectAllWalletCoinOrder(@Param("memberId")Long memberId);

    

    List<OrderCoinsDealEntity> selectAllWalletCoinOrderBySymbol(@Param("memberId")Long memberId,@Param("symbol")String symbol);

	
    OrderCoinsDealEntity selectWalletCoinOrder(@Param("memberId")Long memberId,@Param("orderId")Long orderId);

    

}


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

@@ -63,6 +63,12 @@
    @ApiModelProperty(value = "成交金额")

    private BigDecimal dealAmount;

    /**

     * 状态  2：撤单3：已成交

     */

    @ApiModelProperty(value = "状态  2：撤单3：已成交")

    private Integer orderStatus;

	
    /**

     * 手续费

     */

    @ApiModelProperty(value = "手续费")


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

@@ -19,7 +19,7 @@


    public Result cancelEntrustWalletCoinOrder(String orderId);



    public Result findAllWalletCoinOrder();

    public Result findAllWalletCoinOrder(String symbol);



    public Result findWalletCoinOrder(Long orderId);




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

@@ -391,14 +391,14 @@
    }



    @Override

    public Result findAllWalletCoinOrder() {

    public Result findAllWalletCoinOrder(String symbol) {

        //获取用户ID

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

        

        OrderWalletCoinDealListVo orderWalletCoinDealListVo = new OrderWalletCoinDealListVo();

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

        

        List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrder(memberId);

        List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrderBySymbol(memberId,symbol);

        if(CollUtil.isNotEmpty(selectAllWalletCoinOrder)) {

            for(OrderCoinsDealEntity orderCoinsDealEntity: selectAllWalletCoinOrder) {

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


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

@@ -11,6 +11,18 @@
         </where>

         order by create_time desc

    </select>

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

         select * from coins_order_deal 
         <where>

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

                  and member_id = #{memberId}

             </if>

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

                  and symbol = #{symbol}

             </if>

         </where>

         order by create_time desc

    </select>

    

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

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