finish entrust order interface

Helius

2020-05-29 8e64d903658a8df9eebc873c1c72c68f9b9bda32

finish entrust order interface

 src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java

@@ -48,7 +48,7 @@
    @ApiOperation(value = "获取当前委托单列表", notes = "获取当前委托单列表")
    @GetMapping(value = "/findCurrentEntrustOrderList")
    public Result findCurrentEntrustOrderList() {
        return null;
        return contractEntrustOrderService.findEntrustOrderList();
    }



 src/main/java/com/xcong/excoin/modules/contract/dao/ContractEntrustOrderDao.java

@@ -4,10 +4,14 @@
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @author helius
 */
public interface ContractEntrustOrderDao extends BaseMapper<ContractEntrustOrderEntity> {

    public ContractEntrustOrderEntity selectEntrustOrderByIdAndMemberId(@Param("id") Long id, @Param("memberId") Long memberId);

    public List<ContractEntrustOrderEntity> selectEntrustOrderListByMemberId(@Param("memberId") Long memberId);
}

 src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java

@@ -3,9 +3,12 @@
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;

import java.util.List;

/**
 * @author wzy
@@ -21,4 +24,10 @@
    @Mapping(source = "createTime", target = "entrustTime")
    public abstract ContractOrderEntity entrustOrderToOrder(ContractEntrustOrderEntity orderEntity);

    @Mapping(source = "createTime", target = "entrustTime")
    @Mapping(source = "entrustType", target = "type")
    public abstract ContractEntrustVo entityToContractEntrustVo(ContractEntrustOrderEntity orderEntity);

    public abstract List<ContractEntrustVo> entityListToVoList(List<ContractEntrustOrderEntity> list);

}

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/ContractEntrustVo.java

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @author wzy
 * @date 2020-05-29
 **/
@Data
@ApiModel(value = "ContractEntrustVo", description = "合约委托")
public class ContractEntrustVo {

    @ApiModelProperty(value = "委托单ID")
    private Long id;

    @ApiModelProperty(value = "委托价")
    private BigDecimal entrustPrice;

    @ApiModelProperty(value = "委托数量")
    private int symbolsCnt;

    @ApiModelProperty(value = "保证金")
    private BigDecimal bondAmount;

    @ApiModelProperty(value = "委托时间")
    private Date entrustTime;

    @ApiModelProperty(value = "委托类型 1-开多 2-开空")
    private int type;
}

 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java

@@ -11,6 +11,7 @@
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.mapper.ContractEntrustOrderEntityMapper;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
@@ -24,6 +25,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;

/**
 * @author wzy
@@ -120,7 +122,10 @@

    @Override
    public Result findEntrustOrderList() {
        return null;
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
        List<ContractEntrustVo> resultList = ContractEntrustOrderEntityMapper.INSTANCE.entityListToVoList(list);
        return Result.ok(resultList);
    }

    @Override
@@ -137,8 +142,6 @@
        MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());

        BigDecimal total = entrustOrderEntity.getEntrustAmount().add(entrustOrderEntity.getBondAmount());
        log.info("{}", total);
        log.info("{}", walletContractEntity.getAvailableBalance());
        walletContractEntity.setAvailableBalance(walletContractEntity.getAvailableBalance().add(total));
        walletContractEntity.setFrozenBalance(walletContractEntity.getFrozenBalance().subtract(total));
        memberWalletContractDao.updateById(walletContractEntity);

 src/main/resources/logback-spring.xml

@@ -3,7 +3,6 @@
    <contextName>logback</contextName>
    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="logs" />
    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />

    <!-- 彩色日志 -->
    <!-- 彩色日志依赖的渲染类 -->

 src/main/resources/mapper/contract/ContractEntrustOrderDao.xml

@@ -7,4 +7,8 @@
        where id=#{id} and member_id=#{memberId}
    </select>

    <select id="selectEntrustOrderListByMemberId" resultType="com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity">
        select * from contract_entrust_order
        where member_id=#{memberId}
    </select>
</mapper>