1

zyy

yesterday a8e2dbcd82859a3f972192c60b95cba4defe1738

1

 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java

@@ -240,14 +240,14 @@
                    throw new YamiShopBindException("无网络");
                }
            }
            List<Map<String, Object>> list = this.contractOrderService.findSubmittedRedis(partyId, openAction.getSymbol());
            /*List<Map<String, Object>> list = this.contractOrderService.findSubmittedRedis(partyId, openAction.getSymbol());
            if (ObjectUtils.isNotEmpty(list)) {
                for (Map<String, Object> map :list) {
                    if(!openAction.getDirection().equals(map.get("direction"))) {
                        throw new YamiShopBindException("同一币种不允许多空双开");
                    }
                }
            }
            }*/

            ContractApplyOrder order = new ContractApplyOrder();
            order.setPartyId(partyId);

 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemUserOptionalController.java

@@ -40,9 +40,14 @@
    @ApiOperation("返回用户自选币种的列表")
    @GetMapping("/api/itemUserOptional!list.action")
    public Result<List<ItemUserOptionalDTO>> list(@RequestParam(required = false) String symbol) {
        String partyId = SecurityUtils.getCurrentUserId();
        List<ItemUserOptionalDTO> models = itemUserOptionalService.getItemUserOptionals(symbol, partyId);
        return Result.ok(models);
        try {
            String partyId = SecurityUtils.getCurrentUserId();
            List<ItemUserOptionalDTO> models = itemUserOptionalService.getItemUserOptionals(symbol, partyId);
            return Result.ok(models);
        }catch (Exception e){
            log.error(e.getMessage());
            return Result.ok(null);
        }
    }