增加获取服务器时间接口；查询待付款接口增加参数；我的订单统计数量增加待付款数量；修改我的闲置接口BUG

controllers/common/common.go

@@ -136,3 +136,26 @@ func GetAllEnums(c *gin.Context) {
 	// logger.GetLogger().Debugln("GetAllEnums successed: %v", imageConfigs)
 	appG.Response(http.StatusOK, e.SUCCESS, enums)
 }
+
+// GetServerTime 获取服务器时间
+// @Summary 获取服务器时间
+// @Produce json
+// @Success 200 {object} app.Response
+// @Failure 500 {object} app.Response
+// @Router /Common/GetServerTime [get]
+// @Tags 通用服务
+func GetServerTime(c *gin.Context) {
+	appG := app.Gin{C: c}
+
+	rst, err := models.GetServerTime()
+	if err != nil {
+		// 查询失败
+		logger.GetLogger().Errorf("GetServerTime failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+		return
+	}
+
+	// 查询成功
+	logger.GetLogger().Debugln("GetServerTime successed: %v", rst)
+	appG.Response(http.StatusOK, e.SUCCESS, rst)
+}

controllers/hsby/hsby.go

@@ -785,6 +785,7 @@ type GetHsbyMyCountRsp struct {
 	MyOrderDetailListingCount int `json:"myOrderDetailListingCount"` // 我的订单求购中数量
 	MyPackageUnSendCount      int `json:"myPackageUnSendCount"`      // 我的包裹待发货数量
 	MyPackageUnReceiveCount   int `json:"myPackageUnReceiveCount"`   // 我的包裹待收货数量
+	MyPayOrderCount           int `json:"myPayOrderCount"`           // 我的订单待付款数量
 }
 
 // GetHsbyMyCount 获取我的订单与包裹数量
@@ -817,7 +818,7 @@ func GetHsbyMyCount(c *gin.Context) {
 		return
 	}
 
-	// 获取数据
+	// 获取我的包裹数据
 	myPackages, err := models.GetHsbyMyPackages(req.AccountIDs, 0)
 	if err != nil {
 		// 查询失败
@@ -826,6 +827,15 @@ func GetHsbyMyCount(c *gin.Context) {
 		return
 	}
 
+	// 获取我的订单待付款数量
+	myPayOrders, err := models.GetHsbyBuyMyPayOrders(req.AccountIDs, 0, 0)
+	if err != nil {
+		// 查询失败
+		logger.GetLogger().Errorf("GetHsbyMyCount failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
+		return
+	}
+
 	// 统计数量
 	rsp := GetHsbyMyCountRsp{}
 	for _, v := range myOrderDetails {
@@ -846,6 +856,7 @@ func GetHsbyMyCount(c *gin.Context) {
 			rsp.MyPackageUnReceiveCount++
 		}
 	}
+	rsp.MyPayOrderCount = len(myPayOrders)
 
 	// 查询成功返回
 	logger.GetLogger().Debugln("GetHsbyMyCount successed: %v", rsp)
@@ -855,7 +866,9 @@ func GetHsbyMyCount(c *gin.Context) {
 // QueryMyPayOrdersReq 我的订单中待付款信息查询请求参数
 type QueryMyPayOrdersReq struct {
 	app.PageInfo
-	AccountIDs string `form:"accountIDs" binding:"required"`
+	AccountIDs  string `form:"accountIDs" binding:"required"`
+	BuyOrderID  int    `form:"buyOrderID"`
+	SellOrderID int    `form:"sellOrderID"`
 }
 
 // QueryMyPayOrders 获取我的订单中待付款信息
@@ -865,6 +878,8 @@ type QueryMyPayOrdersReq struct {
 // @Param page query int false "页码"
 // @Param pagesize query int false "每页条数"
 // @Param accountIDs query string true "资金账户列表，格式：1,2,3"
+// @Param buyOrderID query int false "买方委托单号"
+// @Param sellOrderID query int false "卖方委托单号"
 // @Success 200 {object} models.HsbyBuyMyPayOrder
 // @Failure 500 {object} app.Response
 // @Router /HSBY/QueryMyPayOrders [get]
@@ -881,7 +896,7 @@ func QueryMyPayOrders(c *gin.Context) {
 	}
 
 	// 获取数据
-	orders, err := models.GetHsbyBuyMyPayOrders(req.AccountIDs)
+	orders, err := models.GetHsbyBuyMyPayOrders(req.AccountIDs, req.BuyOrderID, req.SellOrderID)
 	if err != nil {
 		// 查询失败
 		logger.GetLogger().Errorf("QueryMyPayOrders failed: %s", err.Error())

docs/docs.go

@@ -393,6 +393,31 @@ var doc = `{
                 }
             }
         },
+        "/Common/GetServerTime": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "通用服务"
+                ],
+                "summary": "获取服务器时间",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Common/NoticeReaded": {
             "post": {
                 "security": [
@@ -2009,6 +2034,18 @@ var doc = `{
                         "name": "accountIDs",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "买方委托单号",
+                        "name": "buyOrderID",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "卖方委托单号",
+                        "name": "sellOrderID",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -6186,6 +6223,10 @@ var doc = `{
                 "myPackageUnSendCount": {
                     "description": "我的包裹待发货数量",
                     "type": "integer"
+                },
+                "myPayOrderCount": {
+                    "description": "我的订单待付款数量",
+                    "type": "integer"
                 }
             }
         },

docs/swagger.json

@@ -377,6 +377,31 @@
                 }
             }
         },
+        "/Common/GetServerTime": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "通用服务"
+                ],
+                "summary": "获取服务器时间",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Common/NoticeReaded": {
             "post": {
                 "security": [
@@ -1993,6 +2018,18 @@
                         "name": "accountIDs",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "买方委托单号",
+                        "name": "buyOrderID",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "卖方委托单号",
+                        "name": "sellOrderID",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -6170,6 +6207,10 @@
                 "myPackageUnSendCount": {
                     "description": "我的包裹待发货数量",
                     "type": "integer"
+                },
+                "myPayOrderCount": {
+                    "description": "我的订单待付款数量",
+                    "type": "integer"
                 }
             }
         },

docs/swagger.yaml

@@ -1999,6 +1999,9 @@ definitions:
       myPackageUnSendCount:
         description: 我的包裹待发货数量
         type: integer
+      myPayOrderCount:
+        description: 我的订单待付款数量
+        type: integer
     type: object
   hsby.QueryProvincesAndCitiesRsp:
     properties:
@@ -5241,6 +5244,22 @@ paths:
       summary: 获取所有枚举信息
       tags:
       - 通用服务
+  /Common/GetServerTime:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/app.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      summary: 获取服务器时间
+      tags:
+      - 通用服务
   /Common/NoticeReaded:
     post:
       parameters:
@@ -6251,6 +6270,14 @@ paths:
         name: accountIDs
         required: true
         type: string
+      - description: 买方委托单号
+        in: query
+        name: buyOrderID
+        type: integer
+      - description: 卖方委托单号
+        in: query
+        name: sellOrderID
+        type: integer
       produces:
       - application/json
       responses:

models/common.go

@@ -621,3 +621,19 @@ func GetImageConfigs(imageType int) ([]Szdz2imageconfig, error) {
 
 	return imageConfigs, nil
 }
+
+// GetServerTime 获取服务器时间
+func GetServerTime() (*string, error) {
+	engine := db.GetEngine()
+
+	rst, err := engine.QueryString("select sysdate from dual")
+	if err != nil {
+		return nil, err
+	}
+	if len(rst) > 0 {
+		r := rst[0]["sysdate"]
+		return &r, nil
+	}
+
+	return nil, nil
+}

models/hsby.go

@@ -792,8 +792,8 @@ func GetHsbySellMyOrderDetails(accountIDs string) ([]HsbySellMyDetail, error) {
 				ENUMDICITEM.PARAM2 CURRENCYSIGN, 
 				HSBY_SUPPLIERINFO.VENDORNAME, 
 				0 ORDERTYPE, 
-				(select count(TR1.*) from TRADE_PAYORDER TR1 where TR1.PAYFLAG = 2 and TR1.TRADEID = TD.TRADEID) PAYEDCOUNT, 
-				(select count(TR2.*) from TRADE_PAYORDER TR2 where TR2.PAYFLAG = 1 and TR2.TRADEID = TD.TRADEID) UNPAYCOUNT`).
+				(select count(TR1.TRADEID) from TRADE_PAYORDER TR1 where TR1.PAYFLAG = 2 and TR1.TRADEID = TD.TRADEID) PAYEDCOUNT, 
+				(select count(TR2.TRADEID) from TRADE_PAYORDER TR2 where TR2.PAYFLAG = 1 and TR2.TRADEID = TD.TRADEID) UNPAYCOUNT`).
 		Join("LEFT", "GOODS", "GOODS.GOODSID = TRADE_ORDERDETAIL.GOODSID").
 		Join("LEFT", "HSBY_GOODSEX", "HSBY_GOODSEX.GOODSID = GOODS.GOODSID").
 		Join("LEFT", "ENUMDICITEM", "GOODS.CURRENCYID = ENUMDICITEM.ENUMITEMNAME and ENUMDICITEM.ENUMDICCODE = 'currency'").
@@ -1158,7 +1158,7 @@ type HsbyBuyMyPayOrder struct {
 }
 
 // GetHsbyBuyMyPayOrders 获取待付款信息
-func GetHsbyBuyMyPayOrders(accountIDs string) ([]HsbyBuyMyPayOrder, error) {
+func GetHsbyBuyMyPayOrders(accountIDs string, buyOrderID, sellOrderID int) ([]HsbyBuyMyPayOrder, error) {
 	// 获取市场信息
 	markets, err := GetMarkets()
 	if err != nil {
@@ -1196,6 +1196,12 @@ func GetHsbyBuyMyPayOrders(accountIDs string) ([]HsbyBuyMyPayOrder, error) {
 		Join("LEFT", "HSBY_SUPPLIERINFO HS2", "HS2.VENDORID = HG2.VENDORID").
 		Where(fmt.Sprintf(`TP.PAYFLAG = 1 and TP.BUYACCOUNTID in (%s)`, accountIDs)).
 		And(fmt.Sprintf("TP.MARKETID in (%s)", marketIDs))
+	if buyOrderID != 0 {
+		session = session.And("TP.BUYORDERID = ?", buyOrderID)
+	}
+	if sellOrderID != 0 {
+		session = session.And("TP.SELLORDERID = ?", sellOrderID)
+	}
 	if err := session.Find(&orders); err != nil {
 		return nil, err
 	}

routers/router.go

@@ -98,6 +98,8 @@ func InitRouter() *gin.Engine {
 		commonR.GET("/QueryImageConfigs", common.QueryImageConfigs)
 		// 获取所有枚举信息
 		commonR.GET("/GetAllEnums", common.GetAllEnums)
+		// 获取服务器时间
+		commonR.GET("/GetServerTime", common.GetServerTime)
 		// 通知公告系统消息查询
 		commonR.Use(token.Auth()).GET("/QueryNotice", common.QueryNotice)
 		// 通知公告设置已读请求