xiaoyong931011
2021-03-30 bb4e25fa2855f45021847d00edc1a908505d2cc3
Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
3 files modified
15 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SymbolDto.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -2,6 +2,8 @@
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.parameter.dto.*;
import com.xcong.excoin.modules.contract.parameter.vo.ContractMoneyInfoVo;
import com.xcong.excoin.modules.contract.parameter.vo.HoldOrderListVo;
@@ -76,6 +78,14 @@
    @ApiOperation(value = "一键平仓")
    @PostMapping(value = "/oneKeyClosing")
    public Result oneKeyClosing(@RequestBody SymbolDto symbolDto) {
        symbolDto.setType(ContractOrderEntity.CONTRACTTYPE_NORMAL);
        return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
    }
    @ApiOperation(value = "带单一键平仓")
    @PostMapping(value = "/oneKeyClosingForFollow")
    public Result oneKeyClosingForFollow(@RequestBody SymbolDto symbolDto) {
        symbolDto.setType(ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY);
        return contractHoldOrderService.cancelHoldOrderBatch(symbolDto);
    }
src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SymbolDto.java
@@ -14,4 +14,7 @@
    @ApiModelProperty(value = "币种", example = "BTC/USDT")
    private String symbol;
    @ApiModelProperty(hidden = true)
    private Integer type;
}
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -652,7 +652,7 @@
            return Result.loading("loading_type");
        }
        
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), null);
        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), symbolDto.getType());
        if (CollUtil.isEmpty(holdOrderEntities)) {
            return Result.fail("订单不存在");
        }