Browse Source

修改 WrTrade2/QueryWrOrderDetail 接口历史数据BUG

zhou.xiaoning 1 year ago
parent
commit
fa5ffeb83d
3 changed files with 77 additions and 40 deletions
  1. 14 14
      config/config.xml
  2. 61 26
      config/readme.md
  3. 2 0
      models/wrTrade2.go

+ 14 - 14
config/config.xml

@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.88"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test171"/>
+    <DbUser value="mtp2_test204"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.171"/>
+    <Address value="192.168.31.204"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -25,11 +25,11 @@
     <Pwd value=""/>
   </RedisSetting>
   <MqSetting>
-    <Url value="amqp://guest:guest@192.168.31.171:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.204:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.171"/>
+    <HostName value="192.168.31.204"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <Username value="quote_test01"/>
@@ -38,21 +38,21 @@
   <MySQLSetting>
     <Host value="192.168.30.72"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test171"/>
-    <Username value="quote_test171"/>
+    <DBName value="historyquote_test204"/>
+    <Username value="quote_test204"/>
     <Password value="123456"/>
   </MySQLSetting>
   <Tencent>
     <Enabled value="1"/>
-    <SecretId value="AKyDwiyUUckpkct4igUy8lsS7SEqR6c7yR"/>
-    <SecretKey value="SKwvG74cbV3OrAiJdjU5k4507vZwNYDbwT"/>
-    <EndPoint value="essbasic.test.ess.tencent.cn"/>
-    <AppId value="yDCN4UUckpvjuxkjUyOsCbrEv39yN90u"/>
-    <ProxyOrganizationName value="南海国际"/>
-    <ProxyOrganizationOpenId value="TJMD"/>
+    <SecretId value="AKIDPktwvneP2WqxvmWFsMclmfLLKDyrbAXp"/>
+    <SecretKey value="GNH9tX8c6Wls02vhNzUvdLuGMYfeVErM"/>
+    <EndPoint value="essbasic.tencentcloudapi.com"/>
+    <AppId value="yDCWqUUg63lbs0UENeS7LSsrPRep9bLP"/>
+    <ProxyOrganizationName value="海南丹农商业管理有限公司"/>
+    <ProxyOrganizationOpenId value="NHGJ"/>
     <ProxyOperatorOpenId value="NHGJ_LEGAL"/>
-    <SignToken value="2184A0E978CF4AD28854DAC47FF81CB8"/>
-    <SignKey value="E7C6EA231F454BF1A5CF8C223D45C422"/>
+    <SignToken value="1DB4705B05654E978D0A3108CA64BA91"/>
+    <SignKey value="4B223CB5F60146248D0A54B9974DF66A"/>
   </Tencent>
   <Asign>
     <Url value="https://oapi.asign.cn"/>

+ 61 - 26
config/readme.md

@@ -1,22 +1,24 @@
 # GO查询服务
 
 ## 腾讯电子签配置说明
-腾讯电子签注册认证-入口:https://qian.tencent.com/console/company-register
-开发文档:https://qian.tencent.com/developers/company/overview
+
+腾讯电子签注册认证-入口:<https://qian.tencent.com/console/company-register>
+开发文档:<https://qian.tencent.com/developers/company/overview>
 Enabled="1" 表示启用腾讯电子签功能,如不需要则改为"0"
-SecretId 和 SecretKey 是腾讯电子签密钥信息,使用公司账号登录(SaaS控制台) https://qian.tencent.com/console/ 获取 (微信扫码登录 测试环境:https://beta.qian.tencent.cn/console/)
+SecretId 和 SecretKey 是腾讯电子签密钥信息,使用公司账号登录(SaaS控制台) <https://qian.tencent.com/console/> 获取 (微信扫码登录 测试环境:<https://beta.qian.tencent.cn/console/>
 SecretId 和 SecretKey 实际上使用的是公司腾讯云的KEY,所以目前所有的正式环境都是一样的
 EndPoint 腾讯电子签API接入地址,测试环境填 "essbasic.test.ess.tencent.cn" ,生产环境填 "essbasic.tencentcloudapi.com"
-AppId 子客第三方应用ID,使用公司账号登录 https://qian.tencent.com/console/ 设置和获取
-创建子客通过我方接口来完成:Tencent/CreateConsoleLoginUrl (实盘环境初始化时要求使用公司法人微信扫码登录,并要求法人在控制台网站添加企业电子印章和法人章(法人章非必要)) 
+AppId 子客第三方应用ID,使用公司账号登录 <https://qian.tencent.com/console/> 设置和获取
+创建子客通过我方接口来完成:Tencent/CreateConsoleLoginUrl (实盘环境初始化时要求使用公司法人微信扫码登录,并要求法人在控制台网站添加企业电子印章和法人章(法人章非必要))
 ProxyOrganizationName 子客企业名称,生产环境应填写子客企业全名
 ProxyOrganizationOpenId 子客企业ID,与子客企业名称一一对应,由我方设置
 ProxyOperatorOpenId 子客企业管理员ID,生产环境应要求客户使用对方身份进行认证,TJMD_ADMIN TJMD_LEGAL
-SignToken 腾讯电子签密回调通知Token,用于验签,使用公司账号登录 https://qian.tencent.com/console/ 设置和获取
-SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号登录 https://qian.tencent.com/console/ 设置和获取
-指定回调地址样式:http://218.17.158.45:15160/api/Tencent/QianNotice
+SignToken 腾讯电子签密回调通知Token,用于验签,使用公司账号登录 <https://qian.tencent.com/console/> 设置和获取
+SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号登录 <https://qian.tencent.com/console/> 设置和获取
+指定回调地址样式:<http://218.17.158.45:15160/api/Tencent/QianNotice>
 
 ### 多元测试环境
+
 ```xml
 <Tencent>
   <Enabled value="1"/>
@@ -31,7 +33,9 @@ SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号
   <SignKey value="8774F484EA294C1E829EA6E2D7F99123"/>
 </Tencent>
 ```
+
 ### 麦顿实盘环境
+
 ```xml
 <Tencent>
   <Enabled value="1"/>
@@ -46,7 +50,9 @@ SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号
   <SignKey value="34FD7C4496794788B569E84729601276"/>
 </Tencent>
 ```
+
 ### 南海国际(海南丹农)测试环境
+
 ```xml
 <Tencent>
   <Enabled value="1"/>
@@ -61,7 +67,9 @@ SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号
   <SignKey value="E7C6EA231F454BF1A5CF8C223D45C422"/>
 </Tencent>
 ```
+
 ### 南海国际(海南丹农)正式环境
+
 ```xml
 <Tencent>
   <Enabled value="1"/>
@@ -76,14 +84,17 @@ SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号
   <SignKey value="4B223CB5F60146248D0A54B9974DF66A"/>
 </Tencent>
 ```
+
 ---
+
 ## 爱签配置说明
-爱签官网:https://www.asign.cn
-接入助手:https://web.asign.cn/platform/tools/helper
-对接文档:https://web.asign.cn/platform/openDoc/docDetail
-测试环境账号注册:https://preweb.asign.cn/platform/openlogin
-生产环境账号注册:https://web.asign.cn/platform
-演示地址:https://ai.acsign.cn/m/#/demo/index
+
+爱签官网:<https://www.asign.cn>
+接入助手:<https://web.asign.cn/platform/tools/helper>
+对接文档:<https://web.asign.cn/platform/openDoc/docDetail>
+测试环境账号注册:<https://preweb.asign.cn/platform/openlogin>
+生产环境账号注册:<https://web.asign.cn/platform>
+演示地址:<https://ai.acsign.cn/m/#/demo/index>
 
 爱签配置说明:
 1、在“应用管理”中“安全配置”添加IP白名单;
@@ -96,7 +107,8 @@ SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号
 注意事项:
 1、合同里的填充项一定要注意设置是“发起方填写”还是“接收方填写”;
 
-### 多元测试环境
+### 多元测试环境(爱签)
+
 ```xml
 <Asign>
   <Url value="https://prev.asign.cn"/>
@@ -108,12 +120,15 @@ SignKey 腾讯电子签密回调通知密钥,用于解密,使用公司账号
 ```
 
 ### 贵茶1测试环境
-https://preweb.asign.cn/platform
+
+<https://preweb.asign.cn/platform>
 zhou.xiaoning@muchinfo.cn
 Aa123456
 
 ### 中融测试环境
+
 爱签测试环境 zrwyt202302@163.com 密码 Zrwyt20231101
+
 ```xml
 <Asign>
   <Url value="https://prev.asign.cn"/>
@@ -125,15 +140,19 @@ Aa123456
 ```
 
 ### 中融生产环境
+
 爱签正式环境 zrwyt2023@163.com 密码 Zrwyt20231101
-```
+
+```bash
 # 公钥
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkv6yQnFDEYlnoQZpq9RNpwLOrweWB2/QYZo8YMhmR9iXBCMLc+0IuOhi9oiZR1cz09LAf2Oa+7LLpAhT9zyCMHYztN4vkJLhB6jQM1po21+8q+PKTRQMWnwO25HLQDDnfGztwAEK850ZxQZ+a5L/xQT7YdR9/d6dIfkjXHvbOknZ7XP/xhZEHE+KkC6ouh/6a0O7TDtxwBKUVDkVVgQBqQEYPXC5pul9YOkhOmKBrK9KX4c5/3JUN8Uw75002oqX5dm5x0Z21HwvI+M6tSGHw9taEcWmOGxVmHZ6robJr9VO4xkexv1rQoe+rTc+DpWJdQx1l+PfDLw5jf/PvrVg4wIDAQAB
 
 # 私钥
 MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCS/rJCcUMRiWehBmmr1E2nAs6vB5YHb9BhmjxgyGZH2JcEIwtz7Qi46GL2iJlHVzPT0sB/Y5r7ssukCFP3PIIwdjO03i+QkuEHqNAzWmjbX7yr48pNFAxafA7bkctAMOd8bO3AAQrznRnFBn5rkv/FBPth1H393p0h+SNce9s6Sdntc//GFkQcT4qQLqi6H/prQ7tMO3HAEpRUORVWBAGpARg9cLmm6X1g6SE6YoGsr0pfhzn/clQ3xTDvnTTaipfl2bnHRnbUfC8j4zq1IYfD21oRxaY4bFWYdnquhsmv1U7jGR7G/WtCh76tNz4OlYl1DHWX498MvDmN/8++tWDjAgMBAAECggEAe3gEM1r/gtNvgAnq6LHDJ+1rvgkZM9Xvqovq+0BY6TA8aPUmwZDwKqDHv1ytowbUObBkkJwRqilcc8OrA5iHoj0m4V1fhohZDB34A6qFOP8Jczg6zNNyLO7XbAbiOmDZj+HPMd+uW0IySxRRS/qFa+/rVxktWviJ8+dYlG5UjngDvfVZbUHNdJWxk+cxU5YkaBKEfpJqs2sVIfFx0aQs0A+UmgAUwszmNAmtvu7y/kT0U9f1lbrze1Ndgg6S/JLjOmORFsbAgCm7NhAWG6yAMViyZ6R9dewqUwOJ214KDAeRREPp6mzvbPLbUg1imBEP5QU3YcEeCP01f3qpxukowQKBgQDJjHVxLRC/ynR3pXF/nYGY/aaNdLAKvWwQFLg/Xs1/Jes8GJ96/9A5VLq4h5pt5EhO0zsVy9S7D0FLSseswVKnRIfjahhiYLRiN9Of4Vgm81vQDduQyweFDh9yiorTerrrKcfFGuOwRKWZOdoxgjSUkRVq1c1G3jJGDmMniibSRwKBgQC6tS6EBQvwxs9mgbVvYISsN2AuPwN9mmpa9y99l5Iv+V+TjToXUJeH+j/i8pB8VrUZRS5MGE4zFCuIru9A1qIoctuMzQ2Ho/yAsTnsZd/LTVApPxLfZWMtLpFhzpoNmVwtuSUWCxZfnDZpb8Bcn3wKjVSgZaJe1z5Sm2cKV4POhQKBgE3TGL484ozMRjC1B6B5V0OWHivc9OUQw5tqBMMjfkIsiCrKbzp1cRfSKc97PRxV273kPppp/JjGiTXjiDqi46GHCtm7a/MA2GZcnDDOONXBfqBV2YSNgTfVfjsiV/zVFTwdA/COM4Eq4K7L8f7QAjGj3BtGt184CT2X7J2l8NudAoGADk6f9+HjHlo9vl8mJhjBUekUZ7bQb6mLiNj0PK2GuEJlvorN7sdwNS1KA/wOcli6m+sfNxmNtIBRLbIqB0/rMSpMBKgZ51D7omjyRVkxIwUTpXV93ryIMwgkf9gzGeOsmpxbaSsEVeNEkCPOG8rk2HIoD/p5zMa1seLSrIo0QXkCgYEAxme+IEcMPzQ/B9ZLdz5zj1W+p7FTK157CZrDlBrg2f+okf1dhItimB4uU7VPOPtH6aI21m7k0BSnuz1fGe8nf6oceMVowV7dXgjNcrPvWpYEY1Dp/w4YGeB7RpJBExUl6oOz6QOrezSBWEfCzy8TKBFFIDnahwken6aHyUTn3Rg=
 ```
+
 实盘配置
+
 ```xml
 <Asign>
   <Url value="https://oapi.asign.cn"/>
@@ -145,7 +164,11 @@ MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCS/rJCcUMRiWehBmmr1E2nAs6vB5YH
 ```
 
 ### 贵茶2测试环境
-爱签测试环境地址:https://preweb.asign.cn/platform/openlogin    登陆帐号 : 155065880@qq.com   密码:Lv123456
+
+爱签测试环境地址:<https://preweb.asign.cn/platform/openlogin>
+登陆帐号:155065880@qq.com
+密码:Lv123456
+
 ```xml
 <Asign>
   <Url value="https://prev.asign.cn"/>
@@ -155,16 +178,23 @@ MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCS/rJCcUMRiWehBmmr1E2nAs6vB5YH
   <OpenApiUrl value="http://192.168.31.134:5015/mtp2-onlineopen"/>
 </Asign>
 ```
-### 贵茶2生产环境 
-https://web.asign.cn/platform/openlogin   帐号  :155065880@qq.com  密码:Lv123456
-```
+
+### 贵茶2生产环境(爱签)
+
+<https://web.asign.cn/platform/openlogin>
+帐号:155065880@qq.com
+密码:Lv123456
+
+```bash
 # 公钥
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwdQXM7hLZ7BPuB5jNWo/p9+t8NhWl4SZJv9yUrT1mPd6TQxGljfSHrz7FAIyhFxsOJGmFiQLOqC3KLj8+QVDjTqEbm5OnF5PY7gT2tSoqcq+Vub5YWjzgjMfWEgRjRnn+kaFQU/h/VN51UyciSBUDNrXljcPD65W3ByQBSY8AMFckmzniboWDFyv5Ck4u1DT9VBhS9Ht59AmcmB9f5PIHJs5c/pylrUM00Iu4oxc4N8nKA3+mJxk81DrLHZhq8cox/ikWhWF1RlINkrX402lBFdcMPsyAkXSMkIBzEQp9IZLyrlWzQlD0se+Qs+gHFuV/Pzqunb9M32cudJme09cLQIDAQAB
 
 # 私钥
 MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDB1BczuEtnsE+4HmM1aj+n363w2FaXhJkm/3JStPWY93pNDEaWN9IevPsUAjKEXGw4kaYWJAs6oLcouPz5BUONOoRubk6cXk9juBPa1Kipyr5W5vlhaPOCMx9YSBGNGef6RoVBT+H9U3nVTJyJIFQM2teWNw8PrlbcHJAFJjwAwVySbOeJuhYMXK/kKTi7UNP1UGFL0e3n0CZyYH1/k8gcmzlz+nKWtQzTQi7ijFzg3ycoDf6YnGTzUOssdmGrxyjH+KRaFYXVGUg2StfjTaUEV1ww+zICRdIyQgHMRCn0hkvKuVbNCUPSx75Cz6AcW5X8/Oq6dv0zfZy50mZ7T1wtAgMBAAECggEAUYfUJqY72aa5MbpegsZpdkTJVsi5S8yz20qSHSYPNMPMhwJF4sQiN1nIxzbRZwm1X+osEZ4htwyJXrDJgDntm0dlE0qE+JNXE5wHhgHz3E/y1n0boxTRcQ/t/GV8NH0ULhthzAI9DiEB2235Xljh4fJfwsjwJelwke/VyMS3cp0nqp8/pyzhLKnqr7JL9uOQqYKo+RiAgX4Y2Lrll/vSIONw9fefCK5u9kTdXt5numUc+Vdt81sX62vNk38iNqqBW+suwr8KOOSM5mlffxKbRxHkPTCJTYA+Rdlfpdms3/Co7MotfWy0XamcW7TNyt8PkDQNLySF4kgIdKaKZjU4oQKBgQDpGeHMW1EwrQVjWPXhLmxDOse/3apRqLZ85urVn4wnDStMDzaDZoUf6PEmQlLPl8lyKxuKTw8xXPp2BKTGg6eseUVjA2fidufwnJ/a4CmkvFbTNLbEiNqRA6VUht7SGSviVwT8Fg0DH2139otlQdup/ypFQFUGKNUKPwR45PpD+QKBgQDU3pC2cBHEYcEwdw7xM9cKBLrF5CdHnBR8kA8L7bk2kzm23nWHWBr6frAhZTYeoTvADaZSMt1EURKS13J1q0wDkfUBolPif3pAjTZVJV6dMDonnbbvOXU/u4czsMp077RCfbbgr15gH2He6KPK0xmI1mME/JBVm4cy9kldAjK+1QKBgEdwJDBSCCbnz8/rsqdJZ+qOuCsIDyupjgvnZS8FD5nkQlG0E9vfbosiA83a47A1b4pqxaz0n85cFXJX5/vi219TZz16DLtt/5VRGvikXH7dLara6+x9mKZ6vI+UKfOvvTBHxQJQ67n6Rr1ONNhaf6yww86ncadKmkfimkdGvaBZAoGACUeelWVzUNVWH6/BBgDViglEvyXAFJ4YQonhLgrx/RAT/wXZp8nOe0cUlJAd+N3chfXSX1j6TmUeYypjQf/ys2Ekhiq2b3RRNwkw6itT4ZRdpKZ6eBlQJDQfo8A8QzbD6/YhB9B9U8FqedY4dboYLd/ytx/vhtvd2/nintxeq/UCgYEAqe1lh9lYbxPREsHjuhHiRzxqxdGS13hW2bvoLisAhQdNx/L9HFtEO5Nx2fRdzFRgXbH/QjfOxEadMia04uY0upqfg4fPT0Za2WIvn+uJBxpRiwupbAlKmP626jdmajJ03aQe1F7P8Ny+96Wh8x18uaMJx88Kg7e7+hi95WokLB4=
 ```
+
 实盘配置
+
 ```xml
 <Asign>
   <Url value="https://oapi.asign.cn"/>
@@ -175,26 +205,31 @@ MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDB1BczuEtnsE+4HmM1aj+n363w2FaX
 </Asign>
 ```
 
-url: 'https://prev.asign.cn' # 测试环境 - https://prev.asign.cn  正式环境 - https://oapi.asign.cn
-appId: '290912417' # 测试-290912417 正式-944849860
+url: <https://prev.asign.cn>
+测试环境 - <https://prev.asign.cn>
+正式环境 - <https://oapi.asign.cn>
+appId: '290912417' (测试-290912417 正式-944849860)
 privateKey: 'MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAkMD+72J6iAF0ZNV+3t628lsRHfJ80nKZWK5/C7Pg+AZmOIzJlwHsKhRzCvxoxqYHQprhiFzW9l73v9vD9l1JYwIDAQABAkBVijccr01JYdKuY5t9iI8D2NzcnZc1pZMI3NUmzT18Uyg7b9CUvGHlLeg/gdT4QtVd7wIzHYCY4letEcEMh54BAiEAwzNWusj5XiLmty7PI0Hbakx4HtcND1+P0UHLEWqWOuECIQC91zQuL7nStgGzT3HvaeBB5Ouapa39fHRm2nCjHaxwwwIgRR2XdvmUOj23XWMomr5F14SN/7V7fVcD0D8wjNElsmECIDYavV5kb7tj7/wgqkInlKhzC8rZaUsTS0F9BBkY/eptAiAQJ8Saz8YlMIESdHMxANGSog01fECbcZqLFMuNf8SorA=='
 notifyUrl: 'http://218.17.158.45:15105/api/Asign/HandleASignCompleted' # 合同签署回调通知URL
 openApiUrl: 'http://192.168.31.202:5015/mtp2-onlineopen'
 willFaceRedirectUrl: 'http://218.17.158.45:15105/api/Account/HandleWillFace' # 人脸认证结果回调通知URL,可拼接参数
 
 ### 贵茶3实盘环境
-https://web.asign.cn/platform/openlogin
+
+<https://web.asign.cn/platform/openlogin>
 帐号:admin@gz-cyjyszh.com
 密码:ZwfZ18839460988
 
-```
+```bash
 # 公钥
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApfqNyQO7u9uE2mwVUfnAbsWyGjTpVueHxQy6hOisZtGJv9st8mQ1ZHGPVk8V5729cEQM6ciJ3mrWUOoYKglUbDGZ9zGff+qqTwKSrnxDeU4pQmfPjoPvnzizzgzUBQy31hzCo2cZqlivLzrRJp3lp/yRcMtYXthAZlzmKss7uRSCrrToC3hB6KHHWjcLYmgYQrpcRKJ83vNfKufE8S3tZHDgX/Q5pNQVDqg2MQGORW6pww1UylUy/RvK8PV1CdDTtIaKiigHIjIHFfXqRDdPwELoq96wa4db1wn+psFX2ChaasPiyS7+FpDo2ottcbojGHVO1Ym7/eYfOtgI/KLwHwIDAQAB
 
 # 私钥
 MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCl+o3JA7u724TabBVR+cBuxbIaNOlW54fFDLqE6Kxm0Ym/2y3yZDVkcY9WTxXnvb1wRAzpyIneatZQ6hgqCVRsMZn3MZ9/6qpPApKufEN5TilCZ8+Og++fOLPODNQFDLfWHMKjZxmqWK8vOtEmneWn/JFwy1he2EBmXOYqyzu5FIKutOgLeEHoocdaNwtiaBhCulxEonze818q58TxLe1kcOBf9Dmk1BUOqDYxAY5FbqnDDVTKVTL9G8rw9XUJ0NO0hoqKKAciMgcV9epEN0/AQuir3rBrh1vXCf6mwVfYKFpqw+LJLv4WkOjai21xuiMYdU7Vibv95h862Aj8ovAfAgMBAAECggEBAIxrdgqrGueqpzH3IO5ygkf0/2HGg+afCLE/vIj3I+v0uDpVXwDjoHwyytZ1IA4n6x4QpHAg1esSrfBUrE7cB81lBWIpXExnJuCjR59Qx/DXnHZuxx1GJ7Kn0Q6wsar4AIunV0/QyNjiIIuvkgS+ru248v7fOgs7nvg6/gsUV5mTDppV6kf4lI14Mvpa7MIwKK2bB1zzLsWA7X9IuBS/QNxv+rRykc/uhZofDhWvaXbwGKxFf6unY2HwC3IFQONOdD6LlXyMdNT2pjMdPGdVu79eOC6wn2HBiIp7lXs08NqiL3oJ9Hh8+lqO0HVz5OMkpdaofXa7wDvZtdxGwsAlBokCgYEA5tgZWo/zK/u9GHCZrtwk9mP057BFy/83tl/c8ZmUT1CkyGx3/czVCvPZSjl6FBYWw6Bj1opwIBcQis83Kd7FHbVMgNDgg7Tyew+OAMUnM8GmWFHNQ/jA8Xe251yFOmoPwT/2MbGgwqmJjEtxD0zKPo8OVaK1odPZXN1g+KAjXjUCgYEAuBDkgrhpd8NrEa5OrxtiSipdgj8bmC7ET9xJVzFtoHFYybFCexQUA0z2NouA0GGw8qahOCx/a/CIP/hL1X3tZFUwuGjq3iSxBwhaM4aUPmDY1ratCCIxEQsl5eosGi54ltIVDE1yAgut3wMFP0YKM5ht/uBssPHrP7/gqdsGL4MCgYBcB0S8TO0F2Ns+9gzeoBcAP0MwZp68v+dnBnqfurlckWrQGCYSAWnhbutuYtGfVlsG7FdA/XnL4UYQAKIeSBhPSqrQI/WNrEKK+t2CwxZo1MfLJ/lsIqxQ14gMXl8itYvIYAZ3MzhCwrH6Q000a0mpfQCa9T3x4PIjyoHRPI49DQKBgBtZlzq9QB6lkOE9rz9hqEcw6FgUHHuOZ2keaF9mXs26SeEeT6yOHTMoWmVccTWFbo9/pvD726skQHqQ4GPGpGGGLwkXvd5oQU20NgL1+k0SguXUmv1cZ0ILEASLuSXixdRTPwFm+IvJRHqgrkTqmVV1TtLSchQQvk3oqu9SNicVAoGAYWga1T1D8MW0v7q2d05hJ3JqgHbAYZmKVxlR2Moh33fzV8CmusY3FhnbPQi8Lorj/CexjfXgvG+rZfa713qtJYLHWmJ7hQKwBQH9J0QPO3ffQyFAM1RjJyIvB9BPt8zN2QbujR4O6wXFee1zjKYgnuBAt7dBmE3O3nNdXAMa1g4=
 ```
+
 实盘配置
+
 ```xml
 <Asign>
   <Url value="https://oapi.asign.cn"/>
@@ -203,4 +238,4 @@ MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCl+o3JA7u724TabBVR+cBuxbIaNOlW
   <NotifyUrl value="http://218.17.158.45:15105/api/Asign/HandleASignCompleted"/>
   <OpenApiUrl value="http://192.168.31.134:5015/mtp2-onlineopen"/>
 </Asign>
-```
+```

+ 2 - 0
models/wrTrade2.go

@@ -940,6 +940,8 @@ select t.HASWR,
 	sqlId.And("t.USERID", r.USERID)
 	sqlId.And("t.haswr", r.HASWR)
 	sqlId.AndEx("t.marketid", r.MARKETID, r.MARKETID > 0)
+	sqlId.AndEx("t.wrtradetype", r.WRTRADETYPE, r.WRTRADETYPE > 0)
+
 	// 格式 yyyymmdd
 	if len(r.BEGINDATE) > 0 {
 		sqlId.JoinFormat(" and t.TRADEDATE >= '%v'", r.BEGINDATE)