Explorar el Código

修改优惠卷数量统计BUG

zhou.xiaoning hace 4 años
padre
commit
fdd63d5a23
Se han modificado 2 ficheros con 47 adiciones y 52 borrados
  1. 43 50
      config/config.xml
  2. 4 2
      controllers/hsby/hsby.go

+ 43 - 50
config/config.xml

@@ -1,52 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Configuration xmlns:http="http://www.w3.org/2001/XMLSchema-instance">
-    <WebSetting>
-        <ListenAddress value="0.0.0.0:8080"/>
-        <DebugMode value="1"/>
-    </WebSetting>
-
-    <LogSetting>
-        <LogPath value="log"/>
-        <LogLevel value="5"/>
-    </LogSetting>
-
-    <DbSetting>
-        <DbDriver  value="oci8"/>
-        <DbAddress value="192.168.31.117"/>
-        <DbName    value="orcl"/>
-        <DbPort    value="1521"/>
-        <DbUser    value="mtp2_test82"/>
-        <DbPwd     value="muchinfo"/>
-    </DbSetting>
-
-    <RedisSetting>
-        <Address   value="192.168.30.182"/>
-        <Port      value="5007"/>
-        <Timeout   value="3"/>
-        <ConnNum   value="1"/>
-        <DbNum     value="0"/>
-        <Pwd       value=""/>
-    </RedisSetting>
-
-    <MqSetting>
-        <Url       value="amqp://guest:guest@192.168.30.182:5020/test"/>
-        <Exchange  value="entry"/>
-    </MqSetting>
-
-    <MongoDBSetting>
-        <HostName   value="192.168.30.182"/>
-        <Port       value="5025"/>
-        <DBName     value="HistoryQuote"/>
-        <Username   value="quote_test01"/>
-        <Password   value="123456"/>
-    </MongoDBSetting>
-
-    <MySQLSetting>
-        <Host       value="192.168.30.140"/>
-        <Port       value="3306"/>
-        <DBName     value="historyquote_test166"/>
-        <Username   value="quote_test166"/>
-        <Password   value="123456"/>
-    </MySQLSetting>
-</Configuration>
+  <WebSetting>
+    <ListenAddress value="0.0.0.0:8080"/>
+    <DebugMode value="1"/>
+  </WebSetting>
+  <LogSetting>
+    <LogPath value="./log"/>
+    <LogLevel value="5"/>
+  </LogSetting>
+  <DbSetting>
+    <DbDriver value="oci8"/>
+    <DbAddress value="192.168.31.117"/>
+    <DbName value="orcl"/>
+    <DbPort value="1521"/>
+    <DbUser value="mtp2_test183"/>
+    <DbPwd value="muchinfo"/>
+  </DbSetting>
+  <RedisSetting>
+    <Address value="192.168.31.183"/>
+    <Port value="5007"/>
+    <Timeout value="3"/>
+    <ConnNum value="1"/>
+    <DbNum value="0"/>
+    <Pwd value=""/>
+  </RedisSetting>
+  <MqSetting>
+    <Url value="amqp://guest:guest@192.168.31.183:5020/test"/>
+    <Exchange value="entry"/>
+  </MqSetting>
+  <MongoDBSetting>
+    <HostName value="192.168.31.183"/>
+    <Port value="5025"/>
+    <DBName value="HistoryQuote"/>
+    <Username value="quote_test01"/>
+    <Password value="123456"/>
+  </MongoDBSetting>
+  <MySQLSetting>
+    <Host value="192.168.30.140"/>
+    <Port value="3306"/>
+    <DBName value="historyquote_test183"/>
+    <Username value="quote_test183"/>
+    <Password value="123456"/>
+  </MySQLSetting>
+</Configuration>

+ 4 - 2
controllers/hsby/hsby.go

@@ -844,7 +844,9 @@ func GetHsbyMyCount(c *gin.Context) {
 	}
 
 	// 获取我的优惠卷数量
-	myCoupons, err := models.GetMyCoupons(req.AccountIDs, 0, 0)
+	// myCoupons, err := models.GetMyCoupons(req.AccountIDs, 0, 0)
+	// 改用优惠卷持仓明细
+	myCoupons, err := models.GetMyCouponHolds(req.AccountIDs, "2")
 	if err != nil {
 		// 查询失败
 		logger.GetLogger().Errorf("GetHsbyMyCount failed: %s", err.Error())
@@ -874,7 +876,7 @@ func GetHsbyMyCount(c *gin.Context) {
 	}
 	rsp.MyPayOrderCount = len(myPayOrders)
 	for _, v := range myCoupons {
-		rsp.MyCouponCount += int(v.Curqty)
+		rsp.MyCouponCount += int(v.Qty)
 	}
 
 	// 查询成功返回