zainali5120
2020-10-13 c41c4bf20db7e287cbc3e7dcfa3a332499e5dbf4
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -347,6 +347,38 @@
        if(!MemberEntity.CERTIFY_STATUS_Y.equals(memberEntity.getCertifyStatus())){
            return Result.fail(MessageSourceUtils.getString("member_controller_0001"));
        }
        // 需要先
        String phone = memberEntity.getPhone();
//        if(!"13632989240".equals(phone) && !"15158130575".equals(phone)){
//            if(OrderCoinsEntity.ORDERTYPE_BUY.equals(type)){
//                // 不能超过800个
//
//                if(amount!=null && amount.compareTo(new BigDecimal("800"))>0){
//                    return Result.fail("买入额度受限");
//                }
//                BigDecimal bigDecimal = orderCoinDealDao.sumTodayBuyAmount(memberId, symbol);
//                if(bigDecimal==null){
//                    bigDecimal= BigDecimal.ZERO;
//                }
//                amount= amount==null?BigDecimal.ZERO:amount;
//                bigDecimal = bigDecimal.add(amount);
//                if(bigDecimal!=null && bigDecimal.compareTo(new BigDecimal("800"))>0){
//                    return Result.fail("买入额度受限");
//                }
//                // 挂单不能超过800
//                BigDecimal bigDecimal1 = orderCoinDealDao.sumTodayEntrustCntBuyAmount(memberId, symbol);
//                if(bigDecimal1==null){
//                    bigDecimal1=BigDecimal.ZERO;
//                }
//                bigDecimal1 = bigDecimal1.add(amount);
//                if(bigDecimal1!=null && bigDecimal1.compareTo(new BigDecimal("800"))>0){
//                    return Result.fail("买入额度受限");
//                }
//            }else{
//                return Result.fail("卖出受限");
//            }
//        }
        BigDecimal nowPriceinBigDecimal = price;
        //查询当前价
        //BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol + "/USDT")));
@@ -520,7 +552,7 @@
            if (SymbolsConstats.EXCHANGE_SYMBOLS.contains(orderCoinsEntity.getSymbol())) {
                orderSubmitProducer.sendCancelMsg(orderId);
               // return this.cancelEntrustWalletCoinOrderForMatch(orderId);
                return Result.ok("order_service_0013");
                return Result.ok(MessageSourceUtils.getString("order_service_0013"));
            }
            if (orderCoinsEntity.getOrderStatus() == OrderCoinsEntity.ORDERSTATUS_CANCEL || orderCoinsEntity.getOrderStatus()==OrderCoinsEntity.ORDERSTATUS_DONE) {
                return Result.fail(MessageSourceUtils.getString("order_service_0012"));
@@ -854,7 +886,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void dealEntrustCoinOrder() {
        List<String> ignoreTypes = new ArrayList<>();
        ignoreTypes.add(SymbolsConstats.ROC);
        ignoreTypes.add(SymbolsConstats.RFNC);
        List<OrderCoinsEntity> list = orderCoinsDao.selectAllEntrustingCoinOrderList(ignoreTypes);
        if (CollUtil.isNotEmpty(list)) {
            for (OrderCoinsEntity orderCoinsEntity : list) {