Merge pull request #264 from ArtisanCloud/dev/michaelhu

Dev/michaelhu

api/mp.api

@@ -5,6 +5,7 @@ import "mp/market/media.api"
 import "mp/product/artisan.api"
 import "mp/product/product.api"
 import "mp/product/productcategory.api"
+import "mp/product/productstatistics.api"
 import "mp/trade/cart.api"
 import "mp/trade/order.api"
 import "mp/trade/shippingaddress.api"

api/mp/customerdomain/authcustomer.api

@@ -10,7 +10,7 @@ info(
 )
 
 @server(
-    group: mp/customer/auth
+    group: mp/crm/customer/auth
     prefix: /api/v1/mp/customer
 )
 

api/mp/market/media.api

@@ -11,7 +11,7 @@ info(
 import "../../admin/crm/market/media.api"
 
 @server(
-    group: mp/market/media
+    group: mp/crm/market/media
     prefix: /api/v1/mp/market
     middleware: MPCustomerJWTAuth
 )

api/mp/market/store.api

@@ -12,7 +12,7 @@ info(
 import "../../admin/crm/market/store.api"
 
 @server(
-    group: mp/market/store
+    group: mp/crm/market/store
     prefix: /api/v1/mp/market
     middleware: MPCustomerJWTAuth
 )

api/mp/product/artisan.api

@@ -11,7 +11,7 @@ info(
 import "../../admin/crm/product/artisan.api"
 
 @server(
-    group: mp/product/artisan
+    group: mp/crm/product/artisan
     prefix: /api/v1/mp/product
     middleware: MPCustomerJWTAuth
 )

api/mp/product/product.api

@@ -12,7 +12,7 @@ info(
 import "../../admin/crm/product/product.api"
 
 @server(
-    group: mp/product
+    group: mp/crm/product
     prefix: /api/v1/mp/product
     middleware: MPCustomerJWTAuth
 )

api/mp/product/productcategory.api

@@ -12,7 +12,7 @@ import "../../admin/crm/product/productcategory.api"
 import "../../admin/crm/product/productstatistics.api"
 
 @server(
-    group: mp/product
+    group: mp/crm/product
     prefix: /api/v1/mp/product
     middleware: MPCustomerJWTAuth
 )

api/mp/product/productstatistics.api

@@ -0,0 +1,27 @@
+syntax = "v1"
+
+info(
+    title: "产品统计"
+    desc: "产品统计"
+    author: "MichaelHu"
+    email: "[email protected]"
+    version: "v1"
+)
+
+@server(
+    group: mp/crm/product/productstatistics
+    prefix: /api/v1/mp/product
+    middleware: MPCustomerJWTAuth
+)
+
+service PowerX {
+    @doc "查询产品统计列表"
+    @handler ListProductStatisticsPage
+    get /product-statistics/page-list (ListProductStatisticsPageRequest) returns (ListProductStatisticsPageReply)
+
+    @doc "查询产品统计详情"
+    @handler GetProductStatistics
+    get /product-statistics/:id (GetProductStatisticsRequest) returns (GetProductStatisticsReply)
+
+}
+

api/mp/trade/billingaddress.api

@@ -12,7 +12,7 @@ info(
 import "./shippingaddress.api"
 
 @server(
-    group: mp/trade/address/billing
+    group: mp/crm/trade/address/billing
     prefix: /api/v1/mp/trade/address
     middleware: MPCustomerJWTAuth, MPCustomerGet
 )

api/mp/trade/cart.api

@@ -9,7 +9,7 @@ info(
 )
 
 @server(
-    group: mp/trade/cart
+    group: mp/crm/trade/cart
     prefix: /api/v1/mp/trade
     middleware: MPCustomerJWTAuth, MPCustomerGet
 )

api/mp/trade/deliveryaddress.api

@@ -11,7 +11,7 @@ info(
 import "./shippingaddress.api"
 
 @server(
-    group: mp/trade/address/delivery
+    group: mp/crm/trade/address/delivery
     prefix: /api/v1/mp/trade/address
     middleware: MPCustomerJWTAuth, MPCustomerGet
 )

api/mp/trade/logistics.api

@@ -9,7 +9,7 @@ info (
 )
 
 @server (
-    group: mp/trade/logistics
+    group: mp/crm/trade/logistics
     prefix: /api/v1/mp/trade
     middleware: MPCustomerJWTAuth, MPCustomerGet
 )

api/mp/trade/order.api

@@ -13,7 +13,7 @@ import "./cart.api"
 import "../../admin/crm/trade/order.api"
 
 @server(
-    group: mp/trade/order
+    group: mp/crm/trade/order
     prefix: /api/v1/mp/trade
     middleware: MPCustomerJWTAuth, MPCustomerGet
 )

api/mp/trade/payment.api

@@ -12,7 +12,7 @@ info(
 import "../../admin/crm/trade/payment.api"
 
 @server(
-    group: mp/trade/payment
+    group: mp/crm/trade/payment
     prefix: /api/v1/mp/trade
     middleware: MPCustomerJWTAuth, MPCustomerGet
 )

api/mp/trade/shippingaddress.api

@@ -10,7 +10,7 @@ info(
 
 
 @server(
-    group: mp/trade/address/shipping
+    group: mp/crm/trade/address/shipping
     prefix: /api/v1/mp/trade/address
     middleware: MPCustomerJWTAuth, MPCustomerGet
 )

go.mod

@@ -2,6 +2,8 @@ module PowerX
 
 go 1.21
 
+//replace github.com/ArtisanCloud/PowerWeChat/v3 => ../../../PowerWechat/PowerWeChat
+
 require (
 	github.com/ArtisanCloud/PowerLibs/v3 v3.0.15
 	github.com/ArtisanCloud/PowerSocialite/v3 v3.0.7

internal/handler/mp/customer/auth/authbyphonehandler.go → internal/handler/mp/crm/customer/auth/authbyphonehandler.go

@@ -3,7 +3,7 @@ package auth
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/customer/auth"
+	"PowerX/internal/logic/mp/crm/customer/auth"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/customer/auth/authbyprofilehandler.go → internal/handler/mp/crm/customer/auth/authbyprofilehandler.go

@@ -3,7 +3,7 @@ package auth
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/customer/auth"
+	"PowerX/internal/logic/mp/crm/customer/auth"
 	"PowerX/internal/svc"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )

internal/handler/mp/customer/auth/loginhandler.go → internal/handler/mp/crm/customer/auth/loginhandler.go

@@ -3,7 +3,7 @@ package auth
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/customer/auth"
+	"PowerX/internal/logic/mp/crm/customer/auth"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/market/media/listmediaspagehandler.go → internal/handler/mp/crm/market/media/listmediaspagehandler.go

@@ -3,7 +3,7 @@ package media
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/market/media"
+	"PowerX/internal/logic/mp/crm/market/media"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/market/store/liststorespagehandler.go → internal/handler/mp/crm/market/store/liststorespagehandler.go

@@ -3,7 +3,7 @@ package store
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/market/store"
+	"PowerX/internal/logic/mp/crm/market/store"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/product/artisan/getartisanhandler.go → internal/handler/mp/crm/product/artisan/getartisanhandler.go

@@ -3,7 +3,7 @@ package artisan
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/product/artisan"
+	"PowerX/internal/logic/mp/crm/product/artisan"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/product/artisan/listartisanspagehandler.go → internal/handler/mp/crm/product/artisan/listartisanspagehandler.go

@@ -3,7 +3,7 @@ package artisan
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/product/artisan"
+	"PowerX/internal/logic/mp/crm/product/artisan"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/product/getproducthandler.go → internal/handler/mp/crm/product/getproducthandler.go

@@ -3,7 +3,7 @@ package product
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/product"
+	"PowerX/internal/logic/mp/crm/product"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/product/listproductcategorieshandler.go → internal/handler/mp/crm/product/listproductcategorieshandler.go

@@ -3,7 +3,7 @@ package product
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/product"
+	"PowerX/internal/logic/mp/crm/product"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/product/listproductcategorytreehandler.go → internal/handler/mp/crm/product/listproductcategorytreehandler.go

@@ -1,9 +1,9 @@
 package product
 
 import (
-	"PowerX/internal/logic/mp/product"
 	"net/http"
 
+	"PowerX/internal/logic/mp/crm/product"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/product/listproductspagehandler.go → internal/handler/mp/crm/product/listproductspagehandler.go

@@ -1,9 +1,9 @@
 package product
 
 import (
-	"PowerX/internal/logic/mp/product"
 	"net/http"
 
+	"PowerX/internal/logic/mp/crm/product"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/product/category/listproductcategorytreehandler.go → internal/handler/mp/crm/product/productstatistics/getproductstatisticshandler.go

@@ -1,24 +1,24 @@
-package category
+package productstatistics
 
 import (
-	"PowerX/internal/logic/mp/product"
 	"net/http"
 
+	"PowerX/internal/logic/mp/crm/product/productstatistics"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
-func ListProductCategoryTreeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func GetProductStatisticsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.ListProductCategoryTreeRequest
+		var req types.GetProductStatisticsRequest
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)
 			return
 		}
 
-		l := product.NewListProductCategoryTreeLogic(r.Context(), svcCtx)
-		resp, err := l.ListProductCategoryTree(&req)
+		l := productstatistics.NewGetProductStatisticsLogic(r.Context(), svcCtx)
+		resp, err := l.GetProductStatistics(&req)
 		if err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)
 		} else {

internal/handler/mp/product/liststorespagehandler.go → internal/handler/mp/crm/product/productstatistics/listproductstatisticspagehandler.go

@@ -1,24 +1,24 @@
-package product
+package productstatistics
 
 import (
-	"PowerX/internal/logic/mp/market/store"
 	"net/http"
 
+	"PowerX/internal/logic/mp/crm/product/productstatistics"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
-func ListStoresPageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func ListProductStatisticsPageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.ListStoresPageRequest
+		var req types.ListProductStatisticsPageRequest
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)
 			return
 		}
 
-		l := store.NewListStoresPageLogic(r.Context(), svcCtx)
-		resp, err := l.ListStoresPage(&req)
+		l := productstatistics.NewListProductStatisticsPageLogic(r.Context(), svcCtx)
+		resp, err := l.ListProductStatisticsPage(&req)
 		if err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)
 		} else {

internal/handler/mp/trade/address/billing/createbillingaddresshandler.go → internal/handler/mp/crm/trade/address/billing/createbillingaddresshandler.go

@@ -3,7 +3,7 @@ package billing
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/billing"
+	"PowerX/internal/logic/mp/crm/trade/address/billing"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/trade/address/billing/deletebillingaddresshandler.go → internal/handler/mp/crm/trade/address/billing/deletebillingaddresshandler.go

@@ -3,7 +3,7 @@ package billing
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/billing"
+	"PowerX/internal/logic/mp/crm/trade/address/billing"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/trade/address/billing/getbillingaddresshandler.go → internal/handler/mp/crm/trade/address/billing/getbillingaddresshandler.go

@@ -3,7 +3,7 @@ package billing
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/billing"
+	"PowerX/internal/logic/mp/crm/trade/address/billing"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/trade/address/billing/listbillingaddressespagehandler.go → internal/handler/mp/crm/trade/address/billing/listbillingaddressespagehandler.go

@@ -3,7 +3,7 @@ package billing
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/billing"
+	"PowerX/internal/logic/mp/crm/trade/address/billing"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/trade/address/billing/patchbillingaddresshandler.go → internal/handler/mp/crm/trade/address/billing/patchbillingaddresshandler.go

@@ -3,7 +3,7 @@ package billing
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/billing"
+	"PowerX/internal/logic/mp/crm/trade/address/billing"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/trade/address/billing/putbillingaddresshandler.go → internal/handler/mp/crm/trade/address/billing/putbillingaddresshandler.go

@@ -3,7 +3,7 @@ package billing
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/billing"
+	"PowerX/internal/logic/mp/crm/trade/address/billing"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/trade/address/delivery/createdeliveryaddresshandler.go → internal/handler/mp/crm/trade/address/delivery/createdeliveryaddresshandler.go

@@ -3,7 +3,7 @@ package delivery
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/delivery"
+	"PowerX/internal/logic/mp/crm/trade/address/delivery"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"

internal/handler/mp/trade/address/delivery/deletedeliveryaddresshandler.go → internal/handler/mp/crm/trade/address/delivery/deletedeliveryaddresshandler.go

@@ -3,7 +3,7 @@ package delivery
 import (
 	"net/http"
 
-	"PowerX/internal/logic/mp/trade/address/delivery"
+	"PowerX/internal/logic/mp/crm/trade/address/delivery"
 	"PowerX/internal/svc"
 	"PowerX/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"