From 86a85ccd8200da512ee36a7607a6dccd7fc008cd Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 29 Oct 2025 18:12:19 +0800
Subject: [PATCH] 大宗持仓
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java | 52 ++++++++--
trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java | 2
trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java | 9 +
trading-order-bean/src/main/java/com/yami/trading/bean/dz/ExchangeApplyOrderDz.java | 14 ++
trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml | 7 +
trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java | 2
trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java | 54 ++++++++--
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 153 +++++++++++++++++++++++++++--
8 files changed, 249 insertions(+), 44 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java
index c2bdbd4..5d97bf7 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java
@@ -1,5 +1,6 @@
package com.yami.trading.api.controller.dz;
+import com.yami.trading.bean.dz.ExchangeApplyOrderDz;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
@@ -76,23 +77,54 @@
- /**
- * 大宗交易订单列表
- * @param pageNum
- * @param pageSize
- * @param state
- * @return
- */
- @ApiOperation("大宗交易订单列表")
+
+ @ApiOperation("大宗交易持仓订单列表")
@PostMapping({"getDzOrderList.do"})
@ResponseBody
public Result getDzOrderList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
- @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
- @RequestParam(value = "state", required = false) String state) {
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
String partyId = SecurityUtils.getCurrentUserId();
if (partyId == null || partyId.isEmpty()) {
throw new YamiShopBindException("请先登录");
}
- return stockDzService.getDzOrderList(pageNum, pageSize, state, partyId, Constants.indices);
+ return stockDzService.getDzOrderList(pageNum, pageSize, ExchangeApplyOrderDz.STATE_POSITION, partyId, Constants.indices);
}
+
+ @ApiOperation("大宗交易历史订单列表")
+ @PostMapping({"getDzHistoryList.do"})
+ @ResponseBody
+ public Result getDzHistoryList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
+ String partyId = SecurityUtils.getCurrentUserId();
+ if (partyId == null || partyId.isEmpty()) {
+ throw new YamiShopBindException("请先登录");
+ }
+ return stockDzService.getDzOrderList(pageNum, pageSize, null, partyId, Constants.indices);
+ }
+
+ @ApiOperation("大宗平仓")
+ @GetMapping({"closeStockDz.do"})
+ @ResponseBody
+ public Result closeStockDz(@RequestParam("id") String id,
+ @RequestParam(value = "num", required = false) Double num) {
+ lock.lock();
+ try {
+ if (orderCreated.get()) {
+ throw new YamiShopBindException("当前交易人数过多，请稍后重试");
+ }
+ orderCreated.set(true);
+ String partyId = SecurityUtils.getCurrentUserId();
+ if (partyId == null || partyId.isEmpty()) {
+ throw new YamiShopBindException("请先登录");
+ }
+ return stockDzService.closeDz(id, num, partyId);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ } finally{
+ lock.unlock();
+ orderCreated.set(false);
+ }
+ throw new YamiShopBindException("订单异常，请稍后重试");
+ }
+
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
index b5de259..78f0664 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
@@ -1,5 +1,6 @@
package com.yami.trading.api.controller.dz;
+import com.yami.trading.bean.dz.ExchangeApplyOrderDz;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
@@ -75,15 +76,7 @@
-
- /**
- * 大宗交易订单列表
- * @param pageNum
- * @param pageSize
- * @param state
- * @return
- */
- @ApiOperation("大宗交易订单列表")
+ @ApiOperation("大宗交易持仓订单列表")
@PostMapping({"getDzOrderList.do"})
@ResponseBody
public Result getDzOrderList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@@ -93,6 +86,45 @@
if (partyId == null || partyId.isEmpty()) {
throw new YamiShopBindException("请先登录");
}
- return stockDzService.getDzOrderList(pageNum, pageSize, state, partyId, Constants.US_STOCKS);
+ return stockDzService.getDzOrderList(pageNum, pageSize, ExchangeApplyOrderDz.STATE_POSITION, partyId, Constants.US_STOCKS);
}
+
+ @ApiOperation("大宗交易历史订单列表")
+ @PostMapping({"getDzHistoryList.do"})
+ @ResponseBody
+ public Result getDzHistoryList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
+ String partyId = SecurityUtils.getCurrentUserId();
+ if (partyId == null || partyId.isEmpty()) {
+ throw new YamiShopBindException("请先登录");
+ }
+ return stockDzService.getDzOrderList(pageNum, pageSize, null, partyId, Constants.US_STOCKS);
+ }
+
+
+ @ApiOperation("大宗平仓")
+ @GetMapping({"closeStockDz.do"})
+ @ResponseBody
+ public Result closeStockDz(@RequestParam("id") String id,
+ @RequestParam(value = "num", required = false) Double num) {
+ lock.lock();
+ try {
+ if (orderCreated.get()) {
+ throw new YamiShopBindException("当前交易人数过多，请稍后重试");
+ }
+ orderCreated.set(true);
+ String partyId = SecurityUtils.getCurrentUserId();
+ if (partyId == null || partyId.isEmpty()) {
+ throw new YamiShopBindException("请先登录");
+ }
+ return stockDzService.closeDz(id, num, partyId);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ } finally{
+ lock.unlock();
+ orderCreated.set(false);
+ }
+ throw new YamiShopBindException("订单异常，请稍后重试");
+ }
+
}
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/ExchangeApplyOrderDz.java b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/ExchangeApplyOrderDz.java
index 6d617c5..d92ccaa 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/ExchangeApplyOrderDz.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/ExchangeApplyOrderDz.java
@@ -13,7 +13,9 @@
public class ExchangeApplyOrderDz extends UUIDEntity {
private static final long serialVersionUID = -7263336511778693149L;
public final static String STATE_SUBMITTED = "submitted";
- public final static String STATE_SUCCEED = "succeed";
+ public final static String STATE_POSITION = "position";
+ public final static String STATE_CLOSED = "closed";
+
public final static String STATE_FAILED = "failed";
public final static String OFFSET_OPEN = "open";
public final static String OFFSET_CLOSE = "close";
@@ -42,13 +44,19 @@
private double fee;
@ApiModelProperty("交易价格")
- private Double price;
+ private double price;
- @ApiModelProperty("状态.submitted 已提交，succeed 成功， failed 失败")
+ @ApiModelProperty("状态.submitted 已提交，position 持仓，closed 结算，failed 失败")
private String state = "submitted";
private Date createTime;
+ @ApiModelProperty("卖出价格")
+ private double closePrice;
+
+ @ApiModelProperty("卖出时间")
+ private Date closeTime;
+
/**
* 创建日期
*/
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
index c8196ac..7104e4f 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
@@ -15,5 +15,7 @@
@ApiModelProperty("股票名称")
private String stockName;
+ @ApiModelProperty("浮动盈亏")
+ private double profitLoss;
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
index d22415d..5f08842 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yami.trading.bean.dz.StockDz;
+import com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto;
import org.apache.ibatis.annotations.Param;
@@ -19,10 +20,10 @@
@Param("keyWords") String keyWords,
@Param("stockType") String stockType);
- Page getDzOrderList(Page page,
- @Param("state") String state,
- @Param("userId") String userId,
- @Param("stockType") String stockType);
+ Page<ExchangeApplyOrderDzDto> getDzOrderList(Page page,
+ @Param("state") String state,
+ @Param("userId") String userId,
+ @Param("stockType") String stockType);
Page getDzCheckList(Page page,
@Param("state") String state,
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
index 23a2fdb..9e329fa 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
@@ -30,4 +30,6 @@
public void intoPosition(ExchangeApplyOrderDz orderDz, String stockType);
+ Result closeDz(String id, Double num, String partyId);
+
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
index cc1b3b3..3fc3892 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
@@ -11,6 +11,7 @@
import com.yami.trading.bean.data.domain.Realtime;
import com.yami.trading.bean.dz.ExchangeApplyOrderDz;
import com.yami.trading.bean.dz.StockDz;
+import com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto;
import com.yami.trading.bean.exchange.ExchangeApplyOrder;
import com.yami.trading.bean.item.domain.Item;
import com.yami.trading.bean.model.MoneyLog;
@@ -41,9 +42,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Objects;
+import java.text.DecimalFormat;
+import java.util.*;
@Service
@Slf4j
@@ -177,8 +177,27 @@
@Override
public Result getDzOrderList(int pageNum, int pageSize, String state, String userId, String stockType) {
try {
- Page page = new Page(pageNum, pageSize);
- stockDzMapper.getDzOrderList(page ,state, userId, stockType);
+ Page<ExchangeApplyOrderDzDto> page = new Page<>(pageNum, pageSize);
+ page = stockDzMapper.getDzOrderList(page ,state, userId, stockType);
+ if (!page.getRecords().isEmpty()) {
+ List<ExchangeApplyOrderDzDto> list = page.getRecords();
+ list.forEach(dz -> {
+ double closePrice;
+ if (state != null) { //持仓
+ Realtime realtime = this.dataService.realtime(dz.getSymbol()).get(0);
+ //获取现价
+ closePrice = realtime.getClose();
+ } else { //已结算
+ closePrice = dz.getClosePrice();
+ }
+ //盈亏
+ double profitLoss = (closePrice - dz.getPrice()) * dz.getSymbolValue();
+ DecimalFormat df = new DecimalFormat("#.##");
+ String resultStr = df.format(profitLoss);
+ dz.setProfitLoss(Double.parseDouble(resultStr));
+ });
+ }
+
return Result.succeed(page);
} catch (Exception e) {
log.error(e.getMessage());
@@ -245,7 +264,7 @@
Wallet wallet = this.walletService.saveWalletByPartyId(partyId);
BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num));
//手续费比率
- Double feeRate = sysparaService.find("exchange_apply_order_dz_buy_fee").getDouble();
+ Double feeRate = sysparaService.find("exchange_apply_order_buy_fee").getDouble();
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
BigDecimal orderAmt = buyAmt.add(orderFree);
if (wallet.getMoney().compareTo(orderAmt) < 0) {
@@ -273,12 +292,12 @@
return Result.succeed("购买成功，等待审核");
}
- order.setState(ExchangeApplyOrderDz.STATE_SUCCEED);
+ order.setState(ExchangeApplyOrderDz.STATE_POSITION);
exchangeApplyOrderDzMapper.insert(order);
walletService.update(wallet.getUserId(), Arith.sub(0, orderAmt.doubleValue()));
//TODO 转持仓
- this.intoPosition(order, stockDz.getStockType());
+ //this.intoPosition(order, stockDz.getStockType());
MoneyLog log = new MoneyLog();
log.setCategory(Constants.MONEYLOG_CATEGORY_EXCHANGE);
@@ -287,7 +306,7 @@
log.setAmountBefore(amountBefore);
log.setAmount(orderAmt.negate());
log.setAmountAfter(amountBefore.subtract(orderAmt));
- log.setLog(name + type2 + "大宗交易买入" + "，订单号[" + order.getOrderNo() + "]");
+ log.setLog(name + type2 + "大宗交易买入成交" + "，订单号[" + order.getOrderNo() + "]");
log.setUserId(order.getPartyId());
log.setWalletType(Constants.WALLET);
log.setSymbol(stockDz.getStockCode());
@@ -348,12 +367,12 @@
order.setSymbolValue(orderNum);
order.setVolume(buyAmt.doubleValue());
order.setFee(orderFree.doubleValue());
- order.setState(ExchangeApplyOrderDz.STATE_SUCCEED);
+ order.setState(ExchangeApplyOrderDz.STATE_POSITION);
exchangeApplyOrderDzMapper.updateById(order);
walletService.update(wallet.getUserId(), Arith.sub(0, orderAmt.doubleValue()));
//TODO 转持仓
- this.intoPosition(order, stockDz.getStockType());
+ //this.intoPosition(order, stockDz.getStockType());
MoneyLog log = new MoneyLog();
log.setCategory(Constants.MONEYLOG_CATEGORY_EXCHANGE);
@@ -362,7 +381,7 @@
log.setAmountBefore(amountBefore);
log.setAmount(orderAmt.negate());
log.setAmountAfter(amountBefore.subtract(orderAmt));
- log.setLog(name + type2 + "大宗交易买入" + "，订单号[" + order.getOrderNo() + "]");
+ log.setLog(name + type2 + "大宗交易买入成交" + "，订单号[" + order.getOrderNo() + "]");
log.setUserId(order.getPartyId());
log.setWalletType(Constants.WALLET);
log.setSymbol(stockDz.getStockCode());
@@ -370,7 +389,7 @@
log.setCreateTime(new Date());
log.setUpdateTime(new Date());
moneyLogService.save(log);
- return Result.succeed("审核成功,订单已转客户持仓");
+ return Result.succeed("审核成功,订单已转持仓");
} catch (Exception e) {
log.error(e.getMessage());
return Result.failed("操作失败:" + e.getMessage());
@@ -405,7 +424,7 @@
log.setAmountBefore(new BigDecimal(amountBeforeExtend));
log.setAmount(BigDecimal.valueOf(realValue));
log.setAmountAfter(BigDecimal.valueOf(amountBeforeExtend + realValue));
- log.setLog(name + type2 + "现货交易买入委托单成交，订单号[" + exOrder.getOrderNo() + "]");
+ log.setLog(name + type2 + "大宗交易买入委托单成交，订单号[" + exOrder.getOrderNo() + "]");
log.setUserId(exOrder.getPartyId());
log.setSymbol(exOrder.getSymbol());
log.setWalletType(exOrder.getSymbol());
@@ -416,5 +435,111 @@
exchangeApplyOrderService.save(exOrder);
}
+ @Transactional
+ @Override
+ public Result closeDz(String id, Double num, String partyId) {
+ try {
+ ExchangeApplyOrderDz order = exchangeApplyOrderDzMapper.selectById(id);
+ if (order == null) {
+ throw new YamiShopBindException("订单不存在");
+ }
+ if (!order.getState().equals(ExchangeApplyOrderDz.STATE_POSITION)) {
+ throw new YamiShopBindException("订单不能平仓");
+ }
+ if (num == null) { //不传默认平全部
+ num = order.getSymbolValue();
+ }
+ if (num < 0 || num > order.getSymbolValue()) {
+ throw new YamiShopBindException("数量错误");
+ }
+
+ StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("uuid", order.getDzId()));
+ if (stockDz == null) {
+ throw new YamiShopBindException("大宗不存在");
+ }
+
+ BigDecimal nowPrice = stockDz.getNowPrice();
+ if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
+ throw new YamiShopBindException("股票价格0,请重试");
+ }
+
+ Date now = new Date();
+ if (stockDz.getPeriod() > 0) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(order.getCreateTime());
+ calendar.add(Calendar.DATE, stockDz.getPeriod());
+ // 锁仓时间
+ Date resultTime = calendar.getTime();
+
+ if(now.getTime() < resultTime.getTime()){
+ throw new YamiShopBindException("Lock-up period:" + stockDz.getPeriod());
+ }
+ }
+
+ Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
+ BigDecimal sellAmt = nowPrice.multiply(new BigDecimal(num));
+ //手续费比率
+ Double feeRate = sysparaService.find("exchange_apply_order_dz_sell_fee").getDouble();
+ BigDecimal orderFree = sellAmt.multiply(BigDecimal.valueOf(feeRate));
+
+ String symbol = stockDz.getStockCode();
+ Realtime realtime = this.dataService.realtime(symbol).get(0);
+ double closePrice = realtime.getClose();
+
+ //结算金额
+ double closeAmt = closePrice * num - orderFree.doubleValue();
+ if (closeAmt < 0) {
+ throw new YamiShopBindException("手续费资金不足");
+ }
+
+ //拆分订单
+ if (num < order.getSymbolValue()) {
+ ExchangeApplyOrderDz newOrder = new ExchangeApplyOrderDz();
+ newOrder.setPartyId(partyId);
+ newOrder.setSymbol(symbol);
+ newOrder.setSymbolValue(num);
+ newOrder.setDzId(stockDz.getUuid());
+ newOrder.setVolume(sellAmt.doubleValue());
+ newOrder.setPrice(nowPrice.doubleValue());
+ newOrder.setOrderNo(com.yami.trading.common.util.DateUtil.getToday("yyMMddHHmmss") + RandomUtil.getRandomNum(8));
+ newOrder.setFee(orderFree.doubleValue());
+ newOrder.setCreateTime(order.getCreateTime());
+ newOrder.setClosePrice(closePrice);
+ newOrder.setCloseTime(now);
+ newOrder.setState(ExchangeApplyOrderDz.STATE_CLOSED);
+ exchangeApplyOrderDzMapper.insert(newOrder);
+
+ order.setSymbolValue(order.getSymbolValue() - num);
+ order.setVolume(order.getSymbolValue() * order.getPrice());
+ } else {
+ order.setClosePrice(closePrice);
+ order.setCloseTime(now);
+ order.setFee(order.getFee() + orderFree.doubleValue());
+ order.setState(ExchangeApplyOrderDz.STATE_CLOSED);
+ }
+ exchangeApplyOrderDzMapper.updateById(order);
+
+ double amountBefore = wallet.getMoney().doubleValue();
+ this.walletService.update(wallet.getUserId(), closeAmt);
+ MoneyLog log = new MoneyLog();
+ log.setCategory(Constants.MONEYLOG_CATEGORY_EXCHANGE);
+ String name = Constants.MONEYLOG_MAP.get(stockDz.getStockType());
+ String type2 = Constants.MONEYLOG_MAP_TYPE.get(stockDz.getStockType());
+ log.setAmountBefore(new BigDecimal(amountBefore));
+ log.setAmount(new BigDecimal(closeAmt));
+ log.setAmountAfter(wallet.getMoney().add(BigDecimal.valueOf(closeAmt)));
+ log.setLog(name + type2 + "大宗交易卖出成交，订单号[" + order.getOrderNo() + "]");
+ log.setUserId(order.getPartyId());
+ log.setWalletType(Constants.WALLET);
+ log.setContentType(type2 + Constants.MONEYLOG_CONTENT_CLOSE);
+ log.setSymbol(order.getSymbol());
+ moneyLogService.save(log);
+ return Result.succeed("平仓成功");
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ return Result.failed("操作失败:" + e.getMessage());
+ }
+ }
+
}
diff --git a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
index 7fafa96..a8f4288 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -43,9 +43,9 @@
ORDER BY add_time DESC
</select>
- <select id="getDzOrderList" resultType="com.yami.trading.bean.dz.ExchangeApplyOrderDz" parameterType="map">
+ <select id="getDzOrderList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
SELECT
- t.*
+ t.*,s.stock_name
FROM t_exchange_apply_order_dz t
LEFT JOIN t_stock_dz s ON t.dz_id=s.uuid
WHERE 1=1
@@ -55,6 +55,9 @@
<if test="state != null and state != ''">
AND t.state = #{state}
</if>
+ <if test="state == null">
+ AND t.state != 'position'
+ </if>
<if test="userId != null and userId != '' ">
AND t.party_id = #{userId}
</if>
--
Gitblit v1.9.3