Helius
2021-04-02 a7bb19097114e06e43de10f41ad546bce114f552
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -195,23 +195,24 @@
                        memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
                        insertReturnProfitDetail(traderInfoEntity.getMemberId(), memberEntity.getId(), returnMoney, holdOrderEntity.getOrderNo());
                        //增加返佣提醒
                        String orderNo = holdOrderEntity.getOrderNo();
                        LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
                                NoticeConstant.RETURN_MONEY_TITLE,
                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
                                        orderNo,
                                      holdOrderEntity.getSymbol(),
                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
                        //带单返利的记录要在资产页面的其他记录
                        LogRecordUtils.insertMemberAccountMoneyChange(
                              traderInfoEntity.getMemberId(),
                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT_MAMC,
                                        orderNo,
                                      holdOrderEntity.getSymbol()),
                              returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
                              MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
                              MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
                              MemberAccountMoneyChange.TYPE_WALLET_AGENT);
//                        String orderNo = holdOrderEntity.getOrderNo();
//                        LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
//                                NoticeConstant.RETURN_MONEY_TITLE,
//                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
//                                        orderNo,
//                                      holdOrderEntity.getSymbol(),
//                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
//                        //带单返利的记录要在资产页面的其他记录
//                        LogRecordUtils.insertMemberAccountMoneyChange(
//                              traderInfoEntity.getMemberId(),
//                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT_MAMC,
//                                        orderNo,
//                                      holdOrderEntity.getSymbol(),
//                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()),
//                              returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
//                              MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
//                              MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
//                              MemberAccountMoneyChange.TYPE_WALLET_AGENT);
                    }
                }
            }
@@ -535,7 +536,7 @@
                    continue;
                }
//                holdOrderEntity.setForceClosingPrice(getForceSetPrice(wholePriceData, holdOrderEntity, holdOrderDataModel.getSymbol()));
                holdOrderEntity.setStopLossPrice(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrderEntity));
                contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
                ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);