Jelajahi Sumber

fix: 修改议价摘牌参数

huangbin 4 tahun lalu
induk
melakukan
df11c9b59b

+ 1 - 1
src/services/proto/warehousetrade/index.ts

@@ -32,7 +32,7 @@ export const HdWRDealOrder = (param: HdWRDealOrderReq): Promise<any> => {
  * @constructor
  */
 export const wrBargainApply = (param: WrBargainApplyReq): Promise<any> => {
-    return protoMiddleware<WrBargainApplyReq>(param, 'HdWRDealOrderReq', 'HdWRDealOrderRsp', HeadEnum.tradeMode17)
+    return protoMiddleware<WrBargainApplyReq>(param, 'WrBargainApplyReq', 'WrBargainApplyRsp', HeadEnum.tradeMode17)
 }
 
 /**

+ 3 - 4
src/services/proto/warehousetrade/interface.ts

@@ -77,12 +77,11 @@ export interface HdWRDealOrderReq {
 }
 
 export interface WrBargainApplyReq {
-    // WRTradeOrderID: number; // 关联委托单ID
-    RelatedWRTradeOrderID: number; // 关联委托单ID
+    WRTradeOrderID: number; // 关联委托单ID
     ApplyQty: number; // 摘牌数量
-    UserID: number; //摘牌人用户ID
+    UserID: string; //摘牌人用户ID
     AccountID: string; //摘牌资金账号
-    BuyOrSell: number; //摘牌方向
+    BuyOrSell: string; //摘牌方向
     ApplyPrice: string; //申请价格
     ApplyRemark: string; //申请备注
 }

+ 4 - 9
src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_blocs/components/delisting/index.vue

@@ -282,19 +282,14 @@ export default defineComponent({
                 const num = getNum();
                 if (isBargin()) {
                     // 议价摘牌
-                    const param = {
-                        RelatedWRTradeOrderID: props.selectedRow.wrtradeorderid,
+                    const param: WrBargainApplyReq = {
+                        WRTradeOrderID: Long.fromString(props.selectedRow.wrtradeorderid),
                         ApplyQty: num,
-                        UserID: getUserId(),
+                        UserID: getUserId().toString(),
                         AccountID: getSelectedAccountId().toString(),
-                        BuyOrSell: isBuy() ? BuyOrSell.sell : BuyOrSell.buy,
+                        BuyOrSell: (isBuy() ? BuyOrSell.sell : BuyOrSell.buy).toString(),
                         ApplyPrice: price.toString(),
                         ApplyRemark: '',
-                        OrderSrc: 0, // uint32 委托来源
-                        ClientSerialNo: uuidv4(), // string 客户端流水号
-                        ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
-                        ClientType: 4, // uint32 终端类型
-                        OperatorID: getUserId(), // uint64 操作员账号ID
                     };
                     requestResultLoadingAndInfo(wrBargainApply, param, loading, ['议价摘牌成功', '议价摘牌失败:']).then(() => {
                         cancel(true);

+ 4 - 9
src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_blocs/components/delisting/index.vue

@@ -283,19 +283,14 @@ export default defineComponent({
                 const num = getNum();
                 if (isBargin()) {
                     // 议价摘牌
-                    const param = {
-                        RelatedWRTradeOrderID: props.selectedRow.wrtradeorderid,
+                    const param: WrBargainApplyReq = {
+                        WRTradeOrderID: Long.fromString(props.selectedRow.wrtradeorderid),
                         ApplyQty: num,
-                        UserID: getUserId(),
+                        UserID: getUserId().toString(),
                         AccountID: getSelectedAccountId().toString(),
-                        BuyOrSell: isBuy() ? BuyOrSell.sell : BuyOrSell.buy,
+                        BuyOrSell: (isBuy() ? BuyOrSell.sell : BuyOrSell.buy).toString(),
                         ApplyPrice: price.toString(),
                         ApplyRemark: '',
-                        OrderSrc: 0, // uint32 委托来源
-                        ClientSerialNo: uuidv4(), // string 客户端流水号
-                        ClientOrderTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), // string 客户端委托时间
-                        ClientType: 4, // uint32 终端类型
-                        OperatorID: getUserId(), // uint64 操作员账号ID
                     };
                     requestResultLoadingAndInfo(wrBargainApply, param, loading, ['议价摘牌成功', '议价摘牌失败:']).then(() => {
                         cancel(true);

+ 2 - 1
vue.config.js

@@ -153,10 +153,11 @@ module.exports = {
 	// webpack-dev-server 相关配置
 	devServer: {
 		/* 自动打开浏览器 */
-		open: false,
+		open: true,
 		// host: "192.168.0.137",
 		host: '0.0.0.0', //局域网和本地访问
 		//host: "192.168.1.137",
+		hot: true,
 		port: 8888,
 		https: false,
 		hotOnly: false,