1

zj

2024-09-04 0166a20c1dd0db4b9df3659c5c4b8624a154dcfd

1

 src/main/java/project/contract/internal/AdminContractOrderServiceImpl.java

@@ -24,7 +24,7 @@
                + "orders.DEPOSIT deposit,orders.DEPOSIT_OPEN deposit_open,orders.CLOSE_TIME closeTime,"
                + "orders.VOLUME_OPEN volume_open,orders.VOLUME volume,orders.LEVER_RATE as lever_rate,item.NAME itemname,");
        queryString.append(" wallet.MONEY money,  ");
        queryString.append(" party.USERNAME username,party.USERCODE usercode,party.ROLENAME rolename,party.REMARKS remarks  ");
        queryString.append(" party.USERNAME username,party.USERCODE usercode,party.REMARKS remarks,party.ROLENAME rolename  ");

        queryString.append(
                " FROM T_CONTRACT_ORDER orders LEFT JOIN PAT_PARTY party ON orders.PARTY_ID = party.UUID LEFT JOIN T_WALLET wallet ON wallet.PARTY_ID = party.UUID  LEFT JOIN T_ITEM item ON orders.SYMBOL=item.SYMBOL WHERE 1 = 1 ");

 src/main/java/project/futures/internal/AdminFuturesOrderServiceImpl.java

@@ -21,9 +21,9 @@

    public Page pagedQuery(int pageNo, int pageSize, String status, String rolename, String loginPartyId,
            String username,String orderNo,String symbol,String direction,Double volume) {
        StringBuffer queryString = new StringBuffer("SELECT party.USERCODE usercode,party.ROLENAME rolename,party.REMARKS remarks,orders.UUID id,orders.SYMBOL symbol,"
        StringBuffer queryString = new StringBuffer("SELECT party.USERCODE usercode,party.REMARKS remarks,party.ROLENAME rolename,orders.UUID id,orders.SYMBOL symbol,"
                + "orders.ORDER_NO order_no,orders.TRADE_AVG_PRICE trade_avg_price,orders.DIRECTION direction,orders.PROFIT_LOSS profit_loss,"
                + "orders.UNIT_AMOUNT unit_amount,orders.STATE state,FORMAT(orders.FEE,1) fee," + "orders.PROFIT profit,"
                + "orders.UNIT_AMOUNT unit_amount,orders.STATE state,orders.REMARK remark,FORMAT(orders.FEE,1) fee," + "orders.PROFIT profit,"
                + "FORMAT(orders.VOLUME,1) volume,item.NAME itemname,orders.TIMENUM timenum,orders.TIMEUNIT timeunit,"
                + "orders.CLOSE_AVG_PRICE close_avg_price,DATE_FORMAT(orders.CREATE_TIME,'%Y-%m-%d %H:%i:%s') create_time,DATE_FORMAT(orders.SETTLEMENT_TIME,'%Y-%m-%d %H:%i:%s')  settlement_time,");
//        queryString.append(" wallet.MONEY money,  ");