From ba22baac2a0353d7c5deda467be4ce58cf2f1ac8 Mon Sep 17 00:00:00 2001 From: howell <2827207845@qq.com> Date: Thu, 10 Feb 2022 09:28:56 +0800 Subject: [PATCH] fix:remove manage --- internal/gateway/app/v1.go | 100 +++++++++--------- internal/v2/router/manage.go | 18 ++-- internal/v2/router/middleware/thirdManager.go | 39 ++++--- 3 files changed, 78 insertions(+), 79 deletions(-) diff --git a/internal/gateway/app/v1.go b/internal/gateway/app/v1.go index 7e9c48e..fad70f7 100755 --- a/internal/gateway/app/v1.go +++ b/internal/gateway/app/v1.go @@ -317,34 +317,34 @@ func SetupRouter(v1 *gin.RouterGroup) { orderR := v1.Group("order") { - orderR.POST("/normal/submit", order.SubmitOrder) // 提交订单 - orderR.POST("/submit", order.SubmitOrder) // 提交订单 - orderR.POST("/list/all", order.QueryAllOrders) // 查询所有订单 - orderR.POST("/list/unpaid", order.QueryUnpaidOrders) // 查询未付款订单 - orderR.POST("/list/undelivered", order.QueryUndeliveredOrders) // 查询未发货订单 - orderR.POST("/list/receipt", order.QueryWaitingForReceiptOrders) // 查询待收货 - orderR.POST("/list/unevaluated", order.QueryUnEvaluateOrders) // 待评价 - orderR.POST("/detail", order.QueryOrderDetail) // 查询订单详情 - orderR.POST("/cancel", order.CancelOrder) // 取消订单 - orderR.POST("/delete", order.DeleteOrder) // 删除订单 只有取消或过期的订单可以删除 - orderR.POST("/receipt/confirm", order.ConfirmOrderReceipt, middleware.ThirdManager()) // 订单确认收货 - orderR.POST("/express/query", kuaidi100.QueryExpress) // 查询快递 - orderR.POST("/invoice/apply", order.CreateInvoice) // 申请开票 - orderR.POST("/evaluation/create", evaluation.CreateOrderEvaluation) // 订单评价 + orderR.POST("/normal/submit", order.SubmitOrder) // 提交订单 + orderR.POST("/submit", order.SubmitOrder) // 提交订单 + orderR.POST("/list/all", order.QueryAllOrders) // 查询所有订单 + orderR.POST("/list/unpaid", order.QueryUnpaidOrders) // 查询未付款订单 + orderR.POST("/list/undelivered", order.QueryUndeliveredOrders) // 查询未发货订单 + orderR.POST("/list/receipt", order.QueryWaitingForReceiptOrders) // 查询待收货 + orderR.POST("/list/unevaluated", order.QueryUnEvaluateOrders) // 待评价 + orderR.POST("/detail", order.QueryOrderDetail) // 查询订单详情 + orderR.POST("/cancel", order.CancelOrder) // 取消订单 + orderR.POST("/delete", order.DeleteOrder) // 删除订单 只有取消或过期的订单可以删除 + orderR.POST("/receipt/confirm", order.ConfirmOrderReceipt) // 订单确认收货 + orderR.POST("/express/query", kuaidi100.QueryExpress) // 查询快递 + orderR.POST("/invoice/apply", order.CreateInvoice) // 申请开票 + orderR.POST("/evaluation/create", evaluation.CreateOrderEvaluation) // 订单评价 orderR.POST("/evaluation/orderEvaluationList", evaluation.OrderEvaluationList) // 订单商品评价列表 orderR.POST("/evaluation/createOrderEvaluationOne", evaluation.CreateOrderEvaluationOne) // 对单个订单产品进行评价 orderR.POST("/evaluation/evaluationDea", evaluation.EvaluationDea) // 查看评价详情 - orderR.POST("/refund", aftersales.RefundOrder, middleware.ThirdManager()) // 申请退款 - orderR.POST("/return", aftersales.ApplyReturnOrder, middleware.ThirdManager()) // 申请退货 - orderR.POST("/cannelAfterOrder", aftersales.CannelAfterOrder, middleware.ThirdManager()) // 撤销售后的接口 - orderR.POST("/get_after_sales/resson", aftersales.GetAfterSalesReason) // 获取售后理由 - orderR.POST("/after_sales/express/fill", aftersales.FillAfterSalesGoodsExpress) // 填写退货订单物流信息 - orderR.POST("/after_sales/goods/list", aftersales.QueryAfterSalesGoodsList) // 查询售后 - orderR.POST("/after_sales/goods/detail", aftersales.QueryAfterSalesGoodsDetail) // 查询订单退货详情 - orderR.POST("/after_sales/log", aftersales.QueryAfterSalesLog) // 查询订单售后日志 - orderR.POST("/express/company/list", aftersales.QuerySupportExpressCompany) // 退货支持的物流公司 + orderR.POST("/refund", aftersales.RefundOrder) // 申请退款 + orderR.POST("/return", aftersales.ApplyReturnOrder) // 申请退货 + orderR.POST("/cannelAfterOrder", aftersales.CannelAfterOrder) // 撤销售后的接口 + orderR.POST("/get_after_sales/resson", aftersales.GetAfterSalesReason) // 获取售后理由 + orderR.POST("/after_sales/express/fill", aftersales.FillAfterSalesGoodsExpress) // 填写退货订单物流信息 + orderR.POST("/after_sales/goods/list", aftersales.QueryAfterSalesGoodsList) // 查询售后 + orderR.POST("/after_sales/goods/detail", aftersales.QueryAfterSalesGoodsDetail) // 查询订单退货详情 + orderR.POST("/after_sales/log", aftersales.QueryAfterSalesLog) // 查询订单售后日志 + orderR.POST("/express/company/list", aftersales.QuerySupportExpressCompany) // 退货支持的物流公司 orderR.POST("/bill/create", bill.ActionToBill) // 申请发票 orderR.POST("/bill/canGetBill", bill.CangetBill) // 获取能开发票的产品订单 @@ -359,33 +359,33 @@ func SetupRouter(v1 *gin.RouterGroup) { payR := v1.Group("pay") { - payR.POST("/recookpay/order/create", recookpay.PayOrder, middleware.ThirdManager()) // 余额钱包订单 - payR.POST("/recookpay/fund/query", recookpay.QueryFund) // 余额查询 - payR.POST("/recookpay/balance/query", recookpay.QueryBalance) // 余额查询 - payR.POST("/order/query", wxpay.QueryOrderPay) // 支付状态查询 - - payR.POST("/alipay/order/create", alipay.PayOrder) // 创建支付宝订单 - payR.POST("/alipay/callback", alipay.PayCallback, middleware.ThirdManager()) // 支付通知 - payR.POST("/alipay/wap/pay", alipay.CreateH5Alipay) // H5支付宝支付 - payR.POST("/alipay/h5_callback", alipay.H5Callback, middleware.ThirdManager()) // 支付通知 - - payR.POST("/wxpay/order/create", wxpay.PayOrder) // 微信创建订单 - payR.POST("/wxpay/callback", wxpay.PayCallback, middleware.ThirdManager()) // 支付通知 - payR.POST("/wxpay/refund/callback", wxpay.RefundCallback) // 退款通知 - - payR.POST("/wxminipay/order/create", wxminipay.PayOrder) // 微信创建订单 - payR.POST("/wxminipay/callback", wxminipay.PayCallback, middleware.ThirdManager()) // 支付通知 - payR.POST("/wxminipay/refund/callback", wxminipay.RefundCallback) // 退款通知 - - payR.POST("/wxh5pay/order/create", wxh5pay.PayOrder) // 微信创建订单 - payR.POST("/wxh5pay/callback", wxh5pay.PayCallback, middleware.ThirdManager()) // 支付通知 - payR.POST("/wxh5pay/refund/callback", wxh5pay.RefundCallback) // 退款通知 - - payR.POST("/wxh5innerpay/auth_url", wxh5innerpay.GetOpenId) //获取鉴权url - payR.POST("/wxh5innerpay/code", wxh5innerpay.UpdateUserGzhOpenId) // 根据code 写入用户 gzh_open_id - payR.POST("/wxh5innerpay/order/create", wxh5innerpay.PayOrder) // 微信创建订单 - payR.POST("/wxh5innerpay/callback", wxh5innerpay.PayCallback, middleware.ThirdManager()) // 支付通知 - payR.POST("/wxh5innerpay/refund/callback", wxh5innerpay.RefundCallback) // 退款通知 + payR.POST("/recookpay/order/create", recookpay.PayOrder) // 余额钱包订单 + payR.POST("/recookpay/fund/query", recookpay.QueryFund) // 余额查询 + payR.POST("/recookpay/balance/query", recookpay.QueryBalance) // 余额查询 + payR.POST("/order/query", wxpay.QueryOrderPay) // 支付状态查询 + + payR.POST("/alipay/order/create", alipay.PayOrder) // 创建支付宝订单 + payR.POST("/alipay/callback", alipay.PayCallback) // 支付通知 + payR.POST("/alipay/wap/pay", alipay.CreateH5Alipay) // H5支付宝支付 + payR.POST("/alipay/h5_callback", alipay.H5Callback) // 支付通知 + + payR.POST("/wxpay/order/create", wxpay.PayOrder) // 微信创建订单 + payR.POST("/wxpay/callback", wxpay.PayCallback) // 支付通知 + payR.POST("/wxpay/refund/callback", wxpay.RefundCallback) // 退款通知 + + payR.POST("/wxminipay/order/create", wxminipay.PayOrder) // 微信创建订单 + payR.POST("/wxminipay/callback", wxminipay.PayCallback) // 支付通知 + payR.POST("/wxminipay/refund/callback", wxminipay.RefundCallback) // 退款通知 + + payR.POST("/wxh5pay/order/create", wxh5pay.PayOrder) // 微信创建订单 + payR.POST("/wxh5pay/callback", wxh5pay.PayCallback) // 支付通知 + payR.POST("/wxh5pay/refund/callback", wxh5pay.RefundCallback) // 退款通知 + + payR.POST("/wxh5innerpay/auth_url", wxh5innerpay.GetOpenId) //获取鉴权url + payR.POST("/wxh5innerpay/code", wxh5innerpay.UpdateUserGzhOpenId) // 根据code 写入用户 gzh_open_id + payR.POST("/wxh5innerpay/order/create", wxh5innerpay.PayOrder) // 微信创建订单 + payR.POST("/wxh5innerpay/callback", wxh5innerpay.PayCallback) // 支付通知 + payR.POST("/wxh5innerpay/refund/callback", wxh5innerpay.RefundCallback) // 退款通知 } liveR := v1.Group("live") diff --git a/internal/v2/router/manage.go b/internal/v2/router/manage.go index e68c71a..bbd8735 100644 --- a/internal/v2/router/manage.go +++ b/internal/v2/router/manage.go @@ -136,14 +136,14 @@ func routerManage(manageRouter *gin.RouterGroup) { { goodsController := goods.Goods{} { - auditRouter.POST("list", goodsController.AuditList) //审核列表 - auditRouter.POST("list_num", goodsController.AuditListNum) //审核列表_NUM - auditRouter.POST("step", goodsController.Step) // 审核进度 - auditRouter.POST("platform_rate", goodsController.AuditPlatformModify) // 批量修改平台开票税率 - auditRouter.POST("detail", goodsController.AuditDetail) // 详情 - auditRouter.POST("reject", goodsController.AuditReject) // 审核驳回 - auditRouter.POST("sku/update", goodsController.AuditSkuUpdate) // 运营update更新 - auditRouter.POST("adopt", goodsController.AuditAdopt, middleware.ThirdManager()) // 审核通过 + auditRouter.POST("list", goodsController.AuditList) //审核列表 + auditRouter.POST("list_num", goodsController.AuditListNum) //审核列表_NUM + auditRouter.POST("step", goodsController.Step) // 审核进度 + auditRouter.POST("platform_rate", goodsController.AuditPlatformModify) // 批量修改平台开票税率 + auditRouter.POST("detail", goodsController.AuditDetail) // 详情 + auditRouter.POST("reject", goodsController.AuditReject) // 审核驳回 + auditRouter.POST("sku/update", goodsController.AuditSkuUpdate) // 运营update更新 + auditRouter.POST("adopt", goodsController.AuditAdopt) // 审核通过 auditRouter.POST("design", goodsController.AuditDesignModify) } @@ -152,7 +152,7 @@ func routerManage(manageRouter *gin.RouterGroup) { auditRouter.POST("old/list", OldController.List) // 老品列表 auditRouter.POST("old/list_num", OldController.ListNum) // 老品列表 auditRouter.POST("old/detail", OldController.Detail) // 老品详情 - auditRouter.POST("old/reject", OldController.Reject) // 老品拒绝 + auditRouter.POST("old/reject", OldController.Reject) // 老品拒绝c auditRouter.POST("old/adopt", OldController.Adopt) // 老品接受 auditRouter.POST("old/design", OldController.AuditDesignModify) } diff --git a/internal/v2/router/middleware/thirdManager.go b/internal/v2/router/middleware/thirdManager.go index 3ce7fec..11d1d7b 100644 --- a/internal/v2/router/middleware/thirdManager.go +++ b/internal/v2/router/middleware/thirdManager.go @@ -3,7 +3,6 @@ package middleware import ( "fmt" mysql2 "git.oa00.com/go/mysql" - "github.com/gin-gonic/gin" "github.com/shopspring/decimal" "gorm.io/gorm" "recook/internal/dbc" @@ -23,25 +22,25 @@ const ( AfterApply = "AfterApply" ) -func ThirdManager() gin.HandlerFunc { - return func(c *gin.Context) { - if value, ok := c.Get("status"); ok { - if id, ok := c.Get("id"); ok { - fmt.Println(id) - value = value.(string) - switch value { - case SyncOrder: - //go orderDeliver(id) - //go addOrderNum(id) - //go syncSecKillStock(id) - case AfterApply: - //go afterMessage(id) - } - } - } - return - } -} +//func ThirdManager() gin.HandlerFunc { +// return func(c *gin.Context) { +// if value, ok := c.Get("status"); ok { +// if id, ok := c.Get("id"); ok { +// fmt.Println(id) +// value = value.(string) +// switch value { +// case SyncOrder: +// //go orderDeliver(id) +// //go addOrderNum(id) +// //go syncSecKillStock(id) +// case AfterApply: +// //go afterMessage(id) +// } +// } +// } +// return +// } +//} //传入售后表id数组 func afterMessage(id interface{}) {