增加“设置我的包裹已收货状态”接口；修改BUG

controllers/hsby/hsby.go

@@ -557,3 +557,43 @@ func QueryHsbyMyPackages(c *gin.Context) {
 	logger.GetLogger().Debugln("QueryHsbyMyPackages successed: %v", goodsInfo)
 	appG.Response(http.StatusOK, e.SUCCESS, goodsInfo)
 }
+
+// SetHsbyMyPackagesStatusReq 设置我的包裹已收货状态
+type SetHsbyMyPackagesStatusReq struct {
+	TakeOrderID string `form:"takeOrderID" binding:"required"`
+	AccountID   int    `form:"accountID" binding:"required"`
+}
+
+// SetHsbyMyPackagesStatus 设置我的包裹已收货状态
+// @Summary 设置我的包裹已收货状态
+// @Produce json
+// @Security ApiKeyAuth
+// @Param takeOrderID query string true "提货单号"
+// @Param accountID query int true "资金账号"
+// @Success 200 {object} app.Response
+// @Failure 500 {object} app.Response
+// @Router /HSBY/SetHsbyMyPackagesStatus [post]
+// @Tags 定制【海商报业】
+func SetHsbyMyPackagesStatus(c *gin.Context) {
+	appG := app.Gin{C: c}
+
+	// 获取请求参数
+	var req SetHsbyMyPackagesStatusReq
+	if err := appG.C.ShouldBind(&req); err != nil {
+		logger.GetLogger().Errorf("SetHsbyMyPackagesStatus failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
+		return
+	}
+
+	// 3 - 已收货
+	if err := models.SetHsbyMyPackagesStatus(req.TakeOrderID, req.AccountID, 3); err != nil {
+		// 执行失败
+		logger.GetLogger().Errorf("SetHsbyMyPackagesStatus failed: %s", err.Error())
+		appG.Response(http.StatusBadRequest, e.ERROR_OPERATION_FAILED, nil)
+		return
+	}
+
+	// 执行成功
+	logger.GetLogger().Debugln("SetHsbyMyPackagesStatus successed: %v", "ok")
+	appG.Response(http.StatusOK, e.SUCCESS, "")
+}

docs/docs.go

@@ -1241,6 +1241,52 @@ var doc = `{
                 }
             }
         },
+        "/HSBY/SetHsbyMyPackagesStatus": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "定制【海商报业】"
+                ],
+                "summary": "设置我的包裹已收货状态",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "提货单号",
+                        "name": "takeOrderID",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "资金账号",
+                        "name": "accountID",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Order/QueryHisTradeDetail": {
             "get": {
                 "security": [

docs/swagger.json

@@ -1225,6 +1225,52 @@
                 }
             }
         },
+        "/HSBY/SetHsbyMyPackagesStatus": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "定制【海商报业】"
+                ],
+                "summary": "设置我的包裹已收货状态",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "提货单号",
+                        "name": "takeOrderID",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "资金账号",
+                        "name": "accountID",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Order/QueryHisTradeDetail": {
             "get": {
                 "security": [

docs/swagger.yaml

@@ -4386,6 +4386,35 @@ paths:
       summary: 查询热卖商品列表（二级市场挂牌点选）
       tags:
       - 定制【海商报业】
+  /HSBY/SetHsbyMyPackagesStatus:
+    post:
+      parameters:
+      - description: 提货单号
+        in: query
+        name: takeOrderID
+        required: true
+        type: string
+      - description: 资金账号
+        in: query
+        name: accountID
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/app.Response'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 设置我的包裹已收货状态
+      tags:
+      - 定制【海商报业】
   /Order/QueryHisTradeDetail:
     get:
       parameters:

models/account.go

@@ -493,7 +493,7 @@ func InsertMessageBoard(userID int, message string) int {
 
 	// 一天最多只能新增3条留言
 	messageBoard := new(Messageboard)
-	total, err := engine.Where("CREATETIME >=TRUNC(SYSDATE) and CREATETIME < TRUNC(SYSDATE)+1").Count(messageBoard)
+	total, err := engine.Where("USERID = ? and (CREATETIME >=TRUNC(SYSDATE) and CREATETIME < TRUNC(SYSDATE)+1)", userID).Count(messageBoard)
 	if err != nil {
 		return e.ERROR_OPERATION_FAILED
 	}

models/hsby.go

@@ -891,3 +891,13 @@ func GetHsbyMyPackages(accountIDs string, takeOrderStatus int) ([]HsbyMyPackage,
 
 	return myPackages, nil
 }
+
+// SetHsbyMyPackagesStatus 设置我的包裹提货状态
+func SetHsbyMyPackagesStatus(takeOrderID string, accountID, status int) error {
+	engine := db.GetEngine()
+
+	sql := fmt.Sprintf("update TRADE_GOODSPICKUP set TAKEORDERSTATUS = %d where TAKEORDERID = %s and ACCOUNTID = %d", status, takeOrderID, accountID)
+	_, err := engine.Exec(sql)
+
+	return err
+}

routers/router.go

@@ -209,6 +209,8 @@ func InitRouter() *gin.Engine {
 		hsbyR.GET("/QueryHsbySellMyDetails", hsby.QueryHsbySellMyDetails)
 		// 查询我的包裹信息
 		hsbyR.GET("/QueryHsbyMyPackages", hsby.QueryHsbyMyPackages)
+		// 设置我的包裹已收货状态
+		hsbyR.POST("/SetHsbyMyPackagesStatus", hsby.SetHsbyMyPackagesStatus)
 	}
 
 	return r

token/token.go

@@ -61,6 +61,8 @@ func Auth() gin.HandlerFunc {
 			return
 		}
 
+		// FIXME: - 针对POST接口，应判断传入TOKEN对应的用户是否正确（比如判断UserID或AccountID是否对得上等），后期处理
+
 		// Token检验成功
 		c.Next()
 	}