gp-server.git - Gitblit

			@@ -223,6 +223,87 @@

			return ret

			# sinfo
			def buy_new(self, code, order_info_list):
			"""
			批量下单
			@param code:
			@param order_info_list:[(量, 价, order_ref, sinfo)]
			@return:
			"""
			if not ENABLE_ORDER:
			return

			async_log_util.info(logger_trade, f"{code}华鑫本地真实下单开始")
			async_log_util.info(logger_local_huaxin_trade_debug,
			f"进入买入方法：code-{code} order_info_list-{order_info_list}")

			for order_info in order_info_list:
			count = order_info[0]
			price = order_info[1]
			order_ref = order_info[2]
			sinfo = order_info[3]
			if sinfo in self.__buy_sinfo_set:
			raise Exception(f'下单请求已经提交：{sinfo}')
			self.__buy_sinfo_set.add(sinfo)
			self.req_id += 1
			# 请求报单
			req_field = traderapi.CTORATstpInputOrderField()
			# TORA_TSTP_EXD_COMM(0): 通用(内部使用)
			# TORA_TSTP_EXD_SSE(1): 上海交易所
			# TORA_TSTP_EXD_SZSE(2): 深圳交易所
			# TORA_TSTP_EXD_HK(3): 香港交易所
			# TORA_TSTP_EXD_BSE(4): 北京证券交易所
			if tool.is_sz_code(code):
			req_field.ExchangeID = traderapi.TORA_TSTP_EXD_SZSE
			req_field.ShareholderID = SZSE_ShareHolderID
			elif tool.is_sh_code(code):
			req_field.ExchangeID = traderapi.TORA_TSTP_EXD_SSE
			req_field.ShareholderID = SSE_ShareHolderID

			# 证券代码
			req_field.SecurityID = code
			req_field.Direction = traderapi.TORA_TSTP_D_Buy
			req_field.VolumeTotalOriginal = count
			req_field.SInfo = sinfo
			req_field.OrderRef = order_ref

			'''
			上交所支持限价指令和最优五档剩撤、最优五档剩转限两种市价指令，对于科创板额外支持本方最优和对手方最优两种市价指令和盘后固定价格申报指令
			深交所支持限价指令和立即成交剩余撤销、全额成交或撤销、本方最优、对手方最优和最优五档剩撤五种市价指令
			限价指令和上交所科创板盘后固定价格申报指令需填写报单价格，其它市价指令无需填写报单价格
			以下以上交所限价指令为例，其它指令参考开发指南相关说明填写OrderPriceType、TimeCondition和VolumeCondition三个字段:
			'''
			req_field.LimitPrice = price
			req_field.OrderPriceType = traderapi.TORA_TSTP_OPT_LimitPrice
			req_field.TimeCondition = traderapi.TORA_TSTP_TC_GFD
			req_field.VolumeCondition = traderapi.TORA_TSTP_VC_AV

			'''
			OrderRef为报单引用，类型为整型，该字段报单时为选填
			若不填写，则系统会为每笔报单自动分配一个报单引用
			若填写，则需保证同一个TCP会话下报单引用严格单调递增，不要求连续递增，至少需从1开始编号
			'''
			# req_field.OrderRef = 1

			'''
			InvestorID为选填，若填写则需保证填写正确
			Operway为委托方式，根据券商要求填写，无特殊说明置空即可
			终端自定义字段，终端可根据需要填写如下字段的值，该字段值不会被柜台系统修改，在报单回报和查询报单时返回给终端
			'''
			# req_field.SInfo = 'sinfo'
			# req_field.IInfo = 123

			'''
			其它字段置空
			'''

			ret = api.ReqOrderInsert(req_field, self.req_id)
			if ret != 0:
			raise Exception('ReqOrderInsert fail, ret[%d]' % ret)

			async_log_util.info(logger_trade, f"{code}华鑫本地真实下单结束")

			# 撤买
			def cancel_buy(self, code, sinfo, order_sys_id=None, order_ref=None, order_action_ref=None, delay_s=0.0):
			if delay_s > 0:
			@@ -599,7 +680,7 @@

			else:
			logger_trade.info('Login fail!!! [%d] [%d] [%s]'
			% (nRequestID, pRspInfoField.ErrorID, pRspInfoField.ErrorMsg))
			% (nRequestID, pRspInfoField.ErrorID, pRspInfoField.ErrorMsg))

			def OnRspUserPasswordUpdate(self, pUserPasswordUpdateField: "CTORATstpUserPasswordUpdateField",
			pRspInfoField: "CTORATstpRspInfoField", nRequestID: "int") -> "void":
			@@ -914,29 +995,45 @@
			# 1-买 2-卖
			direction = data["direction"]
			code = data["code"]

			sinfo = data["sinfo"]
			# 老版本下单
			volume = data["volume"]
			price = data["price"]
			sinfo = data["sinfo"]
			order_ref = data.get("order_ref")
			shadow_price = data.get("shadow_price")
			shadow_volume = data.get("shadow_volume")
			blocking = data.get("blocking")
			cancel_shadow = data.get("cancel_shadow")
			# 新版下单
			order_info_list = data.get("order_info_list")

			blocking = data.get("blocking")

			if cancel_shadow is None:
			cancel_shadow = True
			if shadow_volume is None:
			shadow_volume = constant.SHADOW_ORDER_VOLUME

			if direction == 1:
			async_log_util.info(logger_trade, f"{code}华鑫本地开始下单")
			# 买
			try:
			if blocking:
			req_rid_dict[sinfo] = (client_id, request_id, sk, order_ref)
			if not order_info_list:
			req_rid_dict[sinfo] = (client_id, request_id, sk, order_ref)
			# threading.Thread(target=lambda: self.__tradeSimpleApi.buy(code, volume, price, sinfo, order_ref),
			# daemon=True).start()
			self.trade_thread_pool.submit(self.__tradeSimpleApi.buy, code, volume, price, sinfo, order_ref,
			shadow_price, cancel_shadow, shadow_volume)
			if not order_info_list:
			self.trade_thread_pool.submit(self.__tradeSimpleApi.buy, code, volume, price, sinfo, order_ref,
			shadow_price, cancel_shadow, shadow_volume)
			else:
			if order_info_list:
			for i in range(len(order_info_list)):
			order_info = order_info_list[i]
			order_info_list[i] = (order_info[0], order_info[1], order_info[2], f"{sinfo}_{i}")
			if blocking:
			for x in order_info_list:
			req_rid_dict[x[3]] = (client_id, request_id, sk, x[2])
			self.trade_thread_pool.submit(self.__tradeSimpleApi.buy_new, code, order_info_list)
			async_log_util.info(logger_trade, f"{code}华鑫本地下单线程结束")
			except Exception as e:
			send_response(json.dumps({"code": 1, "msg": str(e)}), TYPE_ORDER, client_id,
			@@ -1121,6 +1218,7 @@
			key = data["sinfo"]
			try:
			if req_rid_dict and key in req_rid_dict:
			# TODO 处理批量下单
			temp_params = req_rid_dict.pop(key)
			client_id, request_id = temp_params[0], temp_params[1]
			# 本地订单号-系统订单号映射