diff --git a/api/admin.wechat.offiaccount.api b/api/admin.wechat.offiaccount.api new file mode 100644 index 00000000..a27f05f8 --- /dev/null +++ b/api/admin.wechat.offiaccount.api @@ -0,0 +1,21 @@ +import "admin/scrm/contactway.api" +//import "admin/scrm/customer.api" +//import "admin/scrm/contact.api" +// organzation +import "admin/scrm/organization/weworkemployee.api" +import "admin/scrm/organization/weworkdepartment.api" +// app +import "admin/scrm/app/weworkgroup.api" +import "admin/scrm/app/weworkapp.api" +import "admin/scrm/app/weworkappmessage.api" +// wechat.customer +import "admin/scrm/customer/weworkcustomer.api" +import "admin/scrm/customer/weworkcustomergroup.api" +// bot +import "admin/scrm/bot/weworkbot.api" +// resource +import "admin/scrm/resource/weworkresource.api" +// qrcode +import "admin/scrm/qrcode/weworkcustomergroupqrcode.api" +// tag +import "admin/scrm/tag/weworktag.api" diff --git a/api/admin/crm/business/opportunity.api b/api/admin/crm/business/opportunity.api index 5c043be4..2ebd79f8 100644 --- a/api/admin/crm/business/opportunity.api +++ b/api/admin/crm/business/opportunity.api @@ -9,7 +9,7 @@ info( ) @server( - group: admin/business/opportunity + group: admin/crm/business/opportunity prefix: /api/v1/admin/business middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/customerdomain/customer.api b/api/admin/crm/customerdomain/customer.api index 209489a8..78fad142 100644 --- a/api/admin/crm/customerdomain/customer.api +++ b/api/admin/crm/customerdomain/customer.api @@ -9,7 +9,7 @@ info( ) @server( - group: admin/customerdomain/customer + group: admin/crm/customerdomain/customer prefix: /api/v1/admin/customerdomain middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/customerdomain/lead.api b/api/admin/crm/customerdomain/lead.api index cac58451..bcc3f177 100644 --- a/api/admin/crm/customerdomain/lead.api +++ b/api/admin/crm/customerdomain/lead.api @@ -9,7 +9,7 @@ info( ) @server( - group: admin/customerdomain/leader + group: admin/crm/customerdomain/leader prefix: /api/v1/admin/customerdomain middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/market/media.api b/api/admin/crm/market/media.api index c4809543..459130ca 100644 --- a/api/admin/crm/market/media.api +++ b/api/admin/crm/market/media.api @@ -9,7 +9,7 @@ info( ) @server( - group: admin/market/media + group: admin/crm/market/media prefix: /api/v1/admin/market middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/market/store.api b/api/admin/crm/market/store.api index dfc291fa..cb462ac8 100644 --- a/api/admin/crm/market/store.api +++ b/api/admin/crm/market/store.api @@ -10,7 +10,7 @@ info( @server( - group: admin/market/store + group: admin/crm/market/store prefix: /api/v1/admin/market middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/product/artisan.api b/api/admin/crm/product/artisan.api index c00d13d2..a0412375 100644 --- a/api/admin/crm/product/artisan.api +++ b/api/admin/crm/product/artisan.api @@ -10,7 +10,7 @@ info( @server( - group: admin/product/artisan + group: admin/crm/product/artisan prefix: /api/v1/admin/product middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/product/pricebook.api b/api/admin/crm/product/pricebook.api index d0a6a49a..099b2db8 100644 --- a/api/admin/crm/product/pricebook.api +++ b/api/admin/crm/product/pricebook.api @@ -10,7 +10,7 @@ info( @server( - group: admin/product/pricebook + group: admin/crm/product/pricebook prefix: /api/v1/admin/product middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/product/pricebookentry.api b/api/admin/crm/product/pricebookentry.api index 5ddc60d7..84ddfec3 100644 --- a/api/admin/crm/product/pricebookentry.api +++ b/api/admin/crm/product/pricebookentry.api @@ -10,7 +10,7 @@ info( @server( - group: admin/product/pricebookentry + group: admin/crm/product/pricebookentry prefix: /api/v1/admin/product middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/product/product.api b/api/admin/crm/product/product.api index 73b22fd5..698ab830 100644 --- a/api/admin/crm/product/product.api +++ b/api/admin/crm/product/product.api @@ -15,7 +15,7 @@ import "./sku.api" import "./pricebookentry.api" @server( - group: admin/product + group: admin/crm/product prefix: /api/v1/admin/product middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/product/productcategory.api b/api/admin/crm/product/productcategory.api index 4aecdff4..e5a636fc 100644 --- a/api/admin/crm/product/productcategory.api +++ b/api/admin/crm/product/productcategory.api @@ -10,7 +10,7 @@ info( @server( - group: admin/product/category + group: admin/crm/product/category prefix: /api/v1/admin/product middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/product/productspecific.api b/api/admin/crm/product/productspecific.api index d63e8f36..3cd97061 100644 --- a/api/admin/crm/product/productspecific.api +++ b/api/admin/crm/product/productspecific.api @@ -9,7 +9,7 @@ info( ) @server( - group: admin/product/productspecific + group: admin/crm/product/productspecific prefix: /api/v1/admin/product middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/product/sku.api b/api/admin/crm/product/sku.api index 5e99d116..5bf0d6e1 100644 --- a/api/admin/crm/product/sku.api +++ b/api/admin/crm/product/sku.api @@ -9,7 +9,7 @@ info( ) @server( - group: admin/product/sku + group: admin/crm/product/sku prefix: /api/v1/admin/product middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/billingaddress.api b/api/admin/crm/trade/billingaddress.api index d93f9cef..28c79ab9 100644 --- a/api/admin/crm/trade/billingaddress.api +++ b/api/admin/crm/trade/billingaddress.api @@ -10,7 +10,7 @@ info( @server( - group: admin/trade/address/billing + group: admin/crm/trade/address/billing prefix: /api/v1/admin/trade/address middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/deliveryaddress.api b/api/admin/crm/trade/deliveryaddress.api index 288bc973..c18706d3 100644 --- a/api/admin/crm/trade/deliveryaddress.api +++ b/api/admin/crm/trade/deliveryaddress.api @@ -10,7 +10,7 @@ info( @server( - group: admin/trade/address/delivery + group: admin/crm/trade/address/delivery prefix: /api/v1/admin/trade/address middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/logistics.api b/api/admin/crm/trade/logistics.api index 91775169..afae36b5 100644 --- a/api/admin/crm/trade/logistics.api +++ b/api/admin/crm/trade/logistics.api @@ -9,7 +9,7 @@ info ( ) @server ( - group: admin/trade/logistics + group: admin/crm/trade/logistics prefix: /api/v1/admin/trade middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/order.api b/api/admin/crm/trade/order.api index dd75e644..5ae7225c 100644 --- a/api/admin/crm/trade/order.api +++ b/api/admin/crm/trade/order.api @@ -12,7 +12,7 @@ import "../product/product.api" import "./payment.api" @server( - group: admin/trade/order + group: admin/crm/trade/order prefix: /api/v1/admin/trade middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/payment.api b/api/admin/crm/trade/payment.api index 50f22ba1..70513843 100644 --- a/api/admin/crm/trade/payment.api +++ b/api/admin/crm/trade/payment.api @@ -10,7 +10,7 @@ info( @server( - group: admin/trade/payment + group: admin/crm/trade/payment prefix: /api/v1/admin/trade middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/refundorder.api b/api/admin/crm/trade/refundorder.api index 1a4c71d7..5f782fe3 100644 --- a/api/admin/crm/trade/refundorder.api +++ b/api/admin/crm/trade/refundorder.api @@ -11,7 +11,7 @@ info( @server( - group: admin/trade/order + group: admin/crm/trade/order prefix: /api/v1/admin/trade middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/shippingaddress.api b/api/admin/crm/trade/shippingaddress.api index 8558cf8a..30f16ad2 100644 --- a/api/admin/crm/trade/shippingaddress.api +++ b/api/admin/crm/trade/shippingaddress.api @@ -10,7 +10,7 @@ info( @server( - group: admin/trade/address/shipping + group: admin/crm/trade/address/shipping prefix: /api/v1/admin/trade/address middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/tokenproduct.api b/api/admin/crm/trade/tokenproduct.api index 043a43db..5c744dc7 100644 --- a/api/admin/crm/trade/tokenproduct.api +++ b/api/admin/crm/trade/tokenproduct.api @@ -10,7 +10,7 @@ info( @server( - group: admin/trade/token + group: admin/crm/trade/token prefix: /api/v1/admin/trade/token middleware: EmployeeJWTAuth ) diff --git a/api/admin/crm/trade/warehouse.api b/api/admin/crm/trade/warehouse.api index 7acfc1dc..80b9c9f8 100644 --- a/api/admin/crm/trade/warehouse.api +++ b/api/admin/crm/trade/warehouse.api @@ -9,7 +9,7 @@ info ( ) @server ( - group: admin/trade/warehouse + group: admin/crm/trade/warehouse prefix: /api/v1/admin/trade middleware: EmployeeJWTAuth ) diff --git a/api/admin/scrm/contactway.api b/api/admin/scrm/contactway.api index 577831d2..6ef8fdc2 100644 --- a/api/admin/scrm/contactway.api +++ b/api/admin/scrm/contactway.api @@ -9,7 +9,7 @@ info( ) @server( - group: admin/contractway + group: admin/scrm/contractway prefix: /api/v1/admin/contract-way middleware: EmployeeJWTAuth ) diff --git a/api/admin/wechat/officialaccount/menu.api b/api/admin/wechat/officialaccount/menu.api new file mode 100644 index 00000000..f3601840 --- /dev/null +++ b/api/admin/wechat/officialaccount/menu.api @@ -0,0 +1,112 @@ +syntax = "v1" + +info( + title: "菜单管理" + desc: "菜单管理" + author: "MichaelHu" + email: "matrix-x@artisan-cloud.com" + version: "v1" +) + +@server( + group: admin/wechat/officialaccount/menu + prefix: /api/v1/admin/wechat/official-account + middleware: EmployeeJWTAuth +) + +service PowerX { + @doc "查询菜单列表" + @handler QueryMenus + get /menus-tree returns (QueryMenusReply) + + @doc "请求菜单上传链接" + @handler SyncMenus + post /menus (SyncMenusRequest) returns (SyncMenusReply) + + + @doc "创建菜单" + @handler CreateMenu + post /menus (CreateMenuRequest) returns (CreateMenuReply) + + @doc "删除菜单" + @handler DeleteMenu + delete /menus returns (DeleteMenuReply) +} + +type ( + SubButton struct { + + Name string `json:"name,optional"` + Id int `json:"id,optional"` + Type string `json:"type,optional"` + Key string `json:"key,omitempty,optional"` + Url string `json:"url,omitempty,optional"` + } + + Button struct { + Name string `json:"name,optional"` + SubButton []*SubButton `json:"sub_button,optional"` + Id int `json:"id,optional"` + } + + MatchRule struct { + TagId string `json:"tag_id,optional"` + Sex string `json:"sex,optional"` + Country string `json:"country,optional"` + Province string `json:"province,optional"` + City string `json:"city,optional"` + Language string `json:"language,optional"` + } + Menu struct { + Id int64 `json:"id,optional"` + Button []*Button `json:"button,optional"` + MatchRule *MatchRule `json:"matchrule,optional"` + } +) + +type ( + SyncMenusRequest struct { + Menu + } + + SyncMenusReply struct { + success bool `json:"success,optional"` + } +) + +type ( + CreateMenuRequest struct { + Menu + } + + CreateMenuReply struct { + success bool `json:"success,optional"` + } +) + +type ( + QunerySubButton struct { + QueryList []SubButton `json:"list,optional"` + } + QueryButton struct { + Name string `json:"name,optional"` + SubButton []*QunerySubButton `json:"sub_button,optional"` + Id int `json:"id,optional"` + } + + SelfMenuInfo struct { + Button *QueryButton `json:"button,optional"` + } + + QueryMenusReply struct { + IsMenuOpen int64 `json:"is_menu_open,optional"` + SelfMenuInfo SelfMenuInfo `json:"selfmenu_info,optional"` + } +) + + +type ( + DeleteMenuReply struct { + success bool `json:"success"` + } +) \ No newline at end of file diff --git a/api/powerx.api b/api/powerx.api index 50c15080..4ea24741 100644 --- a/api/powerx.api +++ b/api/powerx.api @@ -11,6 +11,7 @@ info( import "admin.api" import "admin.crm.api" import "admin.scrm.api" +import "admin.wechat.offiaccount.api" import "mp.api" import "web.api" diff --git a/cmd/ctl/database/migrate/powerx.go b/cmd/ctl/database/migrate/powerx.go index 205d42b8..aac8c38d 100644 --- a/cmd/ctl/database/migrate/powerx.go +++ b/cmd/ctl/database/migrate/powerx.go @@ -4,21 +4,21 @@ import ( "PowerX/cmd/ctl/database/custom/migrate" "PowerX/internal/config" "PowerX/internal/model" - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/market" + "PowerX/internal/model/crm/product" + "PowerX/internal/model/crm/trade" infoorganizatoin "PowerX/internal/model/infoorganization" - "PowerX/internal/model/market" "PowerX/internal/model/media" "PowerX/internal/model/membership" "PowerX/internal/model/origanzation" "PowerX/internal/model/permission" - "PowerX/internal/model/product" "PowerX/internal/model/scene" "PowerX/internal/model/scrm/app" "PowerX/internal/model/scrm/customer" "PowerX/internal/model/scrm/organization" "PowerX/internal/model/scrm/resource" "PowerX/internal/model/scrm/tag" - "PowerX/internal/model/trade" "gorm.io/driver/mysql" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/cmd/ctl/database/seed/datadictionary/artisanlevel.go b/cmd/ctl/database/seed/datadictionary/artisanlevel.go index 173a6537..9c904a9d 100644 --- a/cmd/ctl/database/seed/datadictionary/artisanlevel.go +++ b/cmd/ctl/database/seed/datadictionary/artisanlevel.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" ) func defaultArtisanLevelDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/customertype.go b/cmd/ctl/database/seed/datadictionary/customertype.go index 10e4e01d..a4c0b61c 100644 --- a/cmd/ctl/database/seed/datadictionary/customertype.go +++ b/cmd/ctl/database/seed/datadictionary/customertype.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" ) func defaultCustomerTypeDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/mediatype.go b/cmd/ctl/database/seed/datadictionary/mediatype.go index 0963a9fa..c75a54cb 100644 --- a/cmd/ctl/database/seed/datadictionary/mediatype.go +++ b/cmd/ctl/database/seed/datadictionary/mediatype.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/market" + "PowerX/internal/model/crm/market" ) func defaultMediaTypeDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/orderstatus.go b/cmd/ctl/database/seed/datadictionary/orderstatus.go index c42beaff..96e607ae 100644 --- a/cmd/ctl/database/seed/datadictionary/orderstatus.go +++ b/cmd/ctl/database/seed/datadictionary/orderstatus.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" ) func defaultOrderStatusDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/ordertype.go b/cmd/ctl/database/seed/datadictionary/ordertype.go index 5bd49584..b9918663 100644 --- a/cmd/ctl/database/seed/datadictionary/ordertype.go +++ b/cmd/ctl/database/seed/datadictionary/ordertype.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" ) func defaultOrderTypeDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/paymentstatus.go b/cmd/ctl/database/seed/datadictionary/paymentstatus.go index 620ae5b9..71651092 100644 --- a/cmd/ctl/database/seed/datadictionary/paymentstatus.go +++ b/cmd/ctl/database/seed/datadictionary/paymentstatus.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" ) func defaultPaymentStatusDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/paymenttype.go b/cmd/ctl/database/seed/datadictionary/paymenttype.go index 544796cf..c3b5922a 100644 --- a/cmd/ctl/database/seed/datadictionary/paymenttype.go +++ b/cmd/ctl/database/seed/datadictionary/paymenttype.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" ) func defaultPaymentTypeDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/productplan.go b/cmd/ctl/database/seed/datadictionary/productplan.go index 94d76b44..07f4bdf6 100644 --- a/cmd/ctl/database/seed/datadictionary/productplan.go +++ b/cmd/ctl/database/seed/datadictionary/productplan.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" ) func defaultProductPlanDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/producttype.go b/cmd/ctl/database/seed/datadictionary/producttype.go index e5c7e5a4..f1c5763b 100644 --- a/cmd/ctl/database/seed/datadictionary/producttype.go +++ b/cmd/ctl/database/seed/datadictionary/producttype.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" ) func defaultProductTypeDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/datadictionary/token.go b/cmd/ctl/database/seed/datadictionary/token.go index edfd4dad..f3c268bc 100644 --- a/cmd/ctl/database/seed/datadictionary/token.go +++ b/cmd/ctl/database/seed/datadictionary/token.go @@ -2,7 +2,7 @@ package datadictionary import ( "PowerX/internal/model" - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" ) func defaultTokenCategoryDataDictionary() *model.DataDictionaryType { diff --git a/cmd/ctl/database/seed/order.go b/cmd/ctl/database/seed/order.go index 96bd138d..a7762d13 100644 --- a/cmd/ctl/database/seed/order.go +++ b/cmd/ctl/database/seed/order.go @@ -1,7 +1,7 @@ package seed import ( - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/uc/powerx" "context" "github.com/pkg/errors" diff --git a/cmd/ctl/database/seed/payment.go b/cmd/ctl/database/seed/payment.go index 2b69b6ee..4d819d58 100644 --- a/cmd/ctl/database/seed/payment.go +++ b/cmd/ctl/database/seed/payment.go @@ -1,7 +1,7 @@ package seed import ( - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/uc/powerx" trade2 "PowerX/internal/uc/powerx/trade" "context" diff --git a/cmd/ctl/database/seed/pricebook.go b/cmd/ctl/database/seed/pricebook.go index 4475731b..a271a9bb 100644 --- a/cmd/ctl/database/seed/pricebook.go +++ b/cmd/ctl/database/seed/pricebook.go @@ -1,7 +1,7 @@ package seed import ( - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" "PowerX/internal/types" "PowerX/internal/uc/powerx" product2 "PowerX/internal/uc/powerx/product" diff --git a/cmd/ctl/database/seed/product.go b/cmd/ctl/database/seed/product.go index 7d65b431..26452709 100644 --- a/cmd/ctl/database/seed/product.go +++ b/cmd/ctl/database/seed/product.go @@ -2,8 +2,8 @@ package seed import ( "PowerX/internal/model" + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" - "PowerX/internal/model/product" "PowerX/internal/uc/powerx" product2 "PowerX/internal/uc/powerx/product" "PowerX/pkg/mathx" diff --git a/cmd/ctl/database/seed/productcategory.go b/cmd/ctl/database/seed/productcategory.go index 9f8b8567..579e1cd7 100644 --- a/cmd/ctl/database/seed/productcategory.go +++ b/cmd/ctl/database/seed/productcategory.go @@ -2,7 +2,7 @@ package seed import ( "PowerX/internal/model" - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" "github.com/pkg/errors" "gorm.io/gorm" ) diff --git a/cmd/ctl/database/seed/token.go b/cmd/ctl/database/seed/token.go index 4e11d0d6..99191d51 100644 --- a/cmd/ctl/database/seed/token.go +++ b/cmd/ctl/database/seed/token.go @@ -1,7 +1,7 @@ package seed import ( - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/uc/powerx" "context" "github.com/pkg/errors" diff --git a/internal/handler/admin/business/opportunity/assignemployeetoopportunityhandler.go b/internal/handler/admin/crm/business/opportunity/assignemployeetoopportunityhandler.go similarity index 92% rename from internal/handler/admin/business/opportunity/assignemployeetoopportunityhandler.go rename to internal/handler/admin/crm/business/opportunity/assignemployeetoopportunityhandler.go index 0cbed4f4..48d96f0c 100644 --- a/internal/handler/admin/business/opportunity/assignemployeetoopportunityhandler.go +++ b/internal/handler/admin/crm/business/opportunity/assignemployeetoopportunityhandler.go @@ -3,7 +3,7 @@ package opportunity import ( "net/http" - "PowerX/internal/logic/admin/business/opportunity" + "PowerX/internal/logic/admin/crm/business/opportunity" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/business/opportunity/createopportunityhandler.go b/internal/handler/admin/crm/business/opportunity/createopportunityhandler.go similarity index 91% rename from internal/handler/admin/business/opportunity/createopportunityhandler.go rename to internal/handler/admin/crm/business/opportunity/createopportunityhandler.go index 6ff1b75d..a2b72e4c 100644 --- a/internal/handler/admin/business/opportunity/createopportunityhandler.go +++ b/internal/handler/admin/crm/business/opportunity/createopportunityhandler.go @@ -3,7 +3,7 @@ package opportunity import ( "net/http" - "PowerX/internal/logic/admin/business/opportunity" + "PowerX/internal/logic/admin/crm/business/opportunity" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/business/opportunity/deleteopportunityhandler.go b/internal/handler/admin/crm/business/opportunity/deleteopportunityhandler.go similarity index 91% rename from internal/handler/admin/business/opportunity/deleteopportunityhandler.go rename to internal/handler/admin/crm/business/opportunity/deleteopportunityhandler.go index 5aa5fa68..ccb74229 100644 --- a/internal/handler/admin/business/opportunity/deleteopportunityhandler.go +++ b/internal/handler/admin/crm/business/opportunity/deleteopportunityhandler.go @@ -3,7 +3,7 @@ package opportunity import ( "net/http" - "PowerX/internal/logic/admin/business/opportunity" + "PowerX/internal/logic/admin/crm/business/opportunity" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/business/opportunity/getopportunitylisthandler.go b/internal/handler/admin/crm/business/opportunity/getopportunitylisthandler.go similarity index 91% rename from internal/handler/admin/business/opportunity/getopportunitylisthandler.go rename to internal/handler/admin/crm/business/opportunity/getopportunitylisthandler.go index 4e05eae7..37f63c81 100644 --- a/internal/handler/admin/business/opportunity/getopportunitylisthandler.go +++ b/internal/handler/admin/crm/business/opportunity/getopportunitylisthandler.go @@ -3,7 +3,7 @@ package opportunity import ( "net/http" - "PowerX/internal/logic/admin/business/opportunity" + "PowerX/internal/logic/admin/crm/business/opportunity" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/business/opportunity/updateopportunityhandler.go b/internal/handler/admin/crm/business/opportunity/updateopportunityhandler.go similarity index 91% rename from internal/handler/admin/business/opportunity/updateopportunityhandler.go rename to internal/handler/admin/crm/business/opportunity/updateopportunityhandler.go index 730ecb5b..3dc87764 100644 --- a/internal/handler/admin/business/opportunity/updateopportunityhandler.go +++ b/internal/handler/admin/crm/business/opportunity/updateopportunityhandler.go @@ -3,7 +3,7 @@ package opportunity import ( "net/http" - "PowerX/internal/logic/admin/business/opportunity" + "PowerX/internal/logic/admin/crm/business/opportunity" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/crm/customerdomain/customer/assigncustomertoemployeehandler.go b/internal/handler/admin/crm/customerdomain/customer/assigncustomertoemployeehandler.go new file mode 100644 index 00000000..fd40e3d7 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/customer/assigncustomertoemployeehandler.go @@ -0,0 +1,28 @@ +package customer + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/customer" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func AssignCustomerToEmployeeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.AssignCustomerToEmployeeRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := customer.NewAssignCustomerToEmployeeLogic(r.Context(), svcCtx) + resp, err := l.AssignCustomerToEmployee(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/customer/createcustomerhandler.go b/internal/handler/admin/crm/customerdomain/customer/createcustomerhandler.go new file mode 100644 index 00000000..3dfa0176 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/customer/createcustomerhandler.go @@ -0,0 +1,28 @@ +package customer + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/customer" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func CreateCustomerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.CreateCustomerRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := customer.NewCreateCustomerLogic(r.Context(), svcCtx) + resp, err := l.CreateCustomer(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/customer/deletecustomerhandler.go b/internal/handler/admin/crm/customerdomain/customer/deletecustomerhandler.go new file mode 100644 index 00000000..ca0d3d3a --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/customer/deletecustomerhandler.go @@ -0,0 +1,28 @@ +package customer + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/customer" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func DeleteCustomerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.DeleteCustomerRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := customer.NewDeleteCustomerLogic(r.Context(), svcCtx) + resp, err := l.DeleteCustomer(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/customer/getcustomerhandler.go b/internal/handler/admin/crm/customerdomain/customer/getcustomerhandler.go new file mode 100644 index 00000000..1a4c291b --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/customer/getcustomerhandler.go @@ -0,0 +1,28 @@ +package customer + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/customer" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func GetCustomerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.GetCustomerReqeuest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := customer.NewGetCustomerLogic(r.Context(), svcCtx) + resp, err := l.GetCustomer(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/customer/listcustomerspagehandler.go b/internal/handler/admin/crm/customerdomain/customer/listcustomerspagehandler.go new file mode 100644 index 00000000..b925eba6 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/customer/listcustomerspagehandler.go @@ -0,0 +1,28 @@ +package customer + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/customer" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func ListCustomersPageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.ListCustomersPageRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := customer.NewListCustomersPageLogic(r.Context(), svcCtx) + resp, err := l.ListCustomersPage(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/customer/patchcustomerhandler.go b/internal/handler/admin/crm/customerdomain/customer/patchcustomerhandler.go new file mode 100644 index 00000000..b3128bc1 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/customer/patchcustomerhandler.go @@ -0,0 +1,28 @@ +package customer + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/customer" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func PatchCustomerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.PatchCustomerRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := customer.NewPatchCustomerLogic(r.Context(), svcCtx) + resp, err := l.PatchCustomer(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/customer/putcustomerhandler.go b/internal/handler/admin/crm/customerdomain/customer/putcustomerhandler.go new file mode 100644 index 00000000..db330be6 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/customer/putcustomerhandler.go @@ -0,0 +1,28 @@ +package customer + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/customer" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func PutCustomerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.PutCustomerRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := customer.NewPutCustomerLogic(r.Context(), svcCtx) + resp, err := l.PutCustomer(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/leader/assignleadtoemployeehandler.go b/internal/handler/admin/crm/customerdomain/leader/assignleadtoemployeehandler.go new file mode 100644 index 00000000..7b064c20 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/leader/assignleadtoemployeehandler.go @@ -0,0 +1,28 @@ +package leader + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/leader" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func AssignLeadToEmployeeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.AssignLeadToEmployeeRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := leader.NewAssignLeadToEmployeeLogic(r.Context(), svcCtx) + resp, err := l.AssignLeadToEmployee(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/leader/createleadhandler.go b/internal/handler/admin/crm/customerdomain/leader/createleadhandler.go new file mode 100644 index 00000000..2ac34163 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/leader/createleadhandler.go @@ -0,0 +1,28 @@ +package leader + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/leader" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func CreateLeadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.CreateLeadRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := leader.NewCreateLeadLogic(r.Context(), svcCtx) + resp, err := l.CreateLead(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/leader/deleteleadhandler.go b/internal/handler/admin/crm/customerdomain/leader/deleteleadhandler.go new file mode 100644 index 00000000..df85de3d --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/leader/deleteleadhandler.go @@ -0,0 +1,28 @@ +package leader + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/leader" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func DeleteLeadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.DeleteLeadRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := leader.NewDeleteLeadLogic(r.Context(), svcCtx) + resp, err := l.DeleteLead(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/leader/getleadhandler.go b/internal/handler/admin/crm/customerdomain/leader/getleadhandler.go new file mode 100644 index 00000000..2160d985 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/leader/getleadhandler.go @@ -0,0 +1,28 @@ +package leader + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/leader" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func GetLeadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.GetLeadReqeuest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := leader.NewGetLeadLogic(r.Context(), svcCtx) + resp, err := l.GetLead(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/leader/listleadspagehandler.go b/internal/handler/admin/crm/customerdomain/leader/listleadspagehandler.go new file mode 100644 index 00000000..afb307cb --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/leader/listleadspagehandler.go @@ -0,0 +1,28 @@ +package leader + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/leader" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func ListLeadsPageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.ListLeadsPageRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := leader.NewListLeadsPageLogic(r.Context(), svcCtx) + resp, err := l.ListLeadsPage(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/leader/patchleadhandler.go b/internal/handler/admin/crm/customerdomain/leader/patchleadhandler.go new file mode 100644 index 00000000..7af6e057 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/leader/patchleadhandler.go @@ -0,0 +1,28 @@ +package leader + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/leader" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func PatchLeadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.PatchLeadRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := leader.NewPatchLeadLogic(r.Context(), svcCtx) + resp, err := l.PatchLead(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/crm/customerdomain/leader/putleadhandler.go b/internal/handler/admin/crm/customerdomain/leader/putleadhandler.go new file mode 100644 index 00000000..9bdeea28 --- /dev/null +++ b/internal/handler/admin/crm/customerdomain/leader/putleadhandler.go @@ -0,0 +1,28 @@ +package leader + +import ( + "net/http" + + "PowerX/internal/logic/admin/crm/customerdomain/leader" + "PowerX/internal/svc" + "PowerX/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func PutLeadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.PutLeadRequest + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := leader.NewPutLeadLogic(r.Context(), svcCtx) + resp, err := l.PutLead(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/internal/handler/admin/market/media/createmediahandler.go b/internal/handler/admin/crm/market/media/createmediahandler.go similarity index 92% rename from internal/handler/admin/market/media/createmediahandler.go rename to internal/handler/admin/crm/market/media/createmediahandler.go index dd079426..e8e0df1d 100644 --- a/internal/handler/admin/market/media/createmediahandler.go +++ b/internal/handler/admin/crm/market/media/createmediahandler.go @@ -3,7 +3,7 @@ package media import ( "net/http" - "PowerX/internal/logic/admin/market/media" + "PowerX/internal/logic/admin/crm/market/media" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/media/deletemediahandler.go b/internal/handler/admin/crm/market/media/deletemediahandler.go similarity index 92% rename from internal/handler/admin/market/media/deletemediahandler.go rename to internal/handler/admin/crm/market/media/deletemediahandler.go index cbb1d86f..6b5b7805 100644 --- a/internal/handler/admin/market/media/deletemediahandler.go +++ b/internal/handler/admin/crm/market/media/deletemediahandler.go @@ -3,7 +3,7 @@ package media import ( "net/http" - "PowerX/internal/logic/admin/market/media" + "PowerX/internal/logic/admin/crm/market/media" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/media/getmediahandler.go b/internal/handler/admin/crm/market/media/getmediahandler.go similarity index 92% rename from internal/handler/admin/market/media/getmediahandler.go rename to internal/handler/admin/crm/market/media/getmediahandler.go index ede91b64..fe06153d 100644 --- a/internal/handler/admin/market/media/getmediahandler.go +++ b/internal/handler/admin/crm/market/media/getmediahandler.go @@ -3,7 +3,7 @@ package media import ( "net/http" - "PowerX/internal/logic/admin/market/media" + "PowerX/internal/logic/admin/crm/market/media" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/media/listmediaspagehandler.go b/internal/handler/admin/crm/market/media/listmediaspagehandler.go similarity index 92% rename from internal/handler/admin/market/media/listmediaspagehandler.go rename to internal/handler/admin/crm/market/media/listmediaspagehandler.go index cfa2d0a7..f6d88ede 100644 --- a/internal/handler/admin/market/media/listmediaspagehandler.go +++ b/internal/handler/admin/crm/market/media/listmediaspagehandler.go @@ -3,7 +3,7 @@ package media import ( "net/http" - "PowerX/internal/logic/admin/market/media" + "PowerX/internal/logic/admin/crm/market/media" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/media/updatemediahandler.go b/internal/handler/admin/crm/market/media/updatemediahandler.go similarity index 92% rename from internal/handler/admin/market/media/updatemediahandler.go rename to internal/handler/admin/crm/market/media/updatemediahandler.go index b48a3cfa..c297447c 100644 --- a/internal/handler/admin/market/media/updatemediahandler.go +++ b/internal/handler/admin/crm/market/media/updatemediahandler.go @@ -3,7 +3,7 @@ package media import ( "net/http" - "PowerX/internal/logic/admin/market/media" + "PowerX/internal/logic/admin/crm/market/media" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/store/assignstoretostoremanagerhandler.go b/internal/handler/admin/crm/market/store/assignstoretostoremanagerhandler.go similarity index 93% rename from internal/handler/admin/market/store/assignstoretostoremanagerhandler.go rename to internal/handler/admin/crm/market/store/assignstoretostoremanagerhandler.go index 12ebed71..fb593c1f 100644 --- a/internal/handler/admin/market/store/assignstoretostoremanagerhandler.go +++ b/internal/handler/admin/crm/market/store/assignstoretostoremanagerhandler.go @@ -1,9 +1,9 @@ package store import ( - "PowerX/internal/logic/admin/market/store" "net/http" + "PowerX/internal/logic/admin/crm/market/store" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/store/createstorehandler.go b/internal/handler/admin/crm/market/store/createstorehandler.go similarity index 92% rename from internal/handler/admin/market/store/createstorehandler.go rename to internal/handler/admin/crm/market/store/createstorehandler.go index 51b64e3a..3c7c7c8e 100644 --- a/internal/handler/admin/market/store/createstorehandler.go +++ b/internal/handler/admin/crm/market/store/createstorehandler.go @@ -1,9 +1,9 @@ package store import ( - "PowerX/internal/logic/admin/market/store" "net/http" + "PowerX/internal/logic/admin/crm/market/store" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/store/deletestorehandler.go b/internal/handler/admin/crm/market/store/deletestorehandler.go similarity index 92% rename from internal/handler/admin/market/store/deletestorehandler.go rename to internal/handler/admin/crm/market/store/deletestorehandler.go index 6013e89b..5db93375 100644 --- a/internal/handler/admin/market/store/deletestorehandler.go +++ b/internal/handler/admin/crm/market/store/deletestorehandler.go @@ -1,9 +1,9 @@ package store import ( - "PowerX/internal/logic/admin/market/store" "net/http" + "PowerX/internal/logic/admin/crm/market/store" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/store/getstorehandler.go b/internal/handler/admin/crm/market/store/getstorehandler.go similarity index 92% rename from internal/handler/admin/market/store/getstorehandler.go rename to internal/handler/admin/crm/market/store/getstorehandler.go index 0359dcf9..c51ec3bb 100644 --- a/internal/handler/admin/market/store/getstorehandler.go +++ b/internal/handler/admin/crm/market/store/getstorehandler.go @@ -1,9 +1,9 @@ package store import ( - "PowerX/internal/logic/admin/market/store" "net/http" + "PowerX/internal/logic/admin/crm/market/store" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/store/liststorespagehandler.go b/internal/handler/admin/crm/market/store/liststorespagehandler.go similarity index 92% rename from internal/handler/admin/market/store/liststorespagehandler.go rename to internal/handler/admin/crm/market/store/liststorespagehandler.go index b3a26008..05e85703 100644 --- a/internal/handler/admin/market/store/liststorespagehandler.go +++ b/internal/handler/admin/crm/market/store/liststorespagehandler.go @@ -1,9 +1,9 @@ package store import ( - "PowerX/internal/logic/admin/market/store" "net/http" + "PowerX/internal/logic/admin/crm/market/store" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/market/store/putstorehandler.go b/internal/handler/admin/crm/market/store/putstorehandler.go similarity index 92% rename from internal/handler/admin/market/store/putstorehandler.go rename to internal/handler/admin/crm/market/store/putstorehandler.go index d094685a..15c28f5c 100644 --- a/internal/handler/admin/market/store/putstorehandler.go +++ b/internal/handler/admin/crm/market/store/putstorehandler.go @@ -1,9 +1,9 @@ package store import ( - "PowerX/internal/logic/admin/market/store" "net/http" + "PowerX/internal/logic/admin/crm/market/store" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/artisan/bindartisantostorehandler.go b/internal/handler/admin/crm/product/artisan/bindartisantostorehandler.go similarity index 92% rename from internal/handler/admin/product/artisan/bindartisantostorehandler.go rename to internal/handler/admin/crm/product/artisan/bindartisantostorehandler.go index ab124bc1..6036ee8a 100644 --- a/internal/handler/admin/product/artisan/bindartisantostorehandler.go +++ b/internal/handler/admin/crm/product/artisan/bindartisantostorehandler.go @@ -3,7 +3,7 @@ package artisan import ( "net/http" - "PowerX/internal/logic/admin/product/artisan" + "PowerX/internal/logic/admin/crm/product/artisan" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/artisan/createartisanhandler.go b/internal/handler/admin/crm/product/artisan/createartisanhandler.go similarity index 92% rename from internal/handler/admin/product/artisan/createartisanhandler.go rename to internal/handler/admin/crm/product/artisan/createartisanhandler.go index e00401b0..79162ec8 100644 --- a/internal/handler/admin/product/artisan/createartisanhandler.go +++ b/internal/handler/admin/crm/product/artisan/createartisanhandler.go @@ -3,7 +3,7 @@ package artisan import ( "net/http" - "PowerX/internal/logic/admin/product/artisan" + "PowerX/internal/logic/admin/crm/product/artisan" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/artisan/deleteartisanhandler.go b/internal/handler/admin/crm/product/artisan/deleteartisanhandler.go similarity index 92% rename from internal/handler/admin/product/artisan/deleteartisanhandler.go rename to internal/handler/admin/crm/product/artisan/deleteartisanhandler.go index 08780e45..664becc9 100644 --- a/internal/handler/admin/product/artisan/deleteartisanhandler.go +++ b/internal/handler/admin/crm/product/artisan/deleteartisanhandler.go @@ -3,7 +3,7 @@ package artisan import ( "net/http" - "PowerX/internal/logic/admin/product/artisan" + "PowerX/internal/logic/admin/crm/product/artisan" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/artisan/getartisanhandler.go b/internal/handler/admin/crm/product/artisan/getartisanhandler.go similarity index 92% rename from internal/handler/admin/product/artisan/getartisanhandler.go rename to internal/handler/admin/crm/product/artisan/getartisanhandler.go index 09874f3d..d5dd2a8a 100644 --- a/internal/handler/admin/product/artisan/getartisanhandler.go +++ b/internal/handler/admin/crm/product/artisan/getartisanhandler.go @@ -3,7 +3,7 @@ package artisan import ( "net/http" - "PowerX/internal/logic/admin/product/artisan" + "PowerX/internal/logic/admin/crm/product/artisan" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/artisan/listartisanspagehandler.go b/internal/handler/admin/crm/product/artisan/listartisanspagehandler.go similarity index 92% rename from internal/handler/admin/product/artisan/listartisanspagehandler.go rename to internal/handler/admin/crm/product/artisan/listartisanspagehandler.go index fa73d9e9..845f2b00 100644 --- a/internal/handler/admin/product/artisan/listartisanspagehandler.go +++ b/internal/handler/admin/crm/product/artisan/listartisanspagehandler.go @@ -3,7 +3,7 @@ package artisan import ( "net/http" - "PowerX/internal/logic/admin/product/artisan" + "PowerX/internal/logic/admin/crm/product/artisan" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/artisan/putartisanhandler.go b/internal/handler/admin/crm/product/artisan/putartisanhandler.go similarity index 92% rename from internal/handler/admin/product/artisan/putartisanhandler.go rename to internal/handler/admin/crm/product/artisan/putartisanhandler.go index 1d1c5b1e..1f44b205 100644 --- a/internal/handler/admin/product/artisan/putartisanhandler.go +++ b/internal/handler/admin/crm/product/artisan/putartisanhandler.go @@ -3,7 +3,7 @@ package artisan import ( "net/http" - "PowerX/internal/logic/admin/product/artisan" + "PowerX/internal/logic/admin/crm/product/artisan" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/assignproducttoproductcategoryhandler.go b/internal/handler/admin/crm/product/assignproducttoproductcategoryhandler.go similarity index 94% rename from internal/handler/admin/product/assignproducttoproductcategoryhandler.go rename to internal/handler/admin/crm/product/assignproducttoproductcategoryhandler.go index 5a8897f0..37ae83cc 100644 --- a/internal/handler/admin/product/assignproducttoproductcategoryhandler.go +++ b/internal/handler/admin/crm/product/assignproducttoproductcategoryhandler.go @@ -3,7 +3,7 @@ package product import ( "net/http" - "PowerX/internal/logic/admin/product" + "PowerX/internal/logic/admin/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/category/createproductcategoryhandler.go b/internal/handler/admin/crm/product/category/createproductcategoryhandler.go similarity index 92% rename from internal/handler/admin/product/category/createproductcategoryhandler.go rename to internal/handler/admin/crm/product/category/createproductcategoryhandler.go index 3b563274..0dca199f 100644 --- a/internal/handler/admin/product/category/createproductcategoryhandler.go +++ b/internal/handler/admin/crm/product/category/createproductcategoryhandler.go @@ -3,7 +3,7 @@ package category import ( "net/http" - "PowerX/internal/logic/admin/product/category" + "PowerX/internal/logic/admin/crm/product/category" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/category/deleteproductcategoryhandler.go b/internal/handler/admin/crm/product/category/deleteproductcategoryhandler.go similarity index 92% rename from internal/handler/admin/product/category/deleteproductcategoryhandler.go rename to internal/handler/admin/crm/product/category/deleteproductcategoryhandler.go index 91df5326..86dc4103 100644 --- a/internal/handler/admin/product/category/deleteproductcategoryhandler.go +++ b/internal/handler/admin/crm/product/category/deleteproductcategoryhandler.go @@ -1,9 +1,9 @@ package category import ( - "PowerX/internal/logic/admin/product/category" "net/http" + "PowerX/internal/logic/admin/crm/product/category" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/category/getproductcategoryhandler.go b/internal/handler/admin/crm/product/category/getproductcategoryhandler.go similarity index 92% rename from internal/handler/admin/product/category/getproductcategoryhandler.go rename to internal/handler/admin/crm/product/category/getproductcategoryhandler.go index 95793b56..0212de12 100644 --- a/internal/handler/admin/product/category/getproductcategoryhandler.go +++ b/internal/handler/admin/crm/product/category/getproductcategoryhandler.go @@ -1,9 +1,9 @@ package category import ( - "PowerX/internal/logic/admin/product/category" "net/http" + "PowerX/internal/logic/admin/crm/product/category" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/category/listproductcategorytreehandler.go b/internal/handler/admin/crm/product/category/listproductcategorytreehandler.go similarity index 92% rename from internal/handler/admin/product/category/listproductcategorytreehandler.go rename to internal/handler/admin/crm/product/category/listproductcategorytreehandler.go index 59481082..f7d97b1f 100644 --- a/internal/handler/admin/product/category/listproductcategorytreehandler.go +++ b/internal/handler/admin/crm/product/category/listproductcategorytreehandler.go @@ -1,9 +1,9 @@ package category import ( - "PowerX/internal/logic/admin/product/category" "net/http" + "PowerX/internal/logic/admin/crm/product/category" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/category/patchproductcategoryhandler.go b/internal/handler/admin/crm/product/category/patchproductcategoryhandler.go similarity index 92% rename from internal/handler/admin/product/category/patchproductcategoryhandler.go rename to internal/handler/admin/crm/product/category/patchproductcategoryhandler.go index 0ca49df5..3a9f10ef 100644 --- a/internal/handler/admin/product/category/patchproductcategoryhandler.go +++ b/internal/handler/admin/crm/product/category/patchproductcategoryhandler.go @@ -1,9 +1,9 @@ package category import ( - "PowerX/internal/logic/admin/product/category" "net/http" + "PowerX/internal/logic/admin/crm/product/category" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/category/updateproductcategoryhandler.go b/internal/handler/admin/crm/product/category/updateproductcategoryhandler.go similarity index 92% rename from internal/handler/admin/product/category/updateproductcategoryhandler.go rename to internal/handler/admin/crm/product/category/updateproductcategoryhandler.go index 3f6e5b98..dd3cd820 100644 --- a/internal/handler/admin/product/category/updateproductcategoryhandler.go +++ b/internal/handler/admin/crm/product/category/updateproductcategoryhandler.go @@ -3,7 +3,7 @@ package category import ( "net/http" - "PowerX/internal/logic/admin/product/category" + "PowerX/internal/logic/admin/crm/product/category" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/createproducthandler.go b/internal/handler/admin/crm/product/createproducthandler.go similarity index 93% rename from internal/handler/admin/product/createproducthandler.go rename to internal/handler/admin/crm/product/createproducthandler.go index dbf41a96..ab2cc966 100644 --- a/internal/handler/admin/product/createproducthandler.go +++ b/internal/handler/admin/crm/product/createproducthandler.go @@ -3,7 +3,7 @@ package product import ( "net/http" - "PowerX/internal/logic/admin/product" + "PowerX/internal/logic/admin/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/deleteproducthandler.go b/internal/handler/admin/crm/product/deleteproducthandler.go similarity index 93% rename from internal/handler/admin/product/deleteproducthandler.go rename to internal/handler/admin/crm/product/deleteproducthandler.go index 544f393e..a4da1820 100644 --- a/internal/handler/admin/product/deleteproducthandler.go +++ b/internal/handler/admin/crm/product/deleteproducthandler.go @@ -3,7 +3,7 @@ package product import ( "net/http" - "PowerX/internal/logic/admin/product" + "PowerX/internal/logic/admin/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/getproducthandler.go b/internal/handler/admin/crm/product/getproducthandler.go similarity index 93% rename from internal/handler/admin/product/getproducthandler.go rename to internal/handler/admin/crm/product/getproducthandler.go index bebabe12..04b6d037 100644 --- a/internal/handler/admin/product/getproducthandler.go +++ b/internal/handler/admin/crm/product/getproducthandler.go @@ -3,7 +3,7 @@ package product import ( "net/http" - "PowerX/internal/logic/admin/product" + "PowerX/internal/logic/admin/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/listproductspagehandler.go b/internal/handler/admin/crm/product/listproductspagehandler.go similarity index 93% rename from internal/handler/admin/product/listproductspagehandler.go rename to internal/handler/admin/crm/product/listproductspagehandler.go index 138a8f3c..82e693e7 100644 --- a/internal/handler/admin/product/listproductspagehandler.go +++ b/internal/handler/admin/crm/product/listproductspagehandler.go @@ -3,7 +3,7 @@ package product import ( "net/http" - "PowerX/internal/logic/admin/product" + "PowerX/internal/logic/admin/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/patchproducthandler.go b/internal/handler/admin/crm/product/patchproducthandler.go similarity index 93% rename from internal/handler/admin/product/patchproducthandler.go rename to internal/handler/admin/crm/product/patchproducthandler.go index a5a236c9..d9db287b 100644 --- a/internal/handler/admin/product/patchproducthandler.go +++ b/internal/handler/admin/crm/product/patchproducthandler.go @@ -3,7 +3,7 @@ package product import ( "net/http" - "PowerX/internal/logic/admin/product" + "PowerX/internal/logic/admin/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebook/deletepricebookhandler.go b/internal/handler/admin/crm/product/pricebook/deletepricebookhandler.go similarity index 92% rename from internal/handler/admin/product/pricebook/deletepricebookhandler.go rename to internal/handler/admin/crm/product/pricebook/deletepricebookhandler.go index 0808ff95..1a842d29 100644 --- a/internal/handler/admin/product/pricebook/deletepricebookhandler.go +++ b/internal/handler/admin/crm/product/pricebook/deletepricebookhandler.go @@ -1,9 +1,9 @@ package pricebook import ( - "PowerX/internal/logic/admin/product/pricebook" "net/http" + "PowerX/internal/logic/admin/crm/product/pricebook" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebook/getpricebookhandler.go b/internal/handler/admin/crm/product/pricebook/getpricebookhandler.go similarity index 92% rename from internal/handler/admin/product/pricebook/getpricebookhandler.go rename to internal/handler/admin/crm/product/pricebook/getpricebookhandler.go index fff5c035..740cbd92 100644 --- a/internal/handler/admin/product/pricebook/getpricebookhandler.go +++ b/internal/handler/admin/crm/product/pricebook/getpricebookhandler.go @@ -1,9 +1,9 @@ package pricebook import ( - "PowerX/internal/logic/admin/product/pricebook" "net/http" + "PowerX/internal/logic/admin/crm/product/pricebook" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebook/listpricebookshandler.go b/internal/handler/admin/crm/product/pricebook/listpricebookshandler.go similarity index 92% rename from internal/handler/admin/product/pricebook/listpricebookshandler.go rename to internal/handler/admin/crm/product/pricebook/listpricebookshandler.go index 23e3e4ef..8c9dae47 100644 --- a/internal/handler/admin/product/pricebook/listpricebookshandler.go +++ b/internal/handler/admin/crm/product/pricebook/listpricebookshandler.go @@ -1,9 +1,9 @@ package pricebook import ( - "PowerX/internal/logic/admin/product/pricebook" "net/http" + "PowerX/internal/logic/admin/crm/product/pricebook" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebook/upsertpricebookhandler.go b/internal/handler/admin/crm/product/pricebook/upsertpricebookhandler.go similarity index 92% rename from internal/handler/admin/product/pricebook/upsertpricebookhandler.go rename to internal/handler/admin/crm/product/pricebook/upsertpricebookhandler.go index 7ee6662d..919f5fa2 100644 --- a/internal/handler/admin/product/pricebook/upsertpricebookhandler.go +++ b/internal/handler/admin/crm/product/pricebook/upsertpricebookhandler.go @@ -1,9 +1,9 @@ package pricebook import ( - "PowerX/internal/logic/admin/product/pricebook" "net/http" + "PowerX/internal/logic/admin/crm/product/pricebook" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebookentry/configpricebookentryhandler.go b/internal/handler/admin/crm/product/pricebookentry/configpricebookentryhandler.go similarity index 91% rename from internal/handler/admin/product/pricebookentry/configpricebookentryhandler.go rename to internal/handler/admin/crm/product/pricebookentry/configpricebookentryhandler.go index eabea316..5d66f575 100644 --- a/internal/handler/admin/product/pricebookentry/configpricebookentryhandler.go +++ b/internal/handler/admin/crm/product/pricebookentry/configpricebookentryhandler.go @@ -3,7 +3,7 @@ package pricebookentry import ( "net/http" - "PowerX/internal/logic/admin/product/pricebookentry" + "PowerX/internal/logic/admin/crm/product/pricebookentry" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebookentry/deletepricebookentryhandler.go b/internal/handler/admin/crm/product/pricebookentry/deletepricebookentryhandler.go similarity index 91% rename from internal/handler/admin/product/pricebookentry/deletepricebookentryhandler.go rename to internal/handler/admin/crm/product/pricebookentry/deletepricebookentryhandler.go index 16767fba..faf68094 100644 --- a/internal/handler/admin/product/pricebookentry/deletepricebookentryhandler.go +++ b/internal/handler/admin/crm/product/pricebookentry/deletepricebookentryhandler.go @@ -3,7 +3,7 @@ package pricebookentry import ( "net/http" - "PowerX/internal/logic/admin/product/pricebookentry" + "PowerX/internal/logic/admin/crm/product/pricebookentry" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebookentry/getpricebookentryhandler.go b/internal/handler/admin/crm/product/pricebookentry/getpricebookentryhandler.go similarity index 91% rename from internal/handler/admin/product/pricebookentry/getpricebookentryhandler.go rename to internal/handler/admin/crm/product/pricebookentry/getpricebookentryhandler.go index 55bd3d28..b994ac37 100644 --- a/internal/handler/admin/product/pricebookentry/getpricebookentryhandler.go +++ b/internal/handler/admin/crm/product/pricebookentry/getpricebookentryhandler.go @@ -3,7 +3,7 @@ package pricebookentry import ( "net/http" - "PowerX/internal/logic/admin/product/pricebookentry" + "PowerX/internal/logic/admin/crm/product/pricebookentry" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebookentry/listpricebookentrieshandler.go b/internal/handler/admin/crm/product/pricebookentry/listpricebookentrieshandler.go similarity index 91% rename from internal/handler/admin/product/pricebookentry/listpricebookentrieshandler.go rename to internal/handler/admin/crm/product/pricebookentry/listpricebookentrieshandler.go index 2e3b9872..0989d701 100644 --- a/internal/handler/admin/product/pricebookentry/listpricebookentrieshandler.go +++ b/internal/handler/admin/crm/product/pricebookentry/listpricebookentrieshandler.go @@ -3,7 +3,7 @@ package pricebookentry import ( "net/http" - "PowerX/internal/logic/admin/product/pricebookentry" + "PowerX/internal/logic/admin/crm/product/pricebookentry" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/pricebookentry/updatepricebookentryhandler.go b/internal/handler/admin/crm/product/pricebookentry/updatepricebookentryhandler.go similarity index 91% rename from internal/handler/admin/product/pricebookentry/updatepricebookentryhandler.go rename to internal/handler/admin/crm/product/pricebookentry/updatepricebookentryhandler.go index 75a9efcb..d23efa7e 100644 --- a/internal/handler/admin/product/pricebookentry/updatepricebookentryhandler.go +++ b/internal/handler/admin/crm/product/pricebookentry/updatepricebookentryhandler.go @@ -3,7 +3,7 @@ package pricebookentry import ( "net/http" - "PowerX/internal/logic/admin/product/pricebookentry" + "PowerX/internal/logic/admin/crm/product/pricebookentry" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/productspecific/configproductspecifichandler.go b/internal/handler/admin/crm/product/productspecific/configproductspecifichandler.go similarity index 91% rename from internal/handler/admin/product/productspecific/configproductspecifichandler.go rename to internal/handler/admin/crm/product/productspecific/configproductspecifichandler.go index 10e912f3..3db3b282 100644 --- a/internal/handler/admin/product/productspecific/configproductspecifichandler.go +++ b/internal/handler/admin/crm/product/productspecific/configproductspecifichandler.go @@ -3,7 +3,7 @@ package productspecific import ( "net/http" - "PowerX/internal/logic/admin/product/productspecific" + "PowerX/internal/logic/admin/crm/product/productspecific" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/productspecific/createproductspecifichandler.go b/internal/handler/admin/crm/product/productspecific/createproductspecifichandler.go similarity index 91% rename from internal/handler/admin/product/productspecific/createproductspecifichandler.go rename to internal/handler/admin/crm/product/productspecific/createproductspecifichandler.go index ce7a88c0..a7b3e71b 100644 --- a/internal/handler/admin/product/productspecific/createproductspecifichandler.go +++ b/internal/handler/admin/crm/product/productspecific/createproductspecifichandler.go @@ -1,9 +1,9 @@ package productspecific import ( - "PowerX/internal/logic/admin/product/productspecific" "net/http" + "PowerX/internal/logic/admin/crm/product/productspecific" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/productspecific/deleteproductspecifichandler.go b/internal/handler/admin/crm/product/productspecific/deleteproductspecifichandler.go similarity index 91% rename from internal/handler/admin/product/productspecific/deleteproductspecifichandler.go rename to internal/handler/admin/crm/product/productspecific/deleteproductspecifichandler.go index 0c119b80..4b9c642f 100644 --- a/internal/handler/admin/product/productspecific/deleteproductspecifichandler.go +++ b/internal/handler/admin/crm/product/productspecific/deleteproductspecifichandler.go @@ -1,9 +1,9 @@ package productspecific import ( - "PowerX/internal/logic/admin/product/productspecific" "net/http" + "PowerX/internal/logic/admin/crm/product/productspecific" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/productspecific/getproductspecifichandler.go b/internal/handler/admin/crm/product/productspecific/getproductspecifichandler.go similarity index 91% rename from internal/handler/admin/product/productspecific/getproductspecifichandler.go rename to internal/handler/admin/crm/product/productspecific/getproductspecifichandler.go index c12eb262..6e4de63b 100644 --- a/internal/handler/admin/product/productspecific/getproductspecifichandler.go +++ b/internal/handler/admin/crm/product/productspecific/getproductspecifichandler.go @@ -1,9 +1,9 @@ package productspecific import ( - "PowerX/internal/logic/admin/product/productspecific" "net/http" + "PowerX/internal/logic/admin/crm/product/productspecific" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/productspecific/listproductspecificpagehandler.go b/internal/handler/admin/crm/product/productspecific/listproductspecificpagehandler.go similarity index 91% rename from internal/handler/admin/product/productspecific/listproductspecificpagehandler.go rename to internal/handler/admin/crm/product/productspecific/listproductspecificpagehandler.go index 7c55cbe9..1611bde5 100644 --- a/internal/handler/admin/product/productspecific/listproductspecificpagehandler.go +++ b/internal/handler/admin/crm/product/productspecific/listproductspecificpagehandler.go @@ -1,9 +1,9 @@ package productspecific import ( - "PowerX/internal/logic/admin/product/productspecific" "net/http" + "PowerX/internal/logic/admin/crm/product/productspecific" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/productspecific/patchproductspecifichandler.go b/internal/handler/admin/crm/product/productspecific/patchproductspecifichandler.go similarity index 91% rename from internal/handler/admin/product/productspecific/patchproductspecifichandler.go rename to internal/handler/admin/crm/product/productspecific/patchproductspecifichandler.go index f7525819..22835579 100644 --- a/internal/handler/admin/product/productspecific/patchproductspecifichandler.go +++ b/internal/handler/admin/crm/product/productspecific/patchproductspecifichandler.go @@ -1,9 +1,9 @@ package productspecific import ( - "PowerX/internal/logic/admin/product/productspecific" "net/http" + "PowerX/internal/logic/admin/crm/product/productspecific" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/productspecific/putproductspecifichandler.go b/internal/handler/admin/crm/product/productspecific/putproductspecifichandler.go similarity index 91% rename from internal/handler/admin/product/productspecific/putproductspecifichandler.go rename to internal/handler/admin/crm/product/productspecific/putproductspecifichandler.go index cf7b7980..31118c58 100644 --- a/internal/handler/admin/product/productspecific/putproductspecifichandler.go +++ b/internal/handler/admin/crm/product/productspecific/putproductspecifichandler.go @@ -1,9 +1,9 @@ package productspecific import ( - "PowerX/internal/logic/admin/product/productspecific" "net/http" + "PowerX/internal/logic/admin/crm/product/productspecific" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/putproducthandler.go b/internal/handler/admin/crm/product/putproducthandler.go similarity index 93% rename from internal/handler/admin/product/putproducthandler.go rename to internal/handler/admin/crm/product/putproducthandler.go index c41f09b5..d52af5ce 100644 --- a/internal/handler/admin/product/putproducthandler.go +++ b/internal/handler/admin/crm/product/putproducthandler.go @@ -3,7 +3,7 @@ package product import ( "net/http" - "PowerX/internal/logic/admin/product" + "PowerX/internal/logic/admin/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/sku/configskuhandler.go b/internal/handler/admin/crm/product/sku/configskuhandler.go similarity index 92% rename from internal/handler/admin/product/sku/configskuhandler.go rename to internal/handler/admin/crm/product/sku/configskuhandler.go index fc92e839..6ab050fb 100644 --- a/internal/handler/admin/product/sku/configskuhandler.go +++ b/internal/handler/admin/crm/product/sku/configskuhandler.go @@ -3,7 +3,7 @@ package sku import ( "net/http" - "PowerX/internal/logic/admin/product/sku" + "PowerX/internal/logic/admin/crm/product/sku" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/sku/createskuhandler.go b/internal/handler/admin/crm/product/sku/createskuhandler.go similarity index 92% rename from internal/handler/admin/product/sku/createskuhandler.go rename to internal/handler/admin/crm/product/sku/createskuhandler.go index 6b658a2a..aa73a7ba 100644 --- a/internal/handler/admin/product/sku/createskuhandler.go +++ b/internal/handler/admin/crm/product/sku/createskuhandler.go @@ -3,7 +3,7 @@ package sku import ( "net/http" - "PowerX/internal/logic/admin/product/sku" + "PowerX/internal/logic/admin/crm/product/sku" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/sku/deleteskuhandler.go b/internal/handler/admin/crm/product/sku/deleteskuhandler.go similarity index 92% rename from internal/handler/admin/product/sku/deleteskuhandler.go rename to internal/handler/admin/crm/product/sku/deleteskuhandler.go index 2f0a24c4..9014e41c 100644 --- a/internal/handler/admin/product/sku/deleteskuhandler.go +++ b/internal/handler/admin/crm/product/sku/deleteskuhandler.go @@ -3,7 +3,7 @@ package sku import ( "net/http" - "PowerX/internal/logic/admin/product/sku" + "PowerX/internal/logic/admin/crm/product/sku" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/sku/getskuhandler.go b/internal/handler/admin/crm/product/sku/getskuhandler.go similarity index 92% rename from internal/handler/admin/product/sku/getskuhandler.go rename to internal/handler/admin/crm/product/sku/getskuhandler.go index 7cd15e25..74bff8da 100644 --- a/internal/handler/admin/product/sku/getskuhandler.go +++ b/internal/handler/admin/crm/product/sku/getskuhandler.go @@ -3,7 +3,7 @@ package sku import ( "net/http" - "PowerX/internal/logic/admin/product/sku" + "PowerX/internal/logic/admin/crm/product/sku" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/sku/listskupagehandler.go b/internal/handler/admin/crm/product/sku/listskupagehandler.go similarity index 92% rename from internal/handler/admin/product/sku/listskupagehandler.go rename to internal/handler/admin/crm/product/sku/listskupagehandler.go index e9256334..2370ae94 100644 --- a/internal/handler/admin/product/sku/listskupagehandler.go +++ b/internal/handler/admin/crm/product/sku/listskupagehandler.go @@ -3,7 +3,7 @@ package sku import ( "net/http" - "PowerX/internal/logic/admin/product/sku" + "PowerX/internal/logic/admin/crm/product/sku" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/sku/patchskuhandler.go b/internal/handler/admin/crm/product/sku/patchskuhandler.go similarity index 92% rename from internal/handler/admin/product/sku/patchskuhandler.go rename to internal/handler/admin/crm/product/sku/patchskuhandler.go index 6afbe8ce..d1a4aa66 100644 --- a/internal/handler/admin/product/sku/patchskuhandler.go +++ b/internal/handler/admin/crm/product/sku/patchskuhandler.go @@ -3,7 +3,7 @@ package sku import ( "net/http" - "PowerX/internal/logic/admin/product/sku" + "PowerX/internal/logic/admin/crm/product/sku" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/product/sku/putskuhandler.go b/internal/handler/admin/crm/product/sku/putskuhandler.go similarity index 92% rename from internal/handler/admin/product/sku/putskuhandler.go rename to internal/handler/admin/crm/product/sku/putskuhandler.go index d6f14a3d..71b694a0 100644 --- a/internal/handler/admin/product/sku/putskuhandler.go +++ b/internal/handler/admin/crm/product/sku/putskuhandler.go @@ -3,7 +3,7 @@ package sku import ( "net/http" - "PowerX/internal/logic/admin/product/sku" + "PowerX/internal/logic/admin/crm/product/sku" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/billing/createbillingaddresshandler.go b/internal/handler/admin/crm/trade/address/billing/createbillingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/billing/createbillingaddresshandler.go rename to internal/handler/admin/crm/trade/address/billing/createbillingaddresshandler.go index 5629afa0..341dee2c 100644 --- a/internal/handler/admin/trade/address/billing/createbillingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/billing/createbillingaddresshandler.go @@ -1,9 +1,9 @@ package billing import ( - "PowerX/internal/logic/admin/trade/address/billing" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/billing" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/billing/deletebillingaddresshandler.go b/internal/handler/admin/crm/trade/address/billing/deletebillingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/billing/deletebillingaddresshandler.go rename to internal/handler/admin/crm/trade/address/billing/deletebillingaddresshandler.go index e3084b21..de9bf033 100644 --- a/internal/handler/admin/trade/address/billing/deletebillingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/billing/deletebillingaddresshandler.go @@ -1,9 +1,9 @@ package billing import ( - "PowerX/internal/logic/admin/trade/address/billing" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/billing" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/billing/getbillingaddresshandler.go b/internal/handler/admin/crm/trade/address/billing/getbillingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/billing/getbillingaddresshandler.go rename to internal/handler/admin/crm/trade/address/billing/getbillingaddresshandler.go index eb8d59f6..d546e80c 100644 --- a/internal/handler/admin/trade/address/billing/getbillingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/billing/getbillingaddresshandler.go @@ -1,9 +1,9 @@ package billing import ( - "PowerX/internal/logic/admin/trade/address/billing" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/billing" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/billing/listbillingaddressespagehandler.go b/internal/handler/admin/crm/trade/address/billing/listbillingaddressespagehandler.go similarity index 92% rename from internal/handler/admin/trade/address/billing/listbillingaddressespagehandler.go rename to internal/handler/admin/crm/trade/address/billing/listbillingaddressespagehandler.go index e47db028..bd8f7e82 100644 --- a/internal/handler/admin/trade/address/billing/listbillingaddressespagehandler.go +++ b/internal/handler/admin/crm/trade/address/billing/listbillingaddressespagehandler.go @@ -1,9 +1,9 @@ package billing import ( - "PowerX/internal/logic/admin/trade/address/billing" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/billing" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/billing/patchbillingaddresshandler.go b/internal/handler/admin/crm/trade/address/billing/patchbillingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/billing/patchbillingaddresshandler.go rename to internal/handler/admin/crm/trade/address/billing/patchbillingaddresshandler.go index 9cba4a2b..dc177b8a 100644 --- a/internal/handler/admin/trade/address/billing/patchbillingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/billing/patchbillingaddresshandler.go @@ -1,9 +1,9 @@ package billing import ( - "PowerX/internal/logic/admin/trade/address/billing" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/billing" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/billing/putbillingaddresshandler.go b/internal/handler/admin/crm/trade/address/billing/putbillingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/billing/putbillingaddresshandler.go rename to internal/handler/admin/crm/trade/address/billing/putbillingaddresshandler.go index 0a44b620..a3153af1 100644 --- a/internal/handler/admin/trade/address/billing/putbillingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/billing/putbillingaddresshandler.go @@ -1,11 +1,12 @@ package billing import ( - "PowerX/internal/logic/admin/trade/address/billing" + "net/http" + + "PowerX/internal/logic/admin/crm/trade/address/billing" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" - "net/http" ) func PutBillingAddressHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/internal/handler/admin/trade/address/delivery/createdeliveryaddresshandler.go b/internal/handler/admin/crm/trade/address/delivery/createdeliveryaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/delivery/createdeliveryaddresshandler.go rename to internal/handler/admin/crm/trade/address/delivery/createdeliveryaddresshandler.go index 280d60f5..3bda684c 100644 --- a/internal/handler/admin/trade/address/delivery/createdeliveryaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/delivery/createdeliveryaddresshandler.go @@ -1,9 +1,9 @@ package delivery import ( - "PowerX/internal/logic/admin/trade/address/delivery" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/delivery" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/delivery/deletedeliveryaddresshandler.go b/internal/handler/admin/crm/trade/address/delivery/deletedeliveryaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/delivery/deletedeliveryaddresshandler.go rename to internal/handler/admin/crm/trade/address/delivery/deletedeliveryaddresshandler.go index 5e8338ce..f7649d6d 100644 --- a/internal/handler/admin/trade/address/delivery/deletedeliveryaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/delivery/deletedeliveryaddresshandler.go @@ -1,9 +1,9 @@ package delivery import ( - "PowerX/internal/logic/admin/trade/address/delivery" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/delivery" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/delivery/getdeliveryaddresshandler.go b/internal/handler/admin/crm/trade/address/delivery/getdeliveryaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/delivery/getdeliveryaddresshandler.go rename to internal/handler/admin/crm/trade/address/delivery/getdeliveryaddresshandler.go index 584f2a07..d022bd67 100644 --- a/internal/handler/admin/trade/address/delivery/getdeliveryaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/delivery/getdeliveryaddresshandler.go @@ -1,9 +1,9 @@ package delivery import ( - "PowerX/internal/logic/admin/trade/address/delivery" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/delivery" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/delivery/listdeliveryaddressespagehandler.go b/internal/handler/admin/crm/trade/address/delivery/listdeliveryaddressespagehandler.go similarity index 91% rename from internal/handler/admin/trade/address/delivery/listdeliveryaddressespagehandler.go rename to internal/handler/admin/crm/trade/address/delivery/listdeliveryaddressespagehandler.go index 190570a7..44a1d664 100644 --- a/internal/handler/admin/trade/address/delivery/listdeliveryaddressespagehandler.go +++ b/internal/handler/admin/crm/trade/address/delivery/listdeliveryaddressespagehandler.go @@ -1,9 +1,9 @@ package delivery import ( - "PowerX/internal/logic/admin/trade/address/delivery" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/delivery" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/delivery/patchdeliveryaddresshandler.go b/internal/handler/admin/crm/trade/address/delivery/patchdeliveryaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/delivery/patchdeliveryaddresshandler.go rename to internal/handler/admin/crm/trade/address/delivery/patchdeliveryaddresshandler.go index 118a1a0d..f9f1e073 100644 --- a/internal/handler/admin/trade/address/delivery/patchdeliveryaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/delivery/patchdeliveryaddresshandler.go @@ -1,9 +1,9 @@ package delivery import ( - "PowerX/internal/logic/admin/trade/address/delivery" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/delivery" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/delivery/putdeliveryaddresshandler.go b/internal/handler/admin/crm/trade/address/delivery/putdeliveryaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/delivery/putdeliveryaddresshandler.go rename to internal/handler/admin/crm/trade/address/delivery/putdeliveryaddresshandler.go index b8bf2e77..a1d4fed9 100644 --- a/internal/handler/admin/trade/address/delivery/putdeliveryaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/delivery/putdeliveryaddresshandler.go @@ -1,9 +1,9 @@ package delivery import ( - "PowerX/internal/logic/admin/trade/address/delivery" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/delivery" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/shipping/createshippingaddresshandler.go b/internal/handler/admin/crm/trade/address/shipping/createshippingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/shipping/createshippingaddresshandler.go rename to internal/handler/admin/crm/trade/address/shipping/createshippingaddresshandler.go index 44567059..7c508dbd 100644 --- a/internal/handler/admin/trade/address/shipping/createshippingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/shipping/createshippingaddresshandler.go @@ -1,9 +1,9 @@ package shipping import ( - "PowerX/internal/logic/admin/trade/address/shipping" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/shipping" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/shipping/deleteshippingaddresshandler.go b/internal/handler/admin/crm/trade/address/shipping/deleteshippingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/shipping/deleteshippingaddresshandler.go rename to internal/handler/admin/crm/trade/address/shipping/deleteshippingaddresshandler.go index b5abe413..1154d10a 100644 --- a/internal/handler/admin/trade/address/shipping/deleteshippingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/shipping/deleteshippingaddresshandler.go @@ -1,9 +1,9 @@ package shipping import ( - "PowerX/internal/logic/admin/trade/address/shipping" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/shipping" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/shipping/getshippingaddresshandler.go b/internal/handler/admin/crm/trade/address/shipping/getshippingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/shipping/getshippingaddresshandler.go rename to internal/handler/admin/crm/trade/address/shipping/getshippingaddresshandler.go index e99cede8..43ea6205 100644 --- a/internal/handler/admin/trade/address/shipping/getshippingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/shipping/getshippingaddresshandler.go @@ -1,9 +1,9 @@ package shipping import ( - "PowerX/internal/logic/admin/trade/address/shipping" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/shipping" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/shipping/listshippingaddressespagehandler.go b/internal/handler/admin/crm/trade/address/shipping/listshippingaddressespagehandler.go similarity index 91% rename from internal/handler/admin/trade/address/shipping/listshippingaddressespagehandler.go rename to internal/handler/admin/crm/trade/address/shipping/listshippingaddressespagehandler.go index 805982c0..932f7e00 100644 --- a/internal/handler/admin/trade/address/shipping/listshippingaddressespagehandler.go +++ b/internal/handler/admin/crm/trade/address/shipping/listshippingaddressespagehandler.go @@ -1,9 +1,9 @@ package shipping import ( - "PowerX/internal/logic/admin/trade/address/shipping" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/shipping" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/shipping/patchshippingaddresshandler.go b/internal/handler/admin/crm/trade/address/shipping/patchshippingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/shipping/patchshippingaddresshandler.go rename to internal/handler/admin/crm/trade/address/shipping/patchshippingaddresshandler.go index f8a088ad..c96ce2c6 100644 --- a/internal/handler/admin/trade/address/shipping/patchshippingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/shipping/patchshippingaddresshandler.go @@ -1,9 +1,9 @@ package shipping import ( - "PowerX/internal/logic/admin/trade/address/shipping" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/shipping" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/address/shipping/putshippingaddresshandler.go b/internal/handler/admin/crm/trade/address/shipping/putshippingaddresshandler.go similarity index 91% rename from internal/handler/admin/trade/address/shipping/putshippingaddresshandler.go rename to internal/handler/admin/crm/trade/address/shipping/putshippingaddresshandler.go index 97937f8b..7550aa20 100644 --- a/internal/handler/admin/trade/address/shipping/putshippingaddresshandler.go +++ b/internal/handler/admin/crm/trade/address/shipping/putshippingaddresshandler.go @@ -1,9 +1,9 @@ package shipping import ( - "PowerX/internal/logic/admin/trade/address/shipping" "net/http" + "PowerX/internal/logic/admin/crm/trade/address/shipping" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/order/createorderhandler.go b/internal/handler/admin/crm/trade/order/createorderhandler.go similarity index 92% rename from internal/handler/admin/trade/order/createorderhandler.go rename to internal/handler/admin/crm/trade/order/createorderhandler.go index 4aa29f74..c33b4ecf 100644 --- a/internal/handler/admin/trade/order/createorderhandler.go +++ b/internal/handler/admin/crm/trade/order/createorderhandler.go @@ -3,7 +3,7 @@ package order import ( "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/order/deleteorderhandler.go b/internal/handler/admin/crm/trade/order/deleteorderhandler.go similarity index 92% rename from internal/handler/admin/trade/order/deleteorderhandler.go rename to internal/handler/admin/crm/trade/order/deleteorderhandler.go index fce7e018..f474f710 100644 --- a/internal/handler/admin/trade/order/deleteorderhandler.go +++ b/internal/handler/admin/crm/trade/order/deleteorderhandler.go @@ -3,7 +3,7 @@ package order import ( "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/order/exportordershandler.go b/internal/handler/admin/crm/trade/order/exportordershandler.go similarity index 95% rename from internal/handler/admin/trade/order/exportordershandler.go rename to internal/handler/admin/crm/trade/order/exportordershandler.go index bd820ffb..16e5861c 100644 --- a/internal/handler/admin/trade/order/exportordershandler.go +++ b/internal/handler/admin/crm/trade/order/exportordershandler.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/order/getorderhandler.go b/internal/handler/admin/crm/trade/order/getorderhandler.go similarity index 92% rename from internal/handler/admin/trade/order/getorderhandler.go rename to internal/handler/admin/crm/trade/order/getorderhandler.go index 5052f75a..4977e963 100644 --- a/internal/handler/admin/trade/order/getorderhandler.go +++ b/internal/handler/admin/crm/trade/order/getorderhandler.go @@ -3,7 +3,7 @@ package order import ( "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/order/importordershandler.go b/internal/handler/admin/crm/trade/order/importordershandler.go similarity index 55% rename from internal/handler/admin/trade/order/importordershandler.go rename to internal/handler/admin/crm/trade/order/importordershandler.go index 6d6731c7..d38a089e 100644 --- a/internal/handler/admin/trade/order/importordershandler.go +++ b/internal/handler/admin/crm/trade/order/importordershandler.go @@ -1,10 +1,9 @@ package order import ( - "PowerX/internal/model/trade" "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "github.com/zeromicro/go-zero/rest/httpx" ) @@ -12,10 +11,6 @@ import ( func ImportOrdersHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { l := order.NewImportOrdersLogic(r.Context(), svcCtx) - - l.OrderStatusToBeShippedId = svcCtx.PowerX.DataDictionary.GetCachedDDId(r.Context(), trade.TypeOrderStatus, trade.OrderStatusToBeShipped) - l.OrderStatusShippingId = svcCtx.PowerX.DataDictionary.GetCachedDDId(r.Context(), trade.TypeOrderStatus, trade.OrderStatusShipping) - resp, err := l.ImportOrders(r) if err != nil { httpx.ErrorCtx(r.Context(), w, err) diff --git a/internal/handler/admin/trade/order/listorderspagehandler.go b/internal/handler/admin/crm/trade/order/listorderspagehandler.go similarity index 92% rename from internal/handler/admin/trade/order/listorderspagehandler.go rename to internal/handler/admin/crm/trade/order/listorderspagehandler.go index 589b9198..bdb25658 100644 --- a/internal/handler/admin/trade/order/listorderspagehandler.go +++ b/internal/handler/admin/crm/trade/order/listorderspagehandler.go @@ -3,7 +3,7 @@ package order import ( "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/order/patchorderhandler.go b/internal/handler/admin/crm/trade/order/patchorderhandler.go similarity index 92% rename from internal/handler/admin/trade/order/patchorderhandler.go rename to internal/handler/admin/crm/trade/order/patchorderhandler.go index ff23102c..a30ad2c7 100644 --- a/internal/handler/admin/trade/order/patchorderhandler.go +++ b/internal/handler/admin/crm/trade/order/patchorderhandler.go @@ -3,7 +3,7 @@ package order import ( "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/order/putorderhandler.go b/internal/handler/admin/crm/trade/order/putorderhandler.go similarity index 92% rename from internal/handler/admin/trade/order/putorderhandler.go rename to internal/handler/admin/crm/trade/order/putorderhandler.go index 6d7664ad..bf74730a 100644 --- a/internal/handler/admin/trade/order/putorderhandler.go +++ b/internal/handler/admin/crm/trade/order/putorderhandler.go @@ -3,7 +3,7 @@ package order import ( "net/http" - "PowerX/internal/logic/admin/trade/order" + "PowerX/internal/logic/admin/crm/trade/order" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/payment/createpaymenthandler.go b/internal/handler/admin/crm/trade/payment/createpaymenthandler.go similarity index 92% rename from internal/handler/admin/trade/payment/createpaymenthandler.go rename to internal/handler/admin/crm/trade/payment/createpaymenthandler.go index 99db2b7c..7b12dd77 100644 --- a/internal/handler/admin/trade/payment/createpaymenthandler.go +++ b/internal/handler/admin/crm/trade/payment/createpaymenthandler.go @@ -3,7 +3,7 @@ package payment import ( "net/http" - "PowerX/internal/logic/admin/trade/payment" + "PowerX/internal/logic/admin/crm/trade/payment" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/payment/deletepaymenthandler.go b/internal/handler/admin/crm/trade/payment/deletepaymenthandler.go similarity index 92% rename from internal/handler/admin/trade/payment/deletepaymenthandler.go rename to internal/handler/admin/crm/trade/payment/deletepaymenthandler.go index 65645f7d..89f0a637 100644 --- a/internal/handler/admin/trade/payment/deletepaymenthandler.go +++ b/internal/handler/admin/crm/trade/payment/deletepaymenthandler.go @@ -3,7 +3,7 @@ package payment import ( "net/http" - "PowerX/internal/logic/admin/trade/payment" + "PowerX/internal/logic/admin/crm/trade/payment" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/payment/getpaymenthandler.go b/internal/handler/admin/crm/trade/payment/getpaymenthandler.go similarity index 92% rename from internal/handler/admin/trade/payment/getpaymenthandler.go rename to internal/handler/admin/crm/trade/payment/getpaymenthandler.go index 2514cb42..7b5fe1e9 100644 --- a/internal/handler/admin/trade/payment/getpaymenthandler.go +++ b/internal/handler/admin/crm/trade/payment/getpaymenthandler.go @@ -3,7 +3,7 @@ package payment import ( "net/http" - "PowerX/internal/logic/admin/trade/payment" + "PowerX/internal/logic/admin/crm/trade/payment" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/payment/listpaymentspagehandler.go b/internal/handler/admin/crm/trade/payment/listpaymentspagehandler.go similarity index 92% rename from internal/handler/admin/trade/payment/listpaymentspagehandler.go rename to internal/handler/admin/crm/trade/payment/listpaymentspagehandler.go index 32f296ab..dee66beb 100644 --- a/internal/handler/admin/trade/payment/listpaymentspagehandler.go +++ b/internal/handler/admin/crm/trade/payment/listpaymentspagehandler.go @@ -3,7 +3,7 @@ package payment import ( "net/http" - "PowerX/internal/logic/admin/trade/payment" + "PowerX/internal/logic/admin/crm/trade/payment" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/payment/patchpaymenthandler.go b/internal/handler/admin/crm/trade/payment/patchpaymenthandler.go similarity index 92% rename from internal/handler/admin/trade/payment/patchpaymenthandler.go rename to internal/handler/admin/crm/trade/payment/patchpaymenthandler.go index ca260367..25f4be56 100644 --- a/internal/handler/admin/trade/payment/patchpaymenthandler.go +++ b/internal/handler/admin/crm/trade/payment/patchpaymenthandler.go @@ -3,7 +3,7 @@ package payment import ( "net/http" - "PowerX/internal/logic/admin/trade/payment" + "PowerX/internal/logic/admin/crm/trade/payment" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/payment/putpaymenthandler.go b/internal/handler/admin/crm/trade/payment/putpaymenthandler.go similarity index 92% rename from internal/handler/admin/trade/payment/putpaymenthandler.go rename to internal/handler/admin/crm/trade/payment/putpaymenthandler.go index 08c2af77..ab2d8db2 100644 --- a/internal/handler/admin/trade/payment/putpaymenthandler.go +++ b/internal/handler/admin/crm/trade/payment/putpaymenthandler.go @@ -3,7 +3,7 @@ package payment import ( "net/http" - "PowerX/internal/logic/admin/trade/payment" + "PowerX/internal/logic/admin/crm/trade/payment" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/token/createtokenproducthandler.go b/internal/handler/admin/crm/trade/token/createtokenproducthandler.go similarity index 92% rename from internal/handler/admin/trade/token/createtokenproducthandler.go rename to internal/handler/admin/crm/trade/token/createtokenproducthandler.go index cb33d66f..00e0a3fd 100644 --- a/internal/handler/admin/trade/token/createtokenproducthandler.go +++ b/internal/handler/admin/crm/trade/token/createtokenproducthandler.go @@ -3,7 +3,7 @@ package token import ( "net/http" - "PowerX/internal/logic/admin/trade/token" + "PowerX/internal/logic/admin/crm/trade/token" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/token/deletetokenproducthandler.go b/internal/handler/admin/crm/trade/token/deletetokenproducthandler.go similarity index 92% rename from internal/handler/admin/trade/token/deletetokenproducthandler.go rename to internal/handler/admin/crm/trade/token/deletetokenproducthandler.go index 8087cc9f..d1b99a9e 100644 --- a/internal/handler/admin/trade/token/deletetokenproducthandler.go +++ b/internal/handler/admin/crm/trade/token/deletetokenproducthandler.go @@ -3,7 +3,7 @@ package token import ( "net/http" - "PowerX/internal/logic/admin/trade/token" + "PowerX/internal/logic/admin/crm/trade/token" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/token/gettokenproducthandler.go b/internal/handler/admin/crm/trade/token/gettokenproducthandler.go similarity index 92% rename from internal/handler/admin/trade/token/gettokenproducthandler.go rename to internal/handler/admin/crm/trade/token/gettokenproducthandler.go index e64db5d2..3f434b0b 100644 --- a/internal/handler/admin/trade/token/gettokenproducthandler.go +++ b/internal/handler/admin/crm/trade/token/gettokenproducthandler.go @@ -3,7 +3,7 @@ package token import ( "net/http" - "PowerX/internal/logic/admin/trade/token" + "PowerX/internal/logic/admin/crm/trade/token" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/token/listtokenproductspagehandler.go b/internal/handler/admin/crm/trade/token/listtokenproductspagehandler.go similarity index 93% rename from internal/handler/admin/trade/token/listtokenproductspagehandler.go rename to internal/handler/admin/crm/trade/token/listtokenproductspagehandler.go index f50ce79c..bdc9c907 100644 --- a/internal/handler/admin/trade/token/listtokenproductspagehandler.go +++ b/internal/handler/admin/crm/trade/token/listtokenproductspagehandler.go @@ -3,7 +3,7 @@ package token import ( "net/http" - "PowerX/internal/logic/admin/trade/token" + "PowerX/internal/logic/admin/crm/trade/token" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/token/patchtokenproducthandler.go b/internal/handler/admin/crm/trade/token/patchtokenproducthandler.go similarity index 92% rename from internal/handler/admin/trade/token/patchtokenproducthandler.go rename to internal/handler/admin/crm/trade/token/patchtokenproducthandler.go index 1422d277..543f40ef 100644 --- a/internal/handler/admin/trade/token/patchtokenproducthandler.go +++ b/internal/handler/admin/crm/trade/token/patchtokenproducthandler.go @@ -3,7 +3,7 @@ package token import ( "net/http" - "PowerX/internal/logic/admin/trade/token" + "PowerX/internal/logic/admin/crm/trade/token" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/token/puttokenproducthandler.go b/internal/handler/admin/crm/trade/token/puttokenproducthandler.go similarity index 92% rename from internal/handler/admin/trade/token/puttokenproducthandler.go rename to internal/handler/admin/crm/trade/token/puttokenproducthandler.go index a81088bb..a723dadf 100644 --- a/internal/handler/admin/trade/token/puttokenproducthandler.go +++ b/internal/handler/admin/crm/trade/token/puttokenproducthandler.go @@ -3,7 +3,7 @@ package token import ( "net/http" - "PowerX/internal/logic/admin/trade/token" + "PowerX/internal/logic/admin/crm/trade/token" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/warehouse/createwarehousehandler.go b/internal/handler/admin/crm/trade/warehouse/createwarehousehandler.go similarity index 92% rename from internal/handler/admin/trade/warehouse/createwarehousehandler.go rename to internal/handler/admin/crm/trade/warehouse/createwarehousehandler.go index 06cda8a4..bba2a6f2 100644 --- a/internal/handler/admin/trade/warehouse/createwarehousehandler.go +++ b/internal/handler/admin/crm/trade/warehouse/createwarehousehandler.go @@ -3,7 +3,7 @@ package warehouse import ( "net/http" - "PowerX/internal/logic/admin/trade/warehouse" + "PowerX/internal/logic/admin/crm/trade/warehouse" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/warehouse/deletewarehousehandler.go b/internal/handler/admin/crm/trade/warehouse/deletewarehousehandler.go similarity index 92% rename from internal/handler/admin/trade/warehouse/deletewarehousehandler.go rename to internal/handler/admin/crm/trade/warehouse/deletewarehousehandler.go index 933ed4c6..48ecbdfe 100644 --- a/internal/handler/admin/trade/warehouse/deletewarehousehandler.go +++ b/internal/handler/admin/crm/trade/warehouse/deletewarehousehandler.go @@ -3,7 +3,7 @@ package warehouse import ( "net/http" - "PowerX/internal/logic/admin/trade/warehouse" + "PowerX/internal/logic/admin/crm/trade/warehouse" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/warehouse/getwarehousehandler.go b/internal/handler/admin/crm/trade/warehouse/getwarehousehandler.go similarity index 92% rename from internal/handler/admin/trade/warehouse/getwarehousehandler.go rename to internal/handler/admin/crm/trade/warehouse/getwarehousehandler.go index fefca783..7cd1eabd 100644 --- a/internal/handler/admin/trade/warehouse/getwarehousehandler.go +++ b/internal/handler/admin/crm/trade/warehouse/getwarehousehandler.go @@ -1,9 +1,9 @@ package warehouse import ( - "PowerX/internal/logic/admin/trade/warehouse" "net/http" + "PowerX/internal/logic/admin/crm/trade/warehouse" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/warehouse/listwarehouseshandler.go b/internal/handler/admin/crm/trade/warehouse/listwarehouseshandler.go similarity index 92% rename from internal/handler/admin/trade/warehouse/listwarehouseshandler.go rename to internal/handler/admin/crm/trade/warehouse/listwarehouseshandler.go index c76933e3..11de8880 100644 --- a/internal/handler/admin/trade/warehouse/listwarehouseshandler.go +++ b/internal/handler/admin/crm/trade/warehouse/listwarehouseshandler.go @@ -1,9 +1,9 @@ package warehouse import ( - "PowerX/internal/logic/admin/trade/warehouse" "net/http" + "PowerX/internal/logic/admin/crm/trade/warehouse" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/warehouse/patchwarehousehandler.go b/internal/handler/admin/crm/trade/warehouse/patchwarehousehandler.go similarity index 92% rename from internal/handler/admin/trade/warehouse/patchwarehousehandler.go rename to internal/handler/admin/crm/trade/warehouse/patchwarehousehandler.go index ef59860a..80dc0956 100644 --- a/internal/handler/admin/trade/warehouse/patchwarehousehandler.go +++ b/internal/handler/admin/crm/trade/warehouse/patchwarehousehandler.go @@ -3,7 +3,7 @@ package warehouse import ( "net/http" - "PowerX/internal/logic/admin/trade/warehouse" + "PowerX/internal/logic/admin/crm/trade/warehouse" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/trade/warehouse/updatewarehousehandler.go b/internal/handler/admin/crm/trade/warehouse/updatewarehousehandler.go similarity index 92% rename from internal/handler/admin/trade/warehouse/updatewarehousehandler.go rename to internal/handler/admin/crm/trade/warehouse/updatewarehousehandler.go index f1a27882..15cf242e 100644 --- a/internal/handler/admin/trade/warehouse/updatewarehousehandler.go +++ b/internal/handler/admin/crm/trade/warehouse/updatewarehousehandler.go @@ -3,7 +3,7 @@ package warehouse import ( "net/http" - "PowerX/internal/logic/admin/trade/warehouse" + "PowerX/internal/logic/admin/crm/trade/warehouse" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/contractway/createcontractwayhandler.go b/internal/handler/admin/scrm/contractway/createcontractwayhandler.go similarity index 92% rename from internal/handler/admin/contractway/createcontractwayhandler.go rename to internal/handler/admin/scrm/contractway/createcontractwayhandler.go index ca484dd4..2122e878 100644 --- a/internal/handler/admin/contractway/createcontractwayhandler.go +++ b/internal/handler/admin/scrm/contractway/createcontractwayhandler.go @@ -3,7 +3,7 @@ package contractway import ( "net/http" - "PowerX/internal/logic/admin/contractway" + "PowerX/internal/logic/admin/scrm/contractway" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/contractway/deletecontractwayhandler.go b/internal/handler/admin/scrm/contractway/deletecontractwayhandler.go similarity index 92% rename from internal/handler/admin/contractway/deletecontractwayhandler.go rename to internal/handler/admin/scrm/contractway/deletecontractwayhandler.go index f8efc9af..a2b6dc5d 100644 --- a/internal/handler/admin/contractway/deletecontractwayhandler.go +++ b/internal/handler/admin/scrm/contractway/deletecontractwayhandler.go @@ -3,7 +3,7 @@ package contractway import ( "net/http" - "PowerX/internal/logic/admin/contractway" + "PowerX/internal/logic/admin/scrm/contractway" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/contractway/getcontractwaygrouplisthandler.go b/internal/handler/admin/scrm/contractway/getcontractwaygrouplisthandler.go similarity index 93% rename from internal/handler/admin/contractway/getcontractwaygrouplisthandler.go rename to internal/handler/admin/scrm/contractway/getcontractwaygrouplisthandler.go index f722f2d3..873b2adc 100644 --- a/internal/handler/admin/contractway/getcontractwaygrouplisthandler.go +++ b/internal/handler/admin/scrm/contractway/getcontractwaygrouplisthandler.go @@ -3,7 +3,7 @@ package contractway import ( "net/http" - "PowerX/internal/logic/admin/contractway" + "PowerX/internal/logic/admin/scrm/contractway" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/contractway/getcontractwaygrouptreehandler.go b/internal/handler/admin/scrm/contractway/getcontractwaygrouptreehandler.go similarity index 93% rename from internal/handler/admin/contractway/getcontractwaygrouptreehandler.go rename to internal/handler/admin/scrm/contractway/getcontractwaygrouptreehandler.go index 74fa9727..62d9dbb9 100644 --- a/internal/handler/admin/contractway/getcontractwaygrouptreehandler.go +++ b/internal/handler/admin/scrm/contractway/getcontractwaygrouptreehandler.go @@ -3,7 +3,7 @@ package contractway import ( "net/http" - "PowerX/internal/logic/admin/contractway" + "PowerX/internal/logic/admin/scrm/contractway" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/contractway/getcontractwayshandler.go b/internal/handler/admin/scrm/contractway/getcontractwayshandler.go similarity index 92% rename from internal/handler/admin/contractway/getcontractwayshandler.go rename to internal/handler/admin/scrm/contractway/getcontractwayshandler.go index 533e4f42..b1fb23e4 100644 --- a/internal/handler/admin/contractway/getcontractwayshandler.go +++ b/internal/handler/admin/scrm/contractway/getcontractwayshandler.go @@ -3,7 +3,7 @@ package contractway import ( "net/http" - "PowerX/internal/logic/admin/contractway" + "PowerX/internal/logic/admin/scrm/contractway" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/admin/contractway/updatecontractwayhandler.go b/internal/handler/admin/scrm/contractway/updatecontractwayhandler.go similarity index 92% rename from internal/handler/admin/contractway/updatecontractwayhandler.go rename to internal/handler/admin/scrm/contractway/updatecontractwayhandler.go index 55e26152..2bf2682b 100644 --- a/internal/handler/admin/contractway/updatecontractwayhandler.go +++ b/internal/handler/admin/scrm/contractway/updatecontractwayhandler.go @@ -3,7 +3,7 @@ package contractway import ( "net/http" - "PowerX/internal/logic/admin/contractway" + "PowerX/internal/logic/admin/scrm/contractway" "PowerX/internal/svc" "PowerX/internal/types" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/internal/handler/routes.go b/internal/handler/routes.go index 1341cfb5..29be045a 100644 --- a/internal/handler/routes.go +++ b/internal/handler/routes.go @@ -5,42 +5,42 @@ import ( "net/http" adminauth "PowerX/internal/handler/admin/auth" - adminbusinessopportunity "PowerX/internal/handler/admin/business/opportunity" admincommon "PowerX/internal/handler/admin/common" - admincontractway "PowerX/internal/handler/admin/contractway" - admincustomerdomaincustomer "PowerX/internal/handler/admin/customerdomain/customer" - admincustomerdomainleader "PowerX/internal/handler/admin/customerdomain/leader" + admincrmbusinessopportunity "PowerX/internal/handler/admin/crm/business/opportunity" + admincrmcustomerdomaincustomer "PowerX/internal/handler/admin/crm/customerdomain/customer" + admincrmcustomerdomainleader "PowerX/internal/handler/admin/crm/customerdomain/leader" + admincrmmarketmedia "PowerX/internal/handler/admin/crm/market/media" + admincrmmarketstore "PowerX/internal/handler/admin/crm/market/store" + admincrmproduct "PowerX/internal/handler/admin/crm/product" + admincrmproductartisan "PowerX/internal/handler/admin/crm/product/artisan" + admincrmproductcategory "PowerX/internal/handler/admin/crm/product/category" + admincrmproductpricebook "PowerX/internal/handler/admin/crm/product/pricebook" + admincrmproductpricebookentry "PowerX/internal/handler/admin/crm/product/pricebookentry" + admincrmproductproductspecific "PowerX/internal/handler/admin/crm/product/productspecific" + admincrmproductsku "PowerX/internal/handler/admin/crm/product/sku" + admincrmtradeaddressbilling "PowerX/internal/handler/admin/crm/trade/address/billing" + admincrmtradeaddressdelivery "PowerX/internal/handler/admin/crm/trade/address/delivery" + admincrmtradeaddressshipping "PowerX/internal/handler/admin/crm/trade/address/shipping" + admincrmtradeorder "PowerX/internal/handler/admin/crm/trade/order" + admincrmtradepayment "PowerX/internal/handler/admin/crm/trade/payment" + admincrmtradetoken "PowerX/internal/handler/admin/crm/trade/token" + admincrmtradewarehouse "PowerX/internal/handler/admin/crm/trade/warehouse" admindepartment "PowerX/internal/handler/admin/department" admindictionary "PowerX/internal/handler/admin/dictionary" adminemployee "PowerX/internal/handler/admin/employee" admininfoorganizationcategory "PowerX/internal/handler/admin/infoorganization/category" - adminmarketmedia "PowerX/internal/handler/admin/market/media" - adminmarketstore "PowerX/internal/handler/admin/market/store" adminmediaresource "PowerX/internal/handler/admin/mediaresource" adminpermission "PowerX/internal/handler/admin/permission" adminposition "PowerX/internal/handler/admin/position" - adminproduct "PowerX/internal/handler/admin/product" - adminproductartisan "PowerX/internal/handler/admin/product/artisan" - adminproductcategory "PowerX/internal/handler/admin/product/category" - adminproductpricebook "PowerX/internal/handler/admin/product/pricebook" - adminproductpricebookentry "PowerX/internal/handler/admin/product/pricebookentry" - adminproductproductspecific "PowerX/internal/handler/admin/product/productspecific" - adminproductsku "PowerX/internal/handler/admin/product/sku" adminscrmapp "PowerX/internal/handler/admin/scrm/app" adminscrmbot "PowerX/internal/handler/admin/scrm/bot" + adminscrmcontractway "PowerX/internal/handler/admin/scrm/contractway" adminscrmcustomer "PowerX/internal/handler/admin/scrm/customer" adminscrmorganization "PowerX/internal/handler/admin/scrm/organization" adminscrmqrcode "PowerX/internal/handler/admin/scrm/qrcode" adminscrmresource "PowerX/internal/handler/admin/scrm/resource" adminscrmtag "PowerX/internal/handler/admin/scrm/tag" admintag "PowerX/internal/handler/admin/tag" - admintradeaddressbilling "PowerX/internal/handler/admin/trade/address/billing" - admintradeaddressdelivery "PowerX/internal/handler/admin/trade/address/delivery" - admintradeaddressshipping "PowerX/internal/handler/admin/trade/address/shipping" - admintradeorder "PowerX/internal/handler/admin/trade/order" - admintradepayment "PowerX/internal/handler/admin/trade/payment" - admintradetoken "PowerX/internal/handler/admin/trade/token" - admintradewarehouse "PowerX/internal/handler/admin/trade/warehouse" adminuserinfo "PowerX/internal/handler/admin/userinfo" mpcustomerauth "PowerX/internal/handler/mp/customer/auth" mpdictionary "PowerX/internal/handler/mp/dictionary" @@ -458,37 +458,37 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/leads/:id", - Handler: admincustomerdomainleader.GetLeadHandler(serverCtx), + Handler: admincrmcustomerdomainleader.GetLeadHandler(serverCtx), }, { Method: http.MethodGet, Path: "/leads/page-list", - Handler: admincustomerdomainleader.ListLeadsPageHandler(serverCtx), + Handler: admincrmcustomerdomainleader.ListLeadsPageHandler(serverCtx), }, { Method: http.MethodPost, Path: "/leads", - Handler: admincustomerdomainleader.CreateLeadHandler(serverCtx), + Handler: admincrmcustomerdomainleader.CreateLeadHandler(serverCtx), }, { Method: http.MethodPut, Path: "/leads/:id", - Handler: admincustomerdomainleader.PutLeadHandler(serverCtx), + Handler: admincrmcustomerdomainleader.PutLeadHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/leads/:id", - Handler: admincustomerdomainleader.PatchLeadHandler(serverCtx), + Handler: admincrmcustomerdomainleader.PatchLeadHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/leads/:id", - Handler: admincustomerdomainleader.DeleteLeadHandler(serverCtx), + Handler: admincrmcustomerdomainleader.DeleteLeadHandler(serverCtx), }, { Method: http.MethodPost, Path: "/leads/:id/actions/employees", - Handler: admincustomerdomainleader.AssignLeadToEmployeeHandler(serverCtx), + Handler: admincrmcustomerdomainleader.AssignLeadToEmployeeHandler(serverCtx), }, }..., ), @@ -502,37 +502,37 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/customers/:id", - Handler: admincustomerdomaincustomer.GetCustomerHandler(serverCtx), + Handler: admincrmcustomerdomaincustomer.GetCustomerHandler(serverCtx), }, { Method: http.MethodGet, Path: "/customers/page-list", - Handler: admincustomerdomaincustomer.ListCustomersPageHandler(serverCtx), + Handler: admincrmcustomerdomaincustomer.ListCustomersPageHandler(serverCtx), }, { Method: http.MethodPost, Path: "/customers", - Handler: admincustomerdomaincustomer.CreateCustomerHandler(serverCtx), + Handler: admincrmcustomerdomaincustomer.CreateCustomerHandler(serverCtx), }, { Method: http.MethodPut, Path: "/customers/:id", - Handler: admincustomerdomaincustomer.PutCustomerHandler(serverCtx), + Handler: admincrmcustomerdomaincustomer.PutCustomerHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/customers/:id", - Handler: admincustomerdomaincustomer.PatchCustomerHandler(serverCtx), + Handler: admincrmcustomerdomaincustomer.PatchCustomerHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/customers/:id", - Handler: admincustomerdomaincustomer.DeleteCustomerHandler(serverCtx), + Handler: admincrmcustomerdomaincustomer.DeleteCustomerHandler(serverCtx), }, { Method: http.MethodPost, Path: "/customers/:id/actions/employees", - Handler: admincustomerdomaincustomer.AssignCustomerToEmployeeHandler(serverCtx), + Handler: admincrmcustomerdomaincustomer.AssignCustomerToEmployeeHandler(serverCtx), }, }..., ), @@ -546,27 +546,27 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/medias/page-list", - Handler: adminmarketmedia.ListMediasPageHandler(serverCtx), + Handler: admincrmmarketmedia.ListMediasPageHandler(serverCtx), }, { Method: http.MethodPost, Path: "/medias", - Handler: adminmarketmedia.CreateMediaHandler(serverCtx), + Handler: admincrmmarketmedia.CreateMediaHandler(serverCtx), }, { Method: http.MethodPut, Path: "/medias/:id", - Handler: adminmarketmedia.UpdateMediaHandler(serverCtx), + Handler: admincrmmarketmedia.UpdateMediaHandler(serverCtx), }, { Method: http.MethodGet, Path: "/medias/:id", - Handler: adminmarketmedia.GetMediaHandler(serverCtx), + Handler: admincrmmarketmedia.GetMediaHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/medias/:id", - Handler: adminmarketmedia.DeleteMediaHandler(serverCtx), + Handler: admincrmmarketmedia.DeleteMediaHandler(serverCtx), }, }..., ), @@ -580,32 +580,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/stores/page-list", - Handler: adminmarketstore.ListStoresPageHandler(serverCtx), + Handler: admincrmmarketstore.ListStoresPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/stores/:id", - Handler: adminmarketstore.GetStoreHandler(serverCtx), + Handler: admincrmmarketstore.GetStoreHandler(serverCtx), }, { Method: http.MethodPost, Path: "/stores", - Handler: adminmarketstore.CreateStoreHandler(serverCtx), + Handler: admincrmmarketstore.CreateStoreHandler(serverCtx), }, { Method: http.MethodPut, Path: "/stores/:id", - Handler: adminmarketstore.PutStoreHandler(serverCtx), + Handler: admincrmmarketstore.PutStoreHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/stores/:id", - Handler: adminmarketstore.DeleteStoreHandler(serverCtx), + Handler: admincrmmarketstore.DeleteStoreHandler(serverCtx), }, { Method: http.MethodPost, Path: "/stores/:id/actions/assign-to-store-categroy", - Handler: adminmarketstore.AssignStoreToStoreManagerHandler(serverCtx), + Handler: admincrmmarketstore.AssignStoreToStoreManagerHandler(serverCtx), }, }..., ), @@ -619,27 +619,27 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/opportunities", - Handler: adminbusinessopportunity.GetOpportunityListHandler(serverCtx), + Handler: admincrmbusinessopportunity.GetOpportunityListHandler(serverCtx), }, { Method: http.MethodPost, Path: "/opportunities", - Handler: adminbusinessopportunity.CreateOpportunityHandler(serverCtx), + Handler: admincrmbusinessopportunity.CreateOpportunityHandler(serverCtx), }, { Method: http.MethodPut, Path: "/opportunities/:id/assign-employee", - Handler: adminbusinessopportunity.AssignEmployeeToOpportunityHandler(serverCtx), + Handler: admincrmbusinessopportunity.AssignEmployeeToOpportunityHandler(serverCtx), }, { Method: http.MethodPut, Path: "/opportunities/:id", - Handler: adminbusinessopportunity.UpdateOpportunityHandler(serverCtx), + Handler: admincrmbusinessopportunity.UpdateOpportunityHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/opportunities/:id", - Handler: adminbusinessopportunity.DeleteOpportunityHandler(serverCtx), + Handler: admincrmbusinessopportunity.DeleteOpportunityHandler(serverCtx), }, }..., ), @@ -653,22 +653,22 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/price-books/page-list", - Handler: adminproductpricebook.ListPriceBooksHandler(serverCtx), + Handler: admincrmproductpricebook.ListPriceBooksHandler(serverCtx), }, { Method: http.MethodGet, Path: "/price-books/:id", - Handler: adminproductpricebook.GetPriceBookHandler(serverCtx), + Handler: admincrmproductpricebook.GetPriceBookHandler(serverCtx), }, { Method: http.MethodPost, Path: "/price-books", - Handler: adminproductpricebook.UpsertPriceBookHandler(serverCtx), + Handler: admincrmproductpricebook.UpsertPriceBookHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/price-books/:id", - Handler: adminproductpricebook.DeletePriceBookHandler(serverCtx), + Handler: admincrmproductpricebook.DeletePriceBookHandler(serverCtx), }, }..., ), @@ -682,37 +682,37 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/products/page-list", - Handler: adminproduct.ListProductsPageHandler(serverCtx), + Handler: admincrmproduct.ListProductsPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/products/:id", - Handler: adminproduct.GetProductHandler(serverCtx), + Handler: admincrmproduct.GetProductHandler(serverCtx), }, { Method: http.MethodPost, Path: "/products", - Handler: adminproduct.CreateProductHandler(serverCtx), + Handler: admincrmproduct.CreateProductHandler(serverCtx), }, { Method: http.MethodPut, Path: "/products/:id", - Handler: adminproduct.PutProductHandler(serverCtx), + Handler: admincrmproduct.PutProductHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/products/:id", - Handler: adminproduct.PatchProductHandler(serverCtx), + Handler: admincrmproduct.PatchProductHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/products/:id", - Handler: adminproduct.DeleteProductHandler(serverCtx), + Handler: admincrmproduct.DeleteProductHandler(serverCtx), }, { Method: http.MethodPost, Path: "/products/:id/actions/assign-to-product-categroy", - Handler: adminproduct.AssignProductToProductCategoryHandler(serverCtx), + Handler: admincrmproduct.AssignProductToProductCategoryHandler(serverCtx), }, }..., ), @@ -760,32 +760,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/product-category-tree", - Handler: adminproductcategory.ListProductCategoryTreeHandler(serverCtx), + Handler: admincrmproductcategory.ListProductCategoryTreeHandler(serverCtx), }, { Method: http.MethodGet, Path: "/product-categories/:id", - Handler: adminproductcategory.GetProductCategoryHandler(serverCtx), + Handler: admincrmproductcategory.GetProductCategoryHandler(serverCtx), }, { Method: http.MethodPost, Path: "/product-categories", - Handler: adminproductcategory.CreateProductCategoryHandler(serverCtx), + Handler: admincrmproductcategory.CreateProductCategoryHandler(serverCtx), }, { Method: http.MethodPut, Path: "/product-categories/:id", - Handler: adminproductcategory.UpdateProductCategoryHandler(serverCtx), + Handler: admincrmproductcategory.UpdateProductCategoryHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/product-categories/:id", - Handler: adminproductcategory.PatchProductCategoryHandler(serverCtx), + Handler: admincrmproductcategory.PatchProductCategoryHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/product-categories/:id", - Handler: adminproductcategory.DeleteProductCategoryHandler(serverCtx), + Handler: admincrmproductcategory.DeleteProductCategoryHandler(serverCtx), }, }..., ), @@ -799,37 +799,37 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/product-specifics/page-list", - Handler: adminproductproductspecific.ListProductSpecificPageHandler(serverCtx), + Handler: admincrmproductproductspecific.ListProductSpecificPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/product-specifics/:id", - Handler: adminproductproductspecific.GetProductSpecificHandler(serverCtx), + Handler: admincrmproductproductspecific.GetProductSpecificHandler(serverCtx), }, { Method: http.MethodPost, Path: "/product-specifics", - Handler: adminproductproductspecific.CreateProductSpecificHandler(serverCtx), + Handler: admincrmproductproductspecific.CreateProductSpecificHandler(serverCtx), }, { Method: http.MethodPost, Path: "/product-specifics/config", - Handler: adminproductproductspecific.ConfigProductSpecificHandler(serverCtx), + Handler: admincrmproductproductspecific.ConfigProductSpecificHandler(serverCtx), }, { Method: http.MethodPut, Path: "/product-specifics/:id", - Handler: adminproductproductspecific.PutProductSpecificHandler(serverCtx), + Handler: admincrmproductproductspecific.PutProductSpecificHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/product-specifics/:id", - Handler: adminproductproductspecific.PatchProductSpecificHandler(serverCtx), + Handler: admincrmproductproductspecific.PatchProductSpecificHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/product-specifics/:id", - Handler: adminproductproductspecific.DeleteProductSpecificHandler(serverCtx), + Handler: admincrmproductproductspecific.DeleteProductSpecificHandler(serverCtx), }, }..., ), @@ -843,37 +843,37 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/skus/page-list", - Handler: adminproductsku.ListSKUPageHandler(serverCtx), + Handler: admincrmproductsku.ListSKUPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/skus/:id", - Handler: adminproductsku.GetSKUHandler(serverCtx), + Handler: admincrmproductsku.GetSKUHandler(serverCtx), }, { Method: http.MethodPost, Path: "/skus", - Handler: adminproductsku.CreateSKUHandler(serverCtx), + Handler: admincrmproductsku.CreateSKUHandler(serverCtx), }, { Method: http.MethodPost, Path: "/skus/config", - Handler: adminproductsku.ConfigSKUHandler(serverCtx), + Handler: admincrmproductsku.ConfigSKUHandler(serverCtx), }, { Method: http.MethodPut, Path: "/skus/:id", - Handler: adminproductsku.PutSKUHandler(serverCtx), + Handler: admincrmproductsku.PutSKUHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/skus/:id", - Handler: adminproductsku.PatchSKUHandler(serverCtx), + Handler: admincrmproductsku.PatchSKUHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/skus/:id", - Handler: adminproductsku.DeleteSKUHandler(serverCtx), + Handler: admincrmproductsku.DeleteSKUHandler(serverCtx), }, }..., ), @@ -887,27 +887,27 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/price-book-entries/page-list", - Handler: adminproductpricebookentry.ListPriceBookEntriesHandler(serverCtx), + Handler: admincrmproductpricebookentry.ListPriceBookEntriesHandler(serverCtx), }, { Method: http.MethodGet, Path: "/price-book-entries/:id", - Handler: adminproductpricebookentry.GetPriceBookEntryHandler(serverCtx), + Handler: admincrmproductpricebookentry.GetPriceBookEntryHandler(serverCtx), }, { Method: http.MethodPost, Path: "/price-book-entries/config", - Handler: adminproductpricebookentry.ConfigPriceBookEntryHandler(serverCtx), + Handler: admincrmproductpricebookentry.ConfigPriceBookEntryHandler(serverCtx), }, { Method: http.MethodPost, Path: "/price-book-entries/:id", - Handler: adminproductpricebookentry.UpdatePriceBookEntryHandler(serverCtx), + Handler: admincrmproductpricebookentry.UpdatePriceBookEntryHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/price-book-entries/:id", - Handler: adminproductpricebookentry.DeletePriceBookEntryHandler(serverCtx), + Handler: admincrmproductpricebookentry.DeletePriceBookEntryHandler(serverCtx), }, }..., ), @@ -921,32 +921,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/artisans/page-list", - Handler: adminproductartisan.ListArtisansPageHandler(serverCtx), + Handler: admincrmproductartisan.ListArtisansPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/artisans/:id", - Handler: adminproductartisan.GetArtisanHandler(serverCtx), + Handler: admincrmproductartisan.GetArtisanHandler(serverCtx), }, { Method: http.MethodPost, Path: "/artisans", - Handler: adminproductartisan.CreateArtisanHandler(serverCtx), + Handler: admincrmproductartisan.CreateArtisanHandler(serverCtx), }, { Method: http.MethodPut, Path: "/artisans/:id", - Handler: adminproductartisan.PutArtisanHandler(serverCtx), + Handler: admincrmproductartisan.PutArtisanHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/artisans/:id", - Handler: adminproductartisan.DeleteArtisanHandler(serverCtx), + Handler: admincrmproductartisan.DeleteArtisanHandler(serverCtx), }, { Method: http.MethodPost, Path: "/artisans/bind/stores", - Handler: adminproductartisan.BindArtisanToStoreHandler(serverCtx), + Handler: admincrmproductartisan.BindArtisanToStoreHandler(serverCtx), }, }..., ), @@ -960,32 +960,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/products/page-list", - Handler: admintradetoken.ListTokenProductsPageHandler(serverCtx), + Handler: admincrmtradetoken.ListTokenProductsPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/products/:id", - Handler: admintradetoken.GetTokenProductHandler(serverCtx), + Handler: admincrmtradetoken.GetTokenProductHandler(serverCtx), }, { Method: http.MethodPost, Path: "/products", - Handler: admintradetoken.CreateTokenProductHandler(serverCtx), + Handler: admincrmtradetoken.CreateTokenProductHandler(serverCtx), }, { Method: http.MethodPut, Path: "/products/:id", - Handler: admintradetoken.PutTokenProductHandler(serverCtx), + Handler: admincrmtradetoken.PutTokenProductHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/products/:id", - Handler: admintradetoken.PatchTokenProductHandler(serverCtx), + Handler: admincrmtradetoken.PatchTokenProductHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/products/:id", - Handler: admintradetoken.DeleteTokenProductHandler(serverCtx), + Handler: admincrmtradetoken.DeleteTokenProductHandler(serverCtx), }, }..., ), @@ -999,32 +999,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/shipping/page-list", - Handler: admintradeaddressshipping.ListShippingAddressesPageHandler(serverCtx), + Handler: admincrmtradeaddressshipping.ListShippingAddressesPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/shipping/:id", - Handler: admintradeaddressshipping.GetShippingAddressHandler(serverCtx), + Handler: admincrmtradeaddressshipping.GetShippingAddressHandler(serverCtx), }, { Method: http.MethodPost, Path: "/shipping", - Handler: admintradeaddressshipping.CreateShippingAddressHandler(serverCtx), + Handler: admincrmtradeaddressshipping.CreateShippingAddressHandler(serverCtx), }, { Method: http.MethodPut, Path: "/shipping/:id", - Handler: admintradeaddressshipping.PutShippingAddressHandler(serverCtx), + Handler: admincrmtradeaddressshipping.PutShippingAddressHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/shipping/:id", - Handler: admintradeaddressshipping.PatchShippingAddressHandler(serverCtx), + Handler: admincrmtradeaddressshipping.PatchShippingAddressHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/shipping/:id", - Handler: admintradeaddressshipping.DeleteShippingAddressHandler(serverCtx), + Handler: admincrmtradeaddressshipping.DeleteShippingAddressHandler(serverCtx), }, }..., ), @@ -1038,32 +1038,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/billing/page-list", - Handler: admintradeaddressbilling.ListBillingAddressesPageHandler(serverCtx), + Handler: admincrmtradeaddressbilling.ListBillingAddressesPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/billing/:id", - Handler: admintradeaddressbilling.GetBillingAddressHandler(serverCtx), + Handler: admincrmtradeaddressbilling.GetBillingAddressHandler(serverCtx), }, { Method: http.MethodPost, Path: "/billing", - Handler: admintradeaddressbilling.CreateBillingAddressHandler(serverCtx), + Handler: admincrmtradeaddressbilling.CreateBillingAddressHandler(serverCtx), }, { Method: http.MethodPut, Path: "/billing/:id", - Handler: admintradeaddressbilling.PutBillingAddressHandler(serverCtx), + Handler: admincrmtradeaddressbilling.PutBillingAddressHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/billing/:id", - Handler: admintradeaddressbilling.PatchBillingAddressHandler(serverCtx), + Handler: admincrmtradeaddressbilling.PatchBillingAddressHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/billing/:id", - Handler: admintradeaddressbilling.DeleteBillingAddressHandler(serverCtx), + Handler: admincrmtradeaddressbilling.DeleteBillingAddressHandler(serverCtx), }, }..., ), @@ -1077,32 +1077,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/delivery/page-list", - Handler: admintradeaddressdelivery.ListDeliveryAddressesPageHandler(serverCtx), + Handler: admincrmtradeaddressdelivery.ListDeliveryAddressesPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/delivery/:id", - Handler: admintradeaddressdelivery.GetDeliveryAddressHandler(serverCtx), + Handler: admincrmtradeaddressdelivery.GetDeliveryAddressHandler(serverCtx), }, { Method: http.MethodPost, Path: "/delivery", - Handler: admintradeaddressdelivery.CreateDeliveryAddressHandler(serverCtx), + Handler: admincrmtradeaddressdelivery.CreateDeliveryAddressHandler(serverCtx), }, { Method: http.MethodPut, Path: "/delivery/:id", - Handler: admintradeaddressdelivery.PutDeliveryAddressHandler(serverCtx), + Handler: admincrmtradeaddressdelivery.PutDeliveryAddressHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/delivery/:id", - Handler: admintradeaddressdelivery.PatchDeliveryAddressHandler(serverCtx), + Handler: admincrmtradeaddressdelivery.PatchDeliveryAddressHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/delivery/:id", - Handler: admintradeaddressdelivery.DeleteDeliveryAddressHandler(serverCtx), + Handler: admincrmtradeaddressdelivery.DeleteDeliveryAddressHandler(serverCtx), }, }..., ), @@ -1116,32 +1116,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/warehouses", - Handler: admintradewarehouse.ListWarehousesHandler(serverCtx), + Handler: admincrmtradewarehouse.ListWarehousesHandler(serverCtx), }, { Method: http.MethodGet, Path: "/warehouses/:id", - Handler: admintradewarehouse.GetWarehouseHandler(serverCtx), + Handler: admincrmtradewarehouse.GetWarehouseHandler(serverCtx), }, { Method: http.MethodPost, Path: "/warehouses", - Handler: admintradewarehouse.CreateWarehouseHandler(serverCtx), + Handler: admincrmtradewarehouse.CreateWarehouseHandler(serverCtx), }, { Method: http.MethodPut, Path: "/warehouses/:id", - Handler: admintradewarehouse.UpdateWarehouseHandler(serverCtx), + Handler: admincrmtradewarehouse.UpdateWarehouseHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/warehouses/:id", - Handler: admintradewarehouse.PatchWarehouseHandler(serverCtx), + Handler: admincrmtradewarehouse.PatchWarehouseHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/warehouses/:id", - Handler: admintradewarehouse.DeleteWarehouseHandler(serverCtx), + Handler: admincrmtradewarehouse.DeleteWarehouseHandler(serverCtx), }, }..., ), @@ -1155,32 +1155,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/group-tree", - Handler: admincontractway.GetContractWayGroupTreeHandler(serverCtx), + Handler: adminscrmcontractway.GetContractWayGroupTreeHandler(serverCtx), }, { Method: http.MethodGet, Path: "/groups", - Handler: admincontractway.GetContractWayGroupListHandler(serverCtx), + Handler: adminscrmcontractway.GetContractWayGroupListHandler(serverCtx), }, { Method: http.MethodGet, Path: "/", - Handler: admincontractway.GetContractWaysHandler(serverCtx), + Handler: adminscrmcontractway.GetContractWaysHandler(serverCtx), }, { Method: http.MethodPost, Path: "/", - Handler: admincontractway.CreateContractWayHandler(serverCtx), + Handler: adminscrmcontractway.CreateContractWayHandler(serverCtx), }, { Method: http.MethodPut, Path: "/:id", - Handler: admincontractway.UpdateContractWayHandler(serverCtx), + Handler: adminscrmcontractway.UpdateContractWayHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/:id", - Handler: admincontractway.DeleteContractWayHandler(serverCtx), + Handler: adminscrmcontractway.DeleteContractWayHandler(serverCtx), }, }..., ), @@ -1666,42 +1666,42 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/orders/page-list", - Handler: admintradeorder.ListOrdersPageHandler(serverCtx), + Handler: admincrmtradeorder.ListOrdersPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/orders/:id", - Handler: admintradeorder.GetOrderHandler(serverCtx), + Handler: admincrmtradeorder.GetOrderHandler(serverCtx), }, { Method: http.MethodPost, Path: "/orders", - Handler: admintradeorder.CreateOrderHandler(serverCtx), + Handler: admincrmtradeorder.CreateOrderHandler(serverCtx), }, { Method: http.MethodPut, Path: "/orders/:id", - Handler: admintradeorder.PutOrderHandler(serverCtx), + Handler: admincrmtradeorder.PutOrderHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/orders/:id", - Handler: admintradeorder.PatchOrderHandler(serverCtx), + Handler: admincrmtradeorder.PatchOrderHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/orders/:id", - Handler: admintradeorder.DeleteOrderHandler(serverCtx), + Handler: admincrmtradeorder.DeleteOrderHandler(serverCtx), }, { Method: http.MethodGet, Path: "/orders/export", - Handler: admintradeorder.ExportOrdersHandler(serverCtx), + Handler: admincrmtradeorder.ExportOrdersHandler(serverCtx), }, { Method: http.MethodPost, Path: "/orders/import", - Handler: admintradeorder.ImportOrdersHandler(serverCtx), + Handler: admincrmtradeorder.ImportOrdersHandler(serverCtx), }, }..., ), @@ -1715,32 +1715,32 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/payments/page-list", - Handler: admintradepayment.ListPaymentsPageHandler(serverCtx), + Handler: admincrmtradepayment.ListPaymentsPageHandler(serverCtx), }, { Method: http.MethodGet, Path: "/payments/:id", - Handler: admintradepayment.GetPaymentHandler(serverCtx), + Handler: admincrmtradepayment.GetPaymentHandler(serverCtx), }, { Method: http.MethodPost, Path: "/payments", - Handler: admintradepayment.CreatePaymentHandler(serverCtx), + Handler: admincrmtradepayment.CreatePaymentHandler(serverCtx), }, { Method: http.MethodPut, Path: "/payments/:id", - Handler: admintradepayment.PutPaymentHandler(serverCtx), + Handler: admincrmtradepayment.PutPaymentHandler(serverCtx), }, { Method: http.MethodPatch, Path: "/payments/:id", - Handler: admintradepayment.PatchPaymentHandler(serverCtx), + Handler: admincrmtradepayment.PatchPaymentHandler(serverCtx), }, { Method: http.MethodDelete, Path: "/payments/:id", - Handler: admintradepayment.DeletePaymentHandler(serverCtx), + Handler: admincrmtradepayment.DeletePaymentHandler(serverCtx), }, }..., ), diff --git a/internal/logic/admin/business/opportunity/assignemployeetoopportunitylogic.go b/internal/logic/admin/crm/business/opportunity/assignemployeetoopportunitylogic.go similarity index 100% rename from internal/logic/admin/business/opportunity/assignemployeetoopportunitylogic.go rename to internal/logic/admin/crm/business/opportunity/assignemployeetoopportunitylogic.go diff --git a/internal/logic/admin/business/opportunity/createopportunitylogic.go b/internal/logic/admin/crm/business/opportunity/createopportunitylogic.go similarity index 100% rename from internal/logic/admin/business/opportunity/createopportunitylogic.go rename to internal/logic/admin/crm/business/opportunity/createopportunitylogic.go diff --git a/internal/logic/admin/business/opportunity/deleteopportunitylogic.go b/internal/logic/admin/crm/business/opportunity/deleteopportunitylogic.go similarity index 100% rename from internal/logic/admin/business/opportunity/deleteopportunitylogic.go rename to internal/logic/admin/crm/business/opportunity/deleteopportunitylogic.go diff --git a/internal/logic/admin/business/opportunity/getopportunitylistlogic.go b/internal/logic/admin/crm/business/opportunity/getopportunitylistlogic.go similarity index 100% rename from internal/logic/admin/business/opportunity/getopportunitylistlogic.go rename to internal/logic/admin/crm/business/opportunity/getopportunitylistlogic.go diff --git a/internal/logic/admin/business/opportunity/updateopportunitylogic.go b/internal/logic/admin/crm/business/opportunity/updateopportunitylogic.go similarity index 100% rename from internal/logic/admin/business/opportunity/updateopportunitylogic.go rename to internal/logic/admin/crm/business/opportunity/updateopportunitylogic.go diff --git a/internal/logic/admin/customerdomain/customer/assigncustomertoemployeelogic.go b/internal/logic/admin/crm/customerdomain/customer/assigncustomertoemployeelogic.go similarity index 100% rename from internal/logic/admin/customerdomain/customer/assigncustomertoemployeelogic.go rename to internal/logic/admin/crm/customerdomain/customer/assigncustomertoemployeelogic.go diff --git a/internal/logic/admin/customerdomain/customer/createcustomerlogic.go b/internal/logic/admin/crm/customerdomain/customer/createcustomerlogic.go similarity index 97% rename from internal/logic/admin/customerdomain/customer/createcustomerlogic.go rename to internal/logic/admin/crm/customerdomain/customer/createcustomerlogic.go index 6d79dc53..8e94ea18 100644 --- a/internal/logic/admin/customerdomain/customer/createcustomerlogic.go +++ b/internal/logic/admin/crm/customerdomain/customer/createcustomerlogic.go @@ -1,7 +1,7 @@ package customer import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/svc" "PowerX/internal/types" "context" diff --git a/internal/logic/admin/customerdomain/customer/deletecustomerlogic.go b/internal/logic/admin/crm/customerdomain/customer/deletecustomerlogic.go similarity index 100% rename from internal/logic/admin/customerdomain/customer/deletecustomerlogic.go rename to internal/logic/admin/crm/customerdomain/customer/deletecustomerlogic.go diff --git a/internal/logic/admin/customerdomain/customer/getcustomerlogic.go b/internal/logic/admin/crm/customerdomain/customer/getcustomerlogic.go similarity index 97% rename from internal/logic/admin/customerdomain/customer/getcustomerlogic.go rename to internal/logic/admin/crm/customerdomain/customer/getcustomerlogic.go index 2fca92df..e0683566 100644 --- a/internal/logic/admin/customerdomain/customer/getcustomerlogic.go +++ b/internal/logic/admin/crm/customerdomain/customer/getcustomerlogic.go @@ -1,7 +1,7 @@ package customer import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" "PowerX/pkg/securityx" "context" diff --git a/internal/logic/admin/customerdomain/customer/listcustomerspagelogic.go b/internal/logic/admin/crm/customerdomain/customer/listcustomerspagelogic.go similarity index 93% rename from internal/logic/admin/customerdomain/customer/listcustomerspagelogic.go rename to internal/logic/admin/crm/customerdomain/customer/listcustomerspagelogic.go index 9d388c92..28cdfe09 100644 --- a/internal/logic/admin/customerdomain/customer/listcustomerspagelogic.go +++ b/internal/logic/admin/crm/customerdomain/customer/listcustomerspagelogic.go @@ -1,8 +1,8 @@ package customer import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/uc/powerx/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/customerdomain/customer/patchcustomerlogic.go b/internal/logic/admin/crm/customerdomain/customer/patchcustomerlogic.go similarity index 95% rename from internal/logic/admin/customerdomain/customer/patchcustomerlogic.go rename to internal/logic/admin/crm/customerdomain/customer/patchcustomerlogic.go index 5a691684..d09a02a7 100644 --- a/internal/logic/admin/customerdomain/customer/patchcustomerlogic.go +++ b/internal/logic/admin/crm/customerdomain/customer/patchcustomerlogic.go @@ -1,7 +1,7 @@ package customer import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/customerdomain/customer/putcustomerlogic.go b/internal/logic/admin/crm/customerdomain/customer/putcustomerlogic.go similarity index 100% rename from internal/logic/admin/customerdomain/customer/putcustomerlogic.go rename to internal/logic/admin/crm/customerdomain/customer/putcustomerlogic.go diff --git a/internal/logic/admin/customerdomain/leader/assignleadtoemployeelogic.go b/internal/logic/admin/crm/customerdomain/leader/assignleadtoemployeelogic.go similarity index 100% rename from internal/logic/admin/customerdomain/leader/assignleadtoemployeelogic.go rename to internal/logic/admin/crm/customerdomain/leader/assignleadtoemployeelogic.go diff --git a/internal/logic/admin/customerdomain/leader/createleadlogic.go b/internal/logic/admin/crm/customerdomain/leader/createleadlogic.go similarity index 97% rename from internal/logic/admin/customerdomain/leader/createleadlogic.go rename to internal/logic/admin/crm/customerdomain/leader/createleadlogic.go index 7862365e..5bef1fa6 100644 --- a/internal/logic/admin/customerdomain/leader/createleadlogic.go +++ b/internal/logic/admin/crm/customerdomain/leader/createleadlogic.go @@ -1,7 +1,7 @@ package leader import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/svc" "PowerX/internal/types" "context" diff --git a/internal/logic/admin/customerdomain/leader/deleteleadlogic.go b/internal/logic/admin/crm/customerdomain/leader/deleteleadlogic.go similarity index 100% rename from internal/logic/admin/customerdomain/leader/deleteleadlogic.go rename to internal/logic/admin/crm/customerdomain/leader/deleteleadlogic.go diff --git a/internal/logic/admin/customerdomain/leader/getleadlogic.go b/internal/logic/admin/crm/customerdomain/leader/getleadlogic.go similarity index 97% rename from internal/logic/admin/customerdomain/leader/getleadlogic.go rename to internal/logic/admin/crm/customerdomain/leader/getleadlogic.go index f201793a..2e90b849 100644 --- a/internal/logic/admin/customerdomain/leader/getleadlogic.go +++ b/internal/logic/admin/crm/customerdomain/leader/getleadlogic.go @@ -1,7 +1,7 @@ package leader import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" "PowerX/pkg/securityx" "context" diff --git a/internal/logic/admin/customerdomain/leader/listleadspagelogic.go b/internal/logic/admin/crm/customerdomain/leader/listleadspagelogic.go similarity index 92% rename from internal/logic/admin/customerdomain/leader/listleadspagelogic.go rename to internal/logic/admin/crm/customerdomain/leader/listleadspagelogic.go index e65f1ad9..4d25e2a9 100644 --- a/internal/logic/admin/customerdomain/leader/listleadspagelogic.go +++ b/internal/logic/admin/crm/customerdomain/leader/listleadspagelogic.go @@ -1,8 +1,8 @@ package leader import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/uc/powerx/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/customerdomain/leader/patchleadlogic.go b/internal/logic/admin/crm/customerdomain/leader/patchleadlogic.go similarity index 95% rename from internal/logic/admin/customerdomain/leader/patchleadlogic.go rename to internal/logic/admin/crm/customerdomain/leader/patchleadlogic.go index d3f4977e..332bfe15 100644 --- a/internal/logic/admin/customerdomain/leader/patchleadlogic.go +++ b/internal/logic/admin/crm/customerdomain/leader/patchleadlogic.go @@ -1,7 +1,7 @@ package leader import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/customerdomain/leader/patchproductlogic.go b/internal/logic/admin/crm/customerdomain/leader/patchproductlogic.go similarity index 100% rename from internal/logic/admin/customerdomain/leader/patchproductlogic.go rename to internal/logic/admin/crm/customerdomain/leader/patchproductlogic.go diff --git a/internal/logic/admin/customerdomain/leader/putleadlogic.go b/internal/logic/admin/crm/customerdomain/leader/putleadlogic.go similarity index 100% rename from internal/logic/admin/customerdomain/leader/putleadlogic.go rename to internal/logic/admin/crm/customerdomain/leader/putleadlogic.go diff --git a/internal/logic/admin/market/media/createmedialogic.go b/internal/logic/admin/crm/market/media/createmedialogic.go similarity index 97% rename from internal/logic/admin/market/media/createmedialogic.go rename to internal/logic/admin/crm/market/media/createmedialogic.go index a468970e..c749dab2 100644 --- a/internal/logic/admin/market/media/createmedialogic.go +++ b/internal/logic/admin/crm/market/media/createmedialogic.go @@ -1,7 +1,7 @@ package media import ( - "PowerX/internal/model/market" + "PowerX/internal/model/crm/market" "PowerX/internal/model/media" "PowerX/internal/uc/powerx" "context" diff --git a/internal/logic/admin/market/media/deletemedialogic.go b/internal/logic/admin/crm/market/media/deletemedialogic.go similarity index 100% rename from internal/logic/admin/market/media/deletemedialogic.go rename to internal/logic/admin/crm/market/media/deletemedialogic.go diff --git a/internal/logic/admin/market/media/getmedialogic.go b/internal/logic/admin/crm/market/media/getmedialogic.go similarity index 97% rename from internal/logic/admin/market/media/getmedialogic.go rename to internal/logic/admin/crm/market/media/getmedialogic.go index 9fccade5..f74960d3 100644 --- a/internal/logic/admin/market/media/getmedialogic.go +++ b/internal/logic/admin/crm/market/media/getmedialogic.go @@ -2,7 +2,7 @@ package media import ( "PowerX/internal/logic/admin/mediaresource" - "PowerX/internal/model/market" + "PowerX/internal/model/crm/market" "PowerX/internal/model/media" "context" diff --git a/internal/logic/admin/market/media/listmediaspagelogic.go b/internal/logic/admin/crm/market/media/listmediaspagelogic.go similarity index 93% rename from internal/logic/admin/market/media/listmediaspagelogic.go rename to internal/logic/admin/crm/market/media/listmediaspagelogic.go index 38dfb7d1..44a74cfe 100644 --- a/internal/logic/admin/market/media/listmediaspagelogic.go +++ b/internal/logic/admin/crm/market/media/listmediaspagelogic.go @@ -1,8 +1,8 @@ package media import ( - market2 "PowerX/internal/model/market" - "PowerX/internal/uc/powerx/market" + market2 "PowerX/internal/model/crm/market" + "PowerX/internal/uc/powerx/crm/market" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/market/media/updatemedialogic.go b/internal/logic/admin/crm/market/media/updatemedialogic.go similarity index 100% rename from internal/logic/admin/market/media/updatemedialogic.go rename to internal/logic/admin/crm/market/media/updatemedialogic.go diff --git a/internal/logic/admin/market/store/assignstoretostorecategorylogic.go b/internal/logic/admin/crm/market/store/assignstoretostorecategorylogic.go similarity index 100% rename from internal/logic/admin/market/store/assignstoretostorecategorylogic.go rename to internal/logic/admin/crm/market/store/assignstoretostorecategorylogic.go diff --git a/internal/logic/admin/market/store/assignstoretostoremanagerlogic.go b/internal/logic/admin/crm/market/store/assignstoretostoremanagerlogic.go similarity index 100% rename from internal/logic/admin/market/store/assignstoretostoremanagerlogic.go rename to internal/logic/admin/crm/market/store/assignstoretostoremanagerlogic.go diff --git a/internal/logic/admin/market/store/createstorelogic.go b/internal/logic/admin/crm/market/store/createstorelogic.go similarity index 98% rename from internal/logic/admin/market/store/createstorelogic.go rename to internal/logic/admin/crm/market/store/createstorelogic.go index 9ee43329..46ec690c 100644 --- a/internal/logic/admin/market/store/createstorelogic.go +++ b/internal/logic/admin/crm/market/store/createstorelogic.go @@ -1,7 +1,7 @@ package store import ( - "PowerX/internal/model/market" + "PowerX/internal/model/crm/market" "PowerX/internal/model/media" "PowerX/internal/uc/powerx" "PowerX/pkg/datetime/carbonx" diff --git a/internal/logic/admin/market/store/deletestorelogic.go b/internal/logic/admin/crm/market/store/deletestorelogic.go similarity index 100% rename from internal/logic/admin/market/store/deletestorelogic.go rename to internal/logic/admin/crm/market/store/deletestorelogic.go diff --git a/internal/logic/admin/market/store/getstorelogic.go b/internal/logic/admin/crm/market/store/getstorelogic.go similarity index 97% rename from internal/logic/admin/market/store/getstorelogic.go rename to internal/logic/admin/crm/market/store/getstorelogic.go index 269c93db..d7cf0555 100644 --- a/internal/logic/admin/market/store/getstorelogic.go +++ b/internal/logic/admin/crm/market/store/getstorelogic.go @@ -1,7 +1,7 @@ package store import ( - product2 "PowerX/internal/model/product" + product2 "PowerX/internal/model/crm/product" "PowerX/internal/types/errorx" "context" diff --git a/internal/logic/admin/market/store/liststorespagelogic.go b/internal/logic/admin/crm/market/store/liststorespagelogic.go similarity index 96% rename from internal/logic/admin/market/store/liststorespagelogic.go rename to internal/logic/admin/crm/market/store/liststorespagelogic.go index b826cb0c..63e85ccd 100644 --- a/internal/logic/admin/market/store/liststorespagelogic.go +++ b/internal/logic/admin/crm/market/store/liststorespagelogic.go @@ -2,9 +2,9 @@ package store import ( "PowerX/internal/logic/admin/mediaresource" - product2 "PowerX/internal/model/market" + product2 "PowerX/internal/model/crm/market" "PowerX/internal/model/media" - "PowerX/internal/uc/powerx/market" + "PowerX/internal/uc/powerx/crm/market" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/market/store/putstorelogic.go b/internal/logic/admin/crm/market/store/putstorelogic.go similarity index 100% rename from internal/logic/admin/market/store/putstorelogic.go rename to internal/logic/admin/crm/market/store/putstorelogic.go diff --git a/internal/logic/admin/product/artisan/bindartisantostorelogic.go b/internal/logic/admin/crm/product/artisan/bindartisantostorelogic.go similarity index 95% rename from internal/logic/admin/product/artisan/bindartisantostorelogic.go rename to internal/logic/admin/crm/product/artisan/bindartisantostorelogic.go index 302133ec..2e43bb97 100644 --- a/internal/logic/admin/product/artisan/bindartisantostorelogic.go +++ b/internal/logic/admin/crm/product/artisan/bindartisantostorelogic.go @@ -3,8 +3,8 @@ package artisan import ( "PowerX/internal/model/powermodel" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/market" - product2 "PowerX/internal/uc/powerx/product" + "PowerX/internal/uc/powerx/crm/market" + product2 "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/artisan/createartisanlogic.go b/internal/logic/admin/crm/product/artisan/createartisanlogic.go similarity index 98% rename from internal/logic/admin/product/artisan/createartisanlogic.go rename to internal/logic/admin/crm/product/artisan/createartisanlogic.go index 347543a8..68201ac1 100644 --- a/internal/logic/admin/product/artisan/createartisanlogic.go +++ b/internal/logic/admin/crm/product/artisan/createartisanlogic.go @@ -1,8 +1,8 @@ package artisan import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" - "PowerX/internal/model/product" "PowerX/internal/uc/powerx" "context" "github.com/golang-module/carbon/v2" diff --git a/internal/logic/admin/product/artisan/deleteartisanlogic.go b/internal/logic/admin/crm/product/artisan/deleteartisanlogic.go similarity index 100% rename from internal/logic/admin/product/artisan/deleteartisanlogic.go rename to internal/logic/admin/crm/product/artisan/deleteartisanlogic.go diff --git a/internal/logic/admin/product/artisan/getartisanlogic.go b/internal/logic/admin/crm/product/artisan/getartisanlogic.go similarity index 100% rename from internal/logic/admin/product/artisan/getartisanlogic.go rename to internal/logic/admin/crm/product/artisan/getartisanlogic.go diff --git a/internal/logic/admin/product/artisan/listartisanspagelogic.go b/internal/logic/admin/crm/product/artisan/listartisanspagelogic.go similarity index 96% rename from internal/logic/admin/product/artisan/listartisanspagelogic.go rename to internal/logic/admin/crm/product/artisan/listartisanspagelogic.go index f87cd3d5..445a0b08 100644 --- a/internal/logic/admin/product/artisan/listartisanspagelogic.go +++ b/internal/logic/admin/crm/product/artisan/listartisanspagelogic.go @@ -2,9 +2,9 @@ package artisan import ( "PowerX/internal/logic/admin/mediaresource" + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" - "PowerX/internal/model/product" - product3 "PowerX/internal/uc/powerx/product" + product3 "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/artisan/putartisanlogic.go b/internal/logic/admin/crm/product/artisan/putartisanlogic.go similarity index 100% rename from internal/logic/admin/product/artisan/putartisanlogic.go rename to internal/logic/admin/crm/product/artisan/putartisanlogic.go diff --git a/internal/logic/admin/product/assignproducttoproductcategorylogic.go b/internal/logic/admin/crm/product/assignproducttoproductcategorylogic.go similarity index 100% rename from internal/logic/admin/product/assignproducttoproductcategorylogic.go rename to internal/logic/admin/crm/product/assignproducttoproductcategorylogic.go diff --git a/internal/logic/admin/product/category/createproductcategorylogic.go b/internal/logic/admin/crm/product/category/createproductcategorylogic.go similarity index 97% rename from internal/logic/admin/product/category/createproductcategorylogic.go rename to internal/logic/admin/crm/product/category/createproductcategorylogic.go index 8213ae86..0ce4ff92 100644 --- a/internal/logic/admin/product/category/createproductcategorylogic.go +++ b/internal/logic/admin/crm/product/category/createproductcategorylogic.go @@ -2,7 +2,7 @@ package category import ( "PowerX/internal/model" - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/category/deleteproductcategorylogic.go b/internal/logic/admin/crm/product/category/deleteproductcategorylogic.go similarity index 100% rename from internal/logic/admin/product/category/deleteproductcategorylogic.go rename to internal/logic/admin/crm/product/category/deleteproductcategorylogic.go diff --git a/internal/logic/admin/product/category/getproductcategorylogic.go b/internal/logic/admin/crm/product/category/getproductcategorylogic.go similarity index 100% rename from internal/logic/admin/product/category/getproductcategorylogic.go rename to internal/logic/admin/crm/product/category/getproductcategorylogic.go diff --git a/internal/logic/admin/product/category/listproductcategorytreelogic.go b/internal/logic/admin/crm/product/category/listproductcategorytreelogic.go similarity index 96% rename from internal/logic/admin/product/category/listproductcategorytreelogic.go rename to internal/logic/admin/crm/product/category/listproductcategorytreelogic.go index ce953d45..f9a7ce3c 100644 --- a/internal/logic/admin/product/category/listproductcategorytreelogic.go +++ b/internal/logic/admin/crm/product/category/listproductcategorytreelogic.go @@ -2,8 +2,8 @@ package category import ( "PowerX/internal/logic/admin/mediaresource" - "PowerX/internal/model/product" - product2 "PowerX/internal/uc/powerx/product" + "PowerX/internal/model/crm/product" + product2 "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/category/patchproductcategorylogic.go b/internal/logic/admin/crm/product/category/patchproductcategorylogic.go similarity index 97% rename from internal/logic/admin/product/category/patchproductcategorylogic.go rename to internal/logic/admin/crm/product/category/patchproductcategorylogic.go index b7f64dd2..ec1bb486 100644 --- a/internal/logic/admin/product/category/patchproductcategorylogic.go +++ b/internal/logic/admin/crm/product/category/patchproductcategorylogic.go @@ -1,8 +1,8 @@ package category import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/category/updateproductcategorylogic.go b/internal/logic/admin/crm/product/category/updateproductcategorylogic.go similarity index 100% rename from internal/logic/admin/product/category/updateproductcategorylogic.go rename to internal/logic/admin/crm/product/category/updateproductcategorylogic.go diff --git a/internal/logic/admin/product/createproductlogic.go b/internal/logic/admin/crm/product/createproductlogic.go similarity index 97% rename from internal/logic/admin/product/createproductlogic.go rename to internal/logic/admin/crm/product/createproductlogic.go index 126a447c..b8397f1e 100644 --- a/internal/logic/admin/product/createproductlogic.go +++ b/internal/logic/admin/crm/product/createproductlogic.go @@ -1,16 +1,16 @@ package product import ( + "PowerX/internal/logic/admin/crm/product/category" + "PowerX/internal/logic/admin/crm/product/pricebookentry" "PowerX/internal/logic/admin/mediaresource" - "PowerX/internal/logic/admin/product/category" - "PowerX/internal/logic/admin/product/pricebookentry" "PowerX/internal/model" + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" - "PowerX/internal/model/product" "PowerX/internal/svc" "PowerX/internal/types" "PowerX/internal/uc/powerx" - product2 "PowerX/internal/uc/powerx/product" + product2 "PowerX/internal/uc/powerx/crm/product" "context" "encoding/json" "github.com/golang-module/carbon/v2" diff --git a/internal/logic/admin/product/deleteproductlogic.go b/internal/logic/admin/crm/product/deleteproductlogic.go similarity index 100% rename from internal/logic/admin/product/deleteproductlogic.go rename to internal/logic/admin/crm/product/deleteproductlogic.go diff --git a/internal/logic/admin/product/getproductlogic.go b/internal/logic/admin/crm/product/getproductlogic.go similarity index 100% rename from internal/logic/admin/product/getproductlogic.go rename to internal/logic/admin/crm/product/getproductlogic.go diff --git a/internal/logic/admin/product/listproductspagelogic.go b/internal/logic/admin/crm/product/listproductspagelogic.go similarity index 94% rename from internal/logic/admin/product/listproductspagelogic.go rename to internal/logic/admin/crm/product/listproductspagelogic.go index 65058f81..a1436e85 100644 --- a/internal/logic/admin/product/listproductspagelogic.go +++ b/internal/logic/admin/crm/product/listproductspagelogic.go @@ -1,10 +1,10 @@ package product import ( - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" "PowerX/internal/svc" "PowerX/internal/types" - productUC "PowerX/internal/uc/powerx/product" + productUC "PowerX/internal/uc/powerx/crm/product" "context" "github.com/zeromicro/go-zero/core/logx" diff --git a/internal/logic/admin/product/patchproductlogic.go b/internal/logic/admin/crm/product/patchproductlogic.go similarity index 100% rename from internal/logic/admin/product/patchproductlogic.go rename to internal/logic/admin/crm/product/patchproductlogic.go diff --git a/internal/logic/admin/product/pricebook/deletepricebooklogic.go b/internal/logic/admin/crm/product/pricebook/deletepricebooklogic.go similarity index 100% rename from internal/logic/admin/product/pricebook/deletepricebooklogic.go rename to internal/logic/admin/crm/product/pricebook/deletepricebooklogic.go diff --git a/internal/logic/admin/product/pricebook/getpricebooklogic.go b/internal/logic/admin/crm/product/pricebook/getpricebooklogic.go similarity index 100% rename from internal/logic/admin/product/pricebook/getpricebooklogic.go rename to internal/logic/admin/crm/product/pricebook/getpricebooklogic.go diff --git a/internal/logic/admin/product/pricebook/listpricebookslogic.go b/internal/logic/admin/crm/product/pricebook/listpricebookslogic.go similarity index 96% rename from internal/logic/admin/product/pricebook/listpricebookslogic.go rename to internal/logic/admin/crm/product/pricebook/listpricebookslogic.go index 2d31e65c..c8833acf 100644 --- a/internal/logic/admin/product/pricebook/listpricebookslogic.go +++ b/internal/logic/admin/crm/product/pricebook/listpricebookslogic.go @@ -1,7 +1,7 @@ package pricebook import ( - product2 "PowerX/internal/uc/powerx/product" + product2 "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/pricebook/upsertpricebooklogic.go b/internal/logic/admin/crm/product/pricebook/upsertpricebooklogic.go similarity index 97% rename from internal/logic/admin/product/pricebook/upsertpricebooklogic.go rename to internal/logic/admin/crm/product/pricebook/upsertpricebooklogic.go index 63e16ccb..9e3bb594 100644 --- a/internal/logic/admin/product/pricebook/upsertpricebooklogic.go +++ b/internal/logic/admin/crm/product/pricebook/upsertpricebooklogic.go @@ -1,8 +1,8 @@ package pricebook import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "PowerX/internal/svc" "PowerX/internal/types" "PowerX/internal/types/errorx" diff --git a/internal/logic/admin/product/pricebookentry/configpricebookentrylogic.go b/internal/logic/admin/crm/product/pricebookentry/configpricebookentrylogic.go similarity index 98% rename from internal/logic/admin/product/pricebookentry/configpricebookentrylogic.go rename to internal/logic/admin/crm/product/pricebookentry/configpricebookentrylogic.go index 4987ded9..9e8f1921 100644 --- a/internal/logic/admin/product/pricebookentry/configpricebookentrylogic.go +++ b/internal/logic/admin/crm/product/pricebookentry/configpricebookentrylogic.go @@ -1,7 +1,7 @@ package pricebookentry import ( - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" "context" "github.com/kr/pretty" "github.com/pkg/errors" diff --git a/internal/logic/admin/product/pricebookentry/deletepricebookentrylogic.go b/internal/logic/admin/crm/product/pricebookentry/deletepricebookentrylogic.go similarity index 100% rename from internal/logic/admin/product/pricebookentry/deletepricebookentrylogic.go rename to internal/logic/admin/crm/product/pricebookentry/deletepricebookentrylogic.go diff --git a/internal/logic/admin/product/pricebookentry/getpricebookentrylogic.go b/internal/logic/admin/crm/product/pricebookentry/getpricebookentrylogic.go similarity index 97% rename from internal/logic/admin/product/pricebookentry/getpricebookentrylogic.go rename to internal/logic/admin/crm/product/pricebookentry/getpricebookentrylogic.go index 38cc9590..0ce2c980 100644 --- a/internal/logic/admin/product/pricebookentry/getpricebookentrylogic.go +++ b/internal/logic/admin/crm/product/pricebookentry/getpricebookentrylogic.go @@ -1,7 +1,7 @@ package pricebookentry import ( - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "context" diff --git a/internal/logic/admin/product/pricebookentry/listpricebookentrieslogic.go b/internal/logic/admin/crm/product/pricebookentry/listpricebookentrieslogic.go similarity index 96% rename from internal/logic/admin/product/pricebookentry/listpricebookentrieslogic.go rename to internal/logic/admin/crm/product/pricebookentry/listpricebookentrieslogic.go index d3378632..9905e6e3 100644 --- a/internal/logic/admin/product/pricebookentry/listpricebookentrieslogic.go +++ b/internal/logic/admin/crm/product/pricebookentry/listpricebookentrieslogic.go @@ -1,8 +1,8 @@ package pricebookentry import ( - "PowerX/internal/model/product" - product2 "PowerX/internal/uc/powerx/product" + "PowerX/internal/model/crm/product" + product2 "PowerX/internal/uc/powerx/crm/product" "context" "math" diff --git a/internal/logic/admin/product/pricebookentry/updatepricebookentrylogic.go b/internal/logic/admin/crm/product/pricebookentry/updatepricebookentrylogic.go similarity index 96% rename from internal/logic/admin/product/pricebookentry/updatepricebookentrylogic.go rename to internal/logic/admin/crm/product/pricebookentry/updatepricebookentrylogic.go index 98a17f1d..4d00df71 100644 --- a/internal/logic/admin/product/pricebookentry/updatepricebookentrylogic.go +++ b/internal/logic/admin/crm/product/pricebookentry/updatepricebookentrylogic.go @@ -1,8 +1,8 @@ package pricebookentry import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/productspecific/configproductspecificlogic.go b/internal/logic/admin/crm/product/productspecific/configproductspecificlogic.go similarity index 97% rename from internal/logic/admin/product/productspecific/configproductspecificlogic.go rename to internal/logic/admin/crm/product/productspecific/configproductspecificlogic.go index 2f023d65..e3de19f1 100644 --- a/internal/logic/admin/product/productspecific/configproductspecificlogic.go +++ b/internal/logic/admin/crm/product/productspecific/configproductspecificlogic.go @@ -1,7 +1,7 @@ package productspecific import ( - product2 "PowerX/internal/model/product" + product2 "PowerX/internal/model/crm/product" "PowerX/internal/types/errorx" "context" diff --git a/internal/logic/admin/product/productspecific/createproductspecificlogic.go b/internal/logic/admin/crm/product/productspecific/createproductspecificlogic.go similarity index 98% rename from internal/logic/admin/product/productspecific/createproductspecificlogic.go rename to internal/logic/admin/crm/product/productspecific/createproductspecificlogic.go index 13a7c967..c1af7c29 100644 --- a/internal/logic/admin/product/productspecific/createproductspecificlogic.go +++ b/internal/logic/admin/crm/product/productspecific/createproductspecificlogic.go @@ -1,7 +1,7 @@ package productspecific import ( - product2 "PowerX/internal/model/product" + product2 "PowerX/internal/model/crm/product" "context" "time" diff --git a/internal/logic/admin/product/productspecific/deleteproductspecificlogic.go b/internal/logic/admin/crm/product/productspecific/deleteproductspecificlogic.go similarity index 100% rename from internal/logic/admin/product/productspecific/deleteproductspecificlogic.go rename to internal/logic/admin/crm/product/productspecific/deleteproductspecificlogic.go diff --git a/internal/logic/admin/product/productspecific/getproductspecificlogic.go b/internal/logic/admin/crm/product/productspecific/getproductspecificlogic.go similarity index 97% rename from internal/logic/admin/product/productspecific/getproductspecificlogic.go rename to internal/logic/admin/crm/product/productspecific/getproductspecificlogic.go index ec88c52e..dcade3ff 100644 --- a/internal/logic/admin/product/productspecific/getproductspecificlogic.go +++ b/internal/logic/admin/crm/product/productspecific/getproductspecificlogic.go @@ -1,7 +1,7 @@ package productspecific import ( - product2 "PowerX/internal/model/product" + product2 "PowerX/internal/model/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/product/productspecific/listproductspecificpagelogic.go b/internal/logic/admin/crm/product/productspecific/listproductspecificpagelogic.go similarity index 94% rename from internal/logic/admin/product/productspecific/listproductspecificpagelogic.go rename to internal/logic/admin/crm/product/productspecific/listproductspecificpagelogic.go index 79c76b2f..efb1bf2d 100644 --- a/internal/logic/admin/product/productspecific/listproductspecificpagelogic.go +++ b/internal/logic/admin/crm/product/productspecific/listproductspecificpagelogic.go @@ -1,11 +1,11 @@ package productspecific import ( - product2 "PowerX/internal/model/product" + product2 "PowerX/internal/model/crm/product" "PowerX/internal/svc" "PowerX/internal/types" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/product" + "PowerX/internal/uc/powerx/crm/product" "context" "github.com/zeromicro/go-zero/core/logx" diff --git a/internal/logic/admin/product/productspecific/patchproductspecificlogic.go b/internal/logic/admin/crm/product/productspecific/patchproductspecificlogic.go similarity index 100% rename from internal/logic/admin/product/productspecific/patchproductspecificlogic.go rename to internal/logic/admin/crm/product/productspecific/patchproductspecificlogic.go diff --git a/internal/logic/admin/product/productspecific/putproductspecificlogic.go b/internal/logic/admin/crm/product/productspecific/putproductspecificlogic.go similarity index 100% rename from internal/logic/admin/product/productspecific/putproductspecificlogic.go rename to internal/logic/admin/crm/product/productspecific/putproductspecificlogic.go diff --git a/internal/logic/admin/product/putproductlogic.go b/internal/logic/admin/crm/product/putproductlogic.go similarity index 98% rename from internal/logic/admin/product/putproductlogic.go rename to internal/logic/admin/crm/product/putproductlogic.go index ae51f135..8e64ac87 100644 --- a/internal/logic/admin/product/putproductlogic.go +++ b/internal/logic/admin/crm/product/putproductlogic.go @@ -6,7 +6,7 @@ import ( "PowerX/internal/svc" "PowerX/internal/types" "PowerX/internal/uc/powerx" - product2 "PowerX/internal/uc/powerx/product" + product2 "PowerX/internal/uc/powerx/crm/product" "context" "github.com/zeromicro/go-zero/core/logx" diff --git a/internal/logic/admin/product/sku/configskulogic.go b/internal/logic/admin/crm/product/sku/configskulogic.go similarity index 96% rename from internal/logic/admin/product/sku/configskulogic.go rename to internal/logic/admin/crm/product/sku/configskulogic.go index 497c5612..b4069035 100644 --- a/internal/logic/admin/product/sku/configskulogic.go +++ b/internal/logic/admin/crm/product/sku/configskulogic.go @@ -1,7 +1,7 @@ package sku import ( - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" "PowerX/internal/types/errorx" "context" diff --git a/internal/logic/admin/product/sku/createskulogic.go b/internal/logic/admin/crm/product/sku/createskulogic.go similarity index 95% rename from internal/logic/admin/product/sku/createskulogic.go rename to internal/logic/admin/crm/product/sku/createskulogic.go index a3c17417..e4466997 100644 --- a/internal/logic/admin/product/sku/createskulogic.go +++ b/internal/logic/admin/crm/product/sku/createskulogic.go @@ -1,7 +1,7 @@ package sku import ( - product2 "PowerX/internal/model/product" + product2 "PowerX/internal/model/crm/product" "context" "github.com/ArtisanCloud/PowerLibs/v3/object" diff --git a/internal/logic/admin/product/sku/deleteskulogic.go b/internal/logic/admin/crm/product/sku/deleteskulogic.go similarity index 100% rename from internal/logic/admin/product/sku/deleteskulogic.go rename to internal/logic/admin/crm/product/sku/deleteskulogic.go diff --git a/internal/logic/admin/product/sku/getskulogic.go b/internal/logic/admin/crm/product/sku/getskulogic.go similarity index 100% rename from internal/logic/admin/product/sku/getskulogic.go rename to internal/logic/admin/crm/product/sku/getskulogic.go diff --git a/internal/logic/admin/product/sku/listskupagelogic.go b/internal/logic/admin/crm/product/sku/listskupagelogic.go similarity index 100% rename from internal/logic/admin/product/sku/listskupagelogic.go rename to internal/logic/admin/crm/product/sku/listskupagelogic.go diff --git a/internal/logic/admin/product/sku/patchskulogic.go b/internal/logic/admin/crm/product/sku/patchskulogic.go similarity index 100% rename from internal/logic/admin/product/sku/patchskulogic.go rename to internal/logic/admin/crm/product/sku/patchskulogic.go diff --git a/internal/logic/admin/product/sku/putskulogic.go b/internal/logic/admin/crm/product/sku/putskulogic.go similarity index 100% rename from internal/logic/admin/product/sku/putskulogic.go rename to internal/logic/admin/crm/product/sku/putskulogic.go diff --git a/internal/logic/admin/trade/address/billing/createbillingaddresslogic.go b/internal/logic/admin/crm/trade/address/billing/createbillingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/billing/createbillingaddresslogic.go rename to internal/logic/admin/crm/trade/address/billing/createbillingaddresslogic.go diff --git a/internal/logic/admin/trade/address/billing/deletebillingaddresslogic.go b/internal/logic/admin/crm/trade/address/billing/deletebillingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/billing/deletebillingaddresslogic.go rename to internal/logic/admin/crm/trade/address/billing/deletebillingaddresslogic.go diff --git a/internal/logic/admin/trade/address/billing/getbillingaddresslogic.go b/internal/logic/admin/crm/trade/address/billing/getbillingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/billing/getbillingaddresslogic.go rename to internal/logic/admin/crm/trade/address/billing/getbillingaddresslogic.go diff --git a/internal/logic/admin/trade/address/billing/listbillingaddressespagelogic.go b/internal/logic/admin/crm/trade/address/billing/listbillingaddressespagelogic.go similarity index 100% rename from internal/logic/admin/trade/address/billing/listbillingaddressespagelogic.go rename to internal/logic/admin/crm/trade/address/billing/listbillingaddressespagelogic.go diff --git a/internal/logic/admin/trade/address/billing/patchbillingaddresslogic.go b/internal/logic/admin/crm/trade/address/billing/patchbillingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/billing/patchbillingaddresslogic.go rename to internal/logic/admin/crm/trade/address/billing/patchbillingaddresslogic.go diff --git a/internal/logic/admin/trade/address/billing/putbillingaddresslogic.go b/internal/logic/admin/crm/trade/address/billing/putbillingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/billing/putbillingaddresslogic.go rename to internal/logic/admin/crm/trade/address/billing/putbillingaddresslogic.go diff --git a/internal/logic/admin/trade/address/delivery/createdeliveryaddresslogic.go b/internal/logic/admin/crm/trade/address/delivery/createdeliveryaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/delivery/createdeliveryaddresslogic.go rename to internal/logic/admin/crm/trade/address/delivery/createdeliveryaddresslogic.go diff --git a/internal/logic/admin/trade/address/delivery/deletedeliveryaddresslogic.go b/internal/logic/admin/crm/trade/address/delivery/deletedeliveryaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/delivery/deletedeliveryaddresslogic.go rename to internal/logic/admin/crm/trade/address/delivery/deletedeliveryaddresslogic.go diff --git a/internal/logic/admin/trade/address/delivery/getdeliveryaddresslogic.go b/internal/logic/admin/crm/trade/address/delivery/getdeliveryaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/delivery/getdeliveryaddresslogic.go rename to internal/logic/admin/crm/trade/address/delivery/getdeliveryaddresslogic.go diff --git a/internal/logic/admin/trade/address/delivery/listdeliveryaddressespagelogic.go b/internal/logic/admin/crm/trade/address/delivery/listdeliveryaddressespagelogic.go similarity index 100% rename from internal/logic/admin/trade/address/delivery/listdeliveryaddressespagelogic.go rename to internal/logic/admin/crm/trade/address/delivery/listdeliveryaddressespagelogic.go diff --git a/internal/logic/admin/trade/address/delivery/patchdeliveryaddresslogic.go b/internal/logic/admin/crm/trade/address/delivery/patchdeliveryaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/delivery/patchdeliveryaddresslogic.go rename to internal/logic/admin/crm/trade/address/delivery/patchdeliveryaddresslogic.go diff --git a/internal/logic/admin/trade/address/delivery/putdeliveryaddresslogic.go b/internal/logic/admin/crm/trade/address/delivery/putdeliveryaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/delivery/putdeliveryaddresslogic.go rename to internal/logic/admin/crm/trade/address/delivery/putdeliveryaddresslogic.go diff --git a/internal/logic/admin/trade/address/shipping/createshippingaddresslogic.go b/internal/logic/admin/crm/trade/address/shipping/createshippingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/shipping/createshippingaddresslogic.go rename to internal/logic/admin/crm/trade/address/shipping/createshippingaddresslogic.go diff --git a/internal/logic/admin/trade/address/shipping/deleteshippingaddresslogic.go b/internal/logic/admin/crm/trade/address/shipping/deleteshippingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/shipping/deleteshippingaddresslogic.go rename to internal/logic/admin/crm/trade/address/shipping/deleteshippingaddresslogic.go diff --git a/internal/logic/admin/trade/address/shipping/getshippingaddresslogic.go b/internal/logic/admin/crm/trade/address/shipping/getshippingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/shipping/getshippingaddresslogic.go rename to internal/logic/admin/crm/trade/address/shipping/getshippingaddresslogic.go diff --git a/internal/logic/admin/trade/address/shipping/listshippingaddressespagelogic.go b/internal/logic/admin/crm/trade/address/shipping/listshippingaddressespagelogic.go similarity index 100% rename from internal/logic/admin/trade/address/shipping/listshippingaddressespagelogic.go rename to internal/logic/admin/crm/trade/address/shipping/listshippingaddressespagelogic.go diff --git a/internal/logic/admin/trade/address/shipping/patchshippingaddresslogic.go b/internal/logic/admin/crm/trade/address/shipping/patchshippingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/shipping/patchshippingaddresslogic.go rename to internal/logic/admin/crm/trade/address/shipping/patchshippingaddresslogic.go diff --git a/internal/logic/admin/trade/address/shipping/putshippingaddresslogic.go b/internal/logic/admin/crm/trade/address/shipping/putshippingaddresslogic.go similarity index 100% rename from internal/logic/admin/trade/address/shipping/putshippingaddresslogic.go rename to internal/logic/admin/crm/trade/address/shipping/putshippingaddresslogic.go diff --git a/internal/logic/admin/trade/order/createorderlogic.go b/internal/logic/admin/crm/trade/order/createorderlogic.go similarity index 100% rename from internal/logic/admin/trade/order/createorderlogic.go rename to internal/logic/admin/crm/trade/order/createorderlogic.go diff --git a/internal/logic/admin/trade/order/deleteorderlogic.go b/internal/logic/admin/crm/trade/order/deleteorderlogic.go similarity index 100% rename from internal/logic/admin/trade/order/deleteorderlogic.go rename to internal/logic/admin/crm/trade/order/deleteorderlogic.go diff --git a/internal/logic/admin/trade/order/exportorderslogic.go b/internal/logic/admin/crm/trade/order/exportorderslogic.go similarity index 98% rename from internal/logic/admin/trade/order/exportorderslogic.go rename to internal/logic/admin/crm/trade/order/exportorderslogic.go index 52371996..58de1259 100644 --- a/internal/logic/admin/trade/order/exportorderslogic.go +++ b/internal/logic/admin/crm/trade/order/exportorderslogic.go @@ -1,11 +1,11 @@ package order import ( - trade2 "PowerX/internal/model/trade" + trade2 "PowerX/internal/model/crm/trade" "PowerX/internal/svc" "PowerX/internal/types" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/trade" + "PowerX/internal/uc/powerx/crm/trade" "context" "encoding/csv" "errors" diff --git a/internal/logic/admin/trade/order/getorderlogic.go b/internal/logic/admin/crm/trade/order/getorderlogic.go similarity index 97% rename from internal/logic/admin/trade/order/getorderlogic.go rename to internal/logic/admin/crm/trade/order/getorderlogic.go index e9b9982c..df06e5b4 100644 --- a/internal/logic/admin/trade/order/getorderlogic.go +++ b/internal/logic/admin/crm/trade/order/getorderlogic.go @@ -1,9 +1,9 @@ package order import ( + "PowerX/internal/logic/admin/crm/trade/payment" "PowerX/internal/logic/admin/mediaresource" - "PowerX/internal/logic/admin/trade/payment" - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" "context" diff --git a/internal/logic/admin/trade/order/importorderslogic.go b/internal/logic/admin/crm/trade/order/importorderslogic.go similarity index 97% rename from internal/logic/admin/trade/order/importorderslogic.go rename to internal/logic/admin/crm/trade/order/importorderslogic.go index 052a206e..055ccc52 100644 --- a/internal/logic/admin/trade/order/importorderslogic.go +++ b/internal/logic/admin/crm/trade/order/importorderslogic.go @@ -1,9 +1,9 @@ package order import ( - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" - trade2 "PowerX/internal/uc/powerx/trade" + trade2 "PowerX/internal/uc/powerx/crm/trade" "context" "encoding/csv" "io" diff --git a/internal/logic/admin/trade/order/listorderspagelogic.go b/internal/logic/admin/crm/trade/order/listorderspagelogic.go similarity index 95% rename from internal/logic/admin/trade/order/listorderspagelogic.go rename to internal/logic/admin/crm/trade/order/listorderspagelogic.go index 380c782a..04b59edc 100644 --- a/internal/logic/admin/trade/order/listorderspagelogic.go +++ b/internal/logic/admin/crm/trade/order/listorderspagelogic.go @@ -1,8 +1,8 @@ package order import ( - "PowerX/internal/model/trade" - tradeUC "PowerX/internal/uc/powerx/trade" + "PowerX/internal/model/crm/trade" + tradeUC "PowerX/internal/uc/powerx/crm/trade" "PowerX/pkg/datetime/carbonx" "context" "github.com/golang-module/carbon/v2" diff --git a/internal/logic/admin/trade/order/patchorderlogic.go b/internal/logic/admin/crm/trade/order/patchorderlogic.go similarity index 100% rename from internal/logic/admin/trade/order/patchorderlogic.go rename to internal/logic/admin/crm/trade/order/patchorderlogic.go diff --git a/internal/logic/admin/trade/order/putorderlogic.go b/internal/logic/admin/crm/trade/order/putorderlogic.go similarity index 100% rename from internal/logic/admin/trade/order/putorderlogic.go rename to internal/logic/admin/crm/trade/order/putorderlogic.go diff --git a/internal/logic/admin/trade/payment/createpaymentlogic.go b/internal/logic/admin/crm/trade/payment/createpaymentlogic.go similarity index 100% rename from internal/logic/admin/trade/payment/createpaymentlogic.go rename to internal/logic/admin/crm/trade/payment/createpaymentlogic.go diff --git a/internal/logic/admin/trade/payment/deletepaymentlogic.go b/internal/logic/admin/crm/trade/payment/deletepaymentlogic.go similarity index 100% rename from internal/logic/admin/trade/payment/deletepaymentlogic.go rename to internal/logic/admin/crm/trade/payment/deletepaymentlogic.go diff --git a/internal/logic/admin/trade/payment/getpaymentlogic.go b/internal/logic/admin/crm/trade/payment/getpaymentlogic.go similarity index 98% rename from internal/logic/admin/trade/payment/getpaymentlogic.go rename to internal/logic/admin/crm/trade/payment/getpaymentlogic.go index e25d51fa..4f3b11ef 100644 --- a/internal/logic/admin/trade/payment/getpaymentlogic.go +++ b/internal/logic/admin/crm/trade/payment/getpaymentlogic.go @@ -1,7 +1,7 @@ package payment import ( - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" "context" diff --git a/internal/logic/admin/trade/payment/listpaymentspagelogic.go b/internal/logic/admin/crm/trade/payment/listpaymentspagelogic.go similarity index 94% rename from internal/logic/admin/trade/payment/listpaymentspagelogic.go rename to internal/logic/admin/crm/trade/payment/listpaymentspagelogic.go index 3bd97b48..45862df0 100644 --- a/internal/logic/admin/trade/payment/listpaymentspagelogic.go +++ b/internal/logic/admin/crm/trade/payment/listpaymentspagelogic.go @@ -1,8 +1,8 @@ package payment import ( - "PowerX/internal/model/trade" - tradeUC "PowerX/internal/uc/powerx/trade" + "PowerX/internal/model/crm/trade" + tradeUC "PowerX/internal/uc/powerx/crm/trade" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/trade/payment/patchpaymentlogic.go b/internal/logic/admin/crm/trade/payment/patchpaymentlogic.go similarity index 100% rename from internal/logic/admin/trade/payment/patchpaymentlogic.go rename to internal/logic/admin/crm/trade/payment/patchpaymentlogic.go diff --git a/internal/logic/admin/trade/payment/putpaymentlogic.go b/internal/logic/admin/crm/trade/payment/putpaymentlogic.go similarity index 100% rename from internal/logic/admin/trade/payment/putpaymentlogic.go rename to internal/logic/admin/crm/trade/payment/putpaymentlogic.go diff --git a/internal/logic/admin/trade/token/createtokenproductlogic.go b/internal/logic/admin/crm/trade/token/createtokenproductlogic.go similarity index 100% rename from internal/logic/admin/trade/token/createtokenproductlogic.go rename to internal/logic/admin/crm/trade/token/createtokenproductlogic.go diff --git a/internal/logic/admin/trade/token/deletetokenproductlogic.go b/internal/logic/admin/crm/trade/token/deletetokenproductlogic.go similarity index 100% rename from internal/logic/admin/trade/token/deletetokenproductlogic.go rename to internal/logic/admin/crm/trade/token/deletetokenproductlogic.go diff --git a/internal/logic/admin/trade/token/gettokenproductlogic.go b/internal/logic/admin/crm/trade/token/gettokenproductlogic.go similarity index 100% rename from internal/logic/admin/trade/token/gettokenproductlogic.go rename to internal/logic/admin/crm/trade/token/gettokenproductlogic.go diff --git a/internal/logic/admin/trade/token/listtokenproductspagelogic.go b/internal/logic/admin/crm/trade/token/listtokenproductspagelogic.go similarity index 90% rename from internal/logic/admin/trade/token/listtokenproductspagelogic.go rename to internal/logic/admin/crm/trade/token/listtokenproductspagelogic.go index bce67286..24305170 100644 --- a/internal/logic/admin/trade/token/listtokenproductspagelogic.go +++ b/internal/logic/admin/crm/trade/token/listtokenproductspagelogic.go @@ -1,9 +1,9 @@ package token import ( - product2 "PowerX/internal/logic/admin/product" - "PowerX/internal/model/product" - productUC "PowerX/internal/uc/powerx/product" + product2 "PowerX/internal/logic/admin/crm/product" + "PowerX/internal/model/crm/product" + productUC "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/admin/trade/token/patchtokenproductlogic.go b/internal/logic/admin/crm/trade/token/patchtokenproductlogic.go similarity index 100% rename from internal/logic/admin/trade/token/patchtokenproductlogic.go rename to internal/logic/admin/crm/trade/token/patchtokenproductlogic.go diff --git a/internal/logic/admin/trade/token/puttokenproductlogic.go b/internal/logic/admin/crm/trade/token/puttokenproductlogic.go similarity index 100% rename from internal/logic/admin/trade/token/puttokenproductlogic.go rename to internal/logic/admin/crm/trade/token/puttokenproductlogic.go diff --git a/internal/logic/admin/trade/warehouse/createwarehouselogic.go b/internal/logic/admin/crm/trade/warehouse/createwarehouselogic.go similarity index 100% rename from internal/logic/admin/trade/warehouse/createwarehouselogic.go rename to internal/logic/admin/crm/trade/warehouse/createwarehouselogic.go diff --git a/internal/logic/admin/trade/warehouse/deletewarehouselogic.go b/internal/logic/admin/crm/trade/warehouse/deletewarehouselogic.go similarity index 100% rename from internal/logic/admin/trade/warehouse/deletewarehouselogic.go rename to internal/logic/admin/crm/trade/warehouse/deletewarehouselogic.go diff --git a/internal/logic/admin/trade/warehouse/getwarehouselogic.go b/internal/logic/admin/crm/trade/warehouse/getwarehouselogic.go similarity index 100% rename from internal/logic/admin/trade/warehouse/getwarehouselogic.go rename to internal/logic/admin/crm/trade/warehouse/getwarehouselogic.go diff --git a/internal/logic/admin/trade/warehouse/listwarehouseslogic.go b/internal/logic/admin/crm/trade/warehouse/listwarehouseslogic.go similarity index 100% rename from internal/logic/admin/trade/warehouse/listwarehouseslogic.go rename to internal/logic/admin/crm/trade/warehouse/listwarehouseslogic.go diff --git a/internal/logic/admin/trade/warehouse/patchwarehouselogic.go b/internal/logic/admin/crm/trade/warehouse/patchwarehouselogic.go similarity index 100% rename from internal/logic/admin/trade/warehouse/patchwarehouselogic.go rename to internal/logic/admin/crm/trade/warehouse/patchwarehouselogic.go diff --git a/internal/logic/admin/trade/warehouse/updatewarehouselogic.go b/internal/logic/admin/crm/trade/warehouse/updatewarehouselogic.go similarity index 100% rename from internal/logic/admin/trade/warehouse/updatewarehouselogic.go rename to internal/logic/admin/crm/trade/warehouse/updatewarehouselogic.go diff --git a/internal/logic/admin/infoorganization/category/listcategorytreelogic.go b/internal/logic/admin/infoorganization/category/listcategorytreelogic.go index 352b4a54..ab7c0e89 100644 --- a/internal/logic/admin/infoorganization/category/listcategorytreelogic.go +++ b/internal/logic/admin/infoorganization/category/listcategorytreelogic.go @@ -5,7 +5,7 @@ import ( infoorganizatoin "PowerX/internal/model/infoorganization" "PowerX/internal/svc" "PowerX/internal/types" - "PowerX/internal/uc/powerx/infoorganization" + "PowerX/internal/uc/powerx/crm/infoorganization" "context" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/internal/logic/admin/contractway/createcontractwaylogic.go b/internal/logic/admin/scrm/contractway/createcontractwaylogic.go similarity index 100% rename from internal/logic/admin/contractway/createcontractwaylogic.go rename to internal/logic/admin/scrm/contractway/createcontractwaylogic.go diff --git a/internal/logic/admin/contractway/deletecontractwaylogic.go b/internal/logic/admin/scrm/contractway/deletecontractwaylogic.go similarity index 100% rename from internal/logic/admin/contractway/deletecontractwaylogic.go rename to internal/logic/admin/scrm/contractway/deletecontractwaylogic.go diff --git a/internal/logic/admin/contractway/getcontractwaygrouplistlogic.go b/internal/logic/admin/scrm/contractway/getcontractwaygrouplistlogic.go similarity index 100% rename from internal/logic/admin/contractway/getcontractwaygrouplistlogic.go rename to internal/logic/admin/scrm/contractway/getcontractwaygrouplistlogic.go diff --git a/internal/logic/admin/contractway/getcontractwaygrouptreelogic.go b/internal/logic/admin/scrm/contractway/getcontractwaygrouptreelogic.go similarity index 100% rename from internal/logic/admin/contractway/getcontractwaygrouptreelogic.go rename to internal/logic/admin/scrm/contractway/getcontractwaygrouptreelogic.go diff --git a/internal/logic/admin/contractway/getcontractwayslogic.go b/internal/logic/admin/scrm/contractway/getcontractwayslogic.go similarity index 100% rename from internal/logic/admin/contractway/getcontractwayslogic.go rename to internal/logic/admin/scrm/contractway/getcontractwayslogic.go diff --git a/internal/logic/admin/contractway/updatecontractwaylogic.go b/internal/logic/admin/scrm/contractway/updatecontractwaylogic.go similarity index 100% rename from internal/logic/admin/contractway/updatecontractwaylogic.go rename to internal/logic/admin/scrm/contractway/updatecontractwaylogic.go diff --git a/internal/logic/mp/customer/auth/authbyphonelogic.go b/internal/logic/mp/customer/auth/authbyphonelogic.go index a8e0a3e7..1eef6a77 100644 --- a/internal/logic/mp/customer/auth/authbyphonelogic.go +++ b/internal/logic/mp/customer/auth/authbyphonelogic.go @@ -2,10 +2,11 @@ package auth import ( "PowerX/internal/model" - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/wechat" "PowerX/internal/svc" "PowerX/internal/types" - customerdomain2 "PowerX/internal/uc/powerx/customerdomain" + customerdomain2 "PowerX/internal/uc/powerx/crm/customerdomain" fmt2 "PowerX/pkg/printx" "context" "errors" @@ -59,14 +60,14 @@ func (l *AuthByPhoneLogic) AuthByPhone(req *types.MPCustomerAuthRequest) (resp * //println(string(msgData)) // 解析手机信息 - mpPhoneInfo := &model.MPPhoneInfo{} + mpPhoneInfo := &wechat.MPPhoneInfo{} err = object.JsonDecode(msgData, mpPhoneInfo) if err != nil { panic(err.Error()) return } - mpCustomer := &model.WechatMPCustomer{ + mpCustomer := &wechat.WechatMPCustomer{ OpenId: rs.OpenID, SessionKey: rs.SessionKey, UnionId: rs.UnionID, diff --git a/internal/logic/mp/customer/auth/loginlogic.go b/internal/logic/mp/customer/auth/loginlogic.go index 1945786b..372b211d 100644 --- a/internal/logic/mp/customer/auth/loginlogic.go +++ b/internal/logic/mp/customer/auth/loginlogic.go @@ -4,8 +4,8 @@ import ( "PowerX/internal/svc" "PowerX/internal/types" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" + "PowerX/internal/uc/powerx/wechat" "context" "fmt" "github.com/pkg/errors" @@ -37,7 +37,7 @@ func (l *LoginLogic) Login(req *types.MPCustomerLoginRequest) (resp *types.MPCus // SessionKey: "IHaqJoWvRRCRlfnrRntzcA==", //} - mpCustomer, err := l.svcCtx.PowerX.WechatMP.FindOneMPCustomer(l.ctx, &powerx.FindMPCustomerOption{ + mpCustomer, err := l.svcCtx.PowerX.WechatMP.FindOneMPCustomer(l.ctx, &wechat.FindMPCustomerOption{ OpenIds: []string{rs.OpenID}, }) diff --git a/internal/logic/mp/market/media/listmediaspagelogic.go b/internal/logic/mp/market/media/listmediaspagelogic.go index 7aaeef74..55a7ae92 100644 --- a/internal/logic/mp/market/media/listmediaspagelogic.go +++ b/internal/logic/mp/market/media/listmediaspagelogic.go @@ -1,8 +1,8 @@ package media import ( - "PowerX/internal/logic/admin/market/media" - "PowerX/internal/uc/powerx/market" + "PowerX/internal/logic/admin/crm/market/media" + "PowerX/internal/uc/powerx/crm/market" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/market/store/liststorespagelogic.go b/internal/logic/mp/market/store/liststorespagelogic.go index 09f2c1aa..e15d4d7e 100644 --- a/internal/logic/mp/market/store/liststorespagelogic.go +++ b/internal/logic/mp/market/store/liststorespagelogic.go @@ -1,8 +1,8 @@ package store import ( - product2 "PowerX/internal/logic/admin/market/store" - "PowerX/internal/uc/powerx/market" + product2 "PowerX/internal/logic/admin/crm/market/store" + "PowerX/internal/uc/powerx/crm/market" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/product/artisan/listartisanspagelogic.go b/internal/logic/mp/product/artisan/listartisanspagelogic.go index 643e4b1c..b15640d3 100644 --- a/internal/logic/mp/product/artisan/listartisanspagelogic.go +++ b/internal/logic/mp/product/artisan/listartisanspagelogic.go @@ -1,8 +1,8 @@ package artisan import ( - "PowerX/internal/logic/admin/product/artisan" - product3 "PowerX/internal/uc/powerx/product" + "PowerX/internal/logic/admin/crm/product/artisan" + product3 "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/product/getproductlogic.go b/internal/logic/mp/product/getproductlogic.go index acaef130..973da3bd 100644 --- a/internal/logic/mp/product/getproductlogic.go +++ b/internal/logic/mp/product/getproductlogic.go @@ -1,11 +1,11 @@ package product import ( - "PowerX/internal/logic/admin/product/pricebookentry" + "PowerX/internal/logic/admin/crm/product/pricebookentry" "PowerX/internal/logic/mp/mediaresource" "PowerX/internal/model" + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" - "PowerX/internal/model/product" "PowerX/internal/svc" "PowerX/internal/types" "PowerX/internal/types/errorx" diff --git a/internal/logic/mp/product/listproductcategorieslogic.go b/internal/logic/mp/product/listproductcategorieslogic.go index 0973d29a..5b07ef02 100644 --- a/internal/logic/mp/product/listproductcategorieslogic.go +++ b/internal/logic/mp/product/listproductcategorieslogic.go @@ -1,7 +1,7 @@ package product import ( - product3 "PowerX/internal/uc/powerx/product" + product3 "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/product/listproductcategorytreelogic.go b/internal/logic/mp/product/listproductcategorytreelogic.go index 6dd7ba47..2e32c191 100644 --- a/internal/logic/mp/product/listproductcategorytreelogic.go +++ b/internal/logic/mp/product/listproductcategorytreelogic.go @@ -2,8 +2,8 @@ package product import ( "PowerX/internal/logic/admin/mediaresource" - "PowerX/internal/model/product" - product3 "PowerX/internal/uc/powerx/product" + "PowerX/internal/model/crm/product" + product3 "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/product/listproductspagelogic.go b/internal/logic/mp/product/listproductspagelogic.go index 832bcc12..1b5fc6da 100644 --- a/internal/logic/mp/product/listproductspagelogic.go +++ b/internal/logic/mp/product/listproductspagelogic.go @@ -1,8 +1,8 @@ package product import ( - product2 "PowerX/internal/model/product" - productUC "PowerX/internal/uc/powerx/product" + product2 "PowerX/internal/model/crm/product" + productUC "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/address/shipping/createshippingaddresslogic.go b/internal/logic/mp/trade/address/shipping/createshippingaddresslogic.go index 5d7ff3c5..a1aee59a 100644 --- a/internal/logic/mp/trade/address/shipping/createshippingaddresslogic.go +++ b/internal/logic/mp/trade/address/shipping/createshippingaddresslogic.go @@ -1,10 +1,10 @@ package shipping import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/model/trade" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/address/shipping/deleteshippingaddresslogic.go b/internal/logic/mp/trade/address/shipping/deleteshippingaddresslogic.go index 33b4ee2a..358051de 100644 --- a/internal/logic/mp/trade/address/shipping/deleteshippingaddresslogic.go +++ b/internal/logic/mp/trade/address/shipping/deleteshippingaddresslogic.go @@ -1,9 +1,9 @@ package shipping import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/address/shipping/listshippingaddressespagelogic.go b/internal/logic/mp/trade/address/shipping/listshippingaddressespagelogic.go index 9666427d..53147042 100644 --- a/internal/logic/mp/trade/address/shipping/listshippingaddressespagelogic.go +++ b/internal/logic/mp/trade/address/shipping/listshippingaddressespagelogic.go @@ -1,10 +1,10 @@ package shipping import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/model/trade" - "PowerX/internal/uc/powerx/customerdomain" - tradeUC "PowerX/internal/uc/powerx/trade" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" + "PowerX/internal/uc/powerx/crm/customerdomain" + tradeUC "PowerX/internal/uc/powerx/crm/trade" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/address/shipping/patchshippingaddresslogic.go b/internal/logic/mp/trade/address/shipping/patchshippingaddresslogic.go index 72262964..902eef35 100644 --- a/internal/logic/mp/trade/address/shipping/patchshippingaddresslogic.go +++ b/internal/logic/mp/trade/address/shipping/patchshippingaddresslogic.go @@ -1,9 +1,9 @@ package shipping import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/address/shipping/putshippingaddresslogic.go b/internal/logic/mp/trade/address/shipping/putshippingaddresslogic.go index 2a4039ed..b7f3c2b7 100644 --- a/internal/logic/mp/trade/address/shipping/putshippingaddresslogic.go +++ b/internal/logic/mp/trade/address/shipping/putshippingaddresslogic.go @@ -1,9 +1,9 @@ package shipping import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/cart/addtocartlogic.go b/internal/logic/mp/trade/cart/addtocartlogic.go index 58490fa2..797660ce 100644 --- a/internal/logic/mp/trade/cart/addtocartlogic.go +++ b/internal/logic/mp/trade/cart/addtocartlogic.go @@ -1,10 +1,10 @@ package cart import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/model/trade" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/cart/clearcartitemslogic.go b/internal/logic/mp/trade/cart/clearcartitemslogic.go index 70f5d950..42b9407a 100644 --- a/internal/logic/mp/trade/cart/clearcartitemslogic.go +++ b/internal/logic/mp/trade/cart/clearcartitemslogic.go @@ -1,11 +1,11 @@ package cart import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "PowerX/internal/model/powermodel" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" - trade2 "PowerX/internal/uc/powerx/trade" + "PowerX/internal/uc/powerx/crm/customerdomain" + trade2 "PowerX/internal/uc/powerx/crm/trade" "context" "fmt" diff --git a/internal/logic/mp/trade/cart/listcartitemspagelogic.go b/internal/logic/mp/trade/cart/listcartitemspagelogic.go index ee4c0639..f0491166 100644 --- a/internal/logic/mp/trade/cart/listcartitemspagelogic.go +++ b/internal/logic/mp/trade/cart/listcartitemspagelogic.go @@ -1,10 +1,10 @@ package cart import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/model/trade" - "PowerX/internal/uc/powerx/customerdomain" - tradeUC "PowerX/internal/uc/powerx/trade" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" + "PowerX/internal/uc/powerx/crm/customerdomain" + tradeUC "PowerX/internal/uc/powerx/crm/trade" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/cart/removecartitemlogic.go b/internal/logic/mp/trade/cart/removecartitemlogic.go index e70caaf2..b1bf2e45 100644 --- a/internal/logic/mp/trade/cart/removecartitemlogic.go +++ b/internal/logic/mp/trade/cart/removecartitemlogic.go @@ -1,11 +1,11 @@ package cart import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/trade" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/cart/updatecartitemquantitylogic.go b/internal/logic/mp/trade/cart/updatecartitemquantitylogic.go index 76ff6b23..317edf9f 100644 --- a/internal/logic/mp/trade/cart/updatecartitemquantitylogic.go +++ b/internal/logic/mp/trade/cart/updatecartitemquantitylogic.go @@ -1,9 +1,9 @@ package cart import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/order/cancelorderlogic.go b/internal/logic/mp/trade/order/cancelorderlogic.go index 0d02bef3..001b56c3 100644 --- a/internal/logic/mp/trade/order/cancelorderlogic.go +++ b/internal/logic/mp/trade/order/cancelorderlogic.go @@ -1,10 +1,10 @@ package order import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/model/trade" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/order/createorderbycartitemslogic.go b/internal/logic/mp/trade/order/createorderbycartitemslogic.go index c165b475..6cf955b7 100644 --- a/internal/logic/mp/trade/order/createorderbycartitemslogic.go +++ b/internal/logic/mp/trade/order/createorderbycartitemslogic.go @@ -1,10 +1,10 @@ package order import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" - "PowerX/internal/uc/powerx/trade" + "PowerX/internal/uc/powerx/crm/customerdomain" + "PowerX/internal/uc/powerx/crm/trade" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/order/createorderbyproductslogic.go b/internal/logic/mp/trade/order/createorderbyproductslogic.go index f50e56b6..b871ce29 100644 --- a/internal/logic/mp/trade/order/createorderbyproductslogic.go +++ b/internal/logic/mp/trade/order/createorderbyproductslogic.go @@ -1,11 +1,11 @@ package order import ( - customerdomain2 "PowerX/internal/model/customerdomain" - product2 "PowerX/internal/model/product" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + product2 "PowerX/internal/model/crm/product" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" - "PowerX/internal/uc/powerx/product" + "PowerX/internal/uc/powerx/crm/customerdomain" + "PowerX/internal/uc/powerx/crm/product" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/order/getorderlogic.go b/internal/logic/mp/trade/order/getorderlogic.go index d0719f83..a6cdf336 100644 --- a/internal/logic/mp/trade/order/getorderlogic.go +++ b/internal/logic/mp/trade/order/getorderlogic.go @@ -2,7 +2,7 @@ package order import ( "PowerX/internal/logic/admin/mediaresource" - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" "context" "math" diff --git a/internal/logic/mp/trade/order/listorderspagelogic.go b/internal/logic/mp/trade/order/listorderspagelogic.go index a852dff5..b7c084c1 100644 --- a/internal/logic/mp/trade/order/listorderspagelogic.go +++ b/internal/logic/mp/trade/order/listorderspagelogic.go @@ -1,10 +1,10 @@ package order import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/model/trade" - "PowerX/internal/uc/powerx/customerdomain" - tradeUC "PowerX/internal/uc/powerx/trade" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" + "PowerX/internal/uc/powerx/crm/customerdomain" + tradeUC "PowerX/internal/uc/powerx/crm/trade" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/payment/createpaymentfromorderlogic.go b/internal/logic/mp/trade/payment/createpaymentfromorderlogic.go index 4a80b422..6ce68fd7 100644 --- a/internal/logic/mp/trade/payment/createpaymentfromorderlogic.go +++ b/internal/logic/mp/trade/payment/createpaymentfromorderlogic.go @@ -1,10 +1,10 @@ package payment import ( - customerdomain2 "PowerX/internal/model/customerdomain" - "PowerX/internal/model/trade" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" "PowerX/internal/types/errorx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "PowerX/internal/svc" diff --git a/internal/logic/mp/trade/payment/handlewxpaidlogic.go b/internal/logic/mp/trade/payment/handlewxpaidlogic.go index 9e7d1064..1997c576 100644 --- a/internal/logic/mp/trade/payment/handlewxpaidlogic.go +++ b/internal/logic/mp/trade/payment/handlewxpaidlogic.go @@ -1,7 +1,7 @@ package payment import ( - "PowerX/internal/model/trade" + "PowerX/internal/model/crm/trade" "PowerX/internal/svc" "context" "fmt" diff --git a/internal/logic/web/customer/auth/getuserinfologic.go b/internal/logic/web/customer/auth/getuserinfologic.go index 2136e5ac..f81353ed 100644 --- a/internal/logic/web/customer/auth/getuserinfologic.go +++ b/internal/logic/web/customer/auth/getuserinfologic.go @@ -1,11 +1,11 @@ package auth import ( - "PowerX/internal/logic/admin/customerdomain/customer" - customerdomain2 "PowerX/internal/model/customerdomain" + "PowerX/internal/logic/admin/crm/customerdomain/customer" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "PowerX/internal/svc" "PowerX/internal/types" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "fmt" diff --git a/internal/logic/web/customer/auth/loginlogic.go b/internal/logic/web/customer/auth/loginlogic.go index 216ae083..854bd777 100644 --- a/internal/logic/web/customer/auth/loginlogic.go +++ b/internal/logic/web/customer/auth/loginlogic.go @@ -2,7 +2,7 @@ package auth import ( "PowerX/internal/types/errorx" - customerdomain2 "PowerX/internal/uc/powerx/customerdomain" + customerdomain2 "PowerX/internal/uc/powerx/crm/customerdomain" "PowerX/pkg/securityx" "context" "fmt" diff --git a/internal/logic/web/customer/auth/registercustomerbyphonelogic.go b/internal/logic/web/customer/auth/registercustomerbyphonelogic.go index 5984dfe9..5883491c 100644 --- a/internal/logic/web/customer/auth/registercustomerbyphonelogic.go +++ b/internal/logic/web/customer/auth/registercustomerbyphonelogic.go @@ -2,7 +2,7 @@ package auth import ( "PowerX/internal/model" - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/types/errorx" "PowerX/pkg/securityx" "context" diff --git a/internal/logic/web/infoorganization/category/listcategorytreelogic.go b/internal/logic/web/infoorganization/category/listcategorytreelogic.go index e1c0fb10..2a51b66d 100644 --- a/internal/logic/web/infoorganization/category/listcategorytreelogic.go +++ b/internal/logic/web/infoorganization/category/listcategorytreelogic.go @@ -2,7 +2,7 @@ package category import ( "PowerX/internal/logic/admin/infoorganization/category" - "PowerX/internal/uc/powerx/infoorganization" + "PowerX/internal/uc/powerx/crm/infoorganization" "context" "PowerX/internal/svc" diff --git a/internal/middleware/mpcustomergetmiddleware.go b/internal/middleware/mpcustomergetmiddleware.go index 5c8d12d1..38333f17 100644 --- a/internal/middleware/mpcustomergetmiddleware.go +++ b/internal/middleware/mpcustomergetmiddleware.go @@ -4,8 +4,8 @@ import ( "PowerX/internal/config" "PowerX/internal/types/errorx" "PowerX/internal/uc" - "PowerX/internal/uc/powerx" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" + "PowerX/internal/uc/powerx/wechat" "context" "github.com/zeromicro/go-zero/rest/httpx" "net/http" @@ -40,7 +40,7 @@ func (m *MPCustomerGetMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc } // 小程序的客户记录是否存在 - authMPCustomer, err := m.px.WechatMP.FindOneMPCustomer(r.Context(), &powerx.FindMPCustomerOption{ + authMPCustomer, err := m.px.WechatMP.FindOneMPCustomer(r.Context(), &wechat.FindMPCustomerOption{ OpenIds: []string{openId}, }) if err != nil { diff --git a/internal/middleware/mpcustomerjwtauthmiddleware.go b/internal/middleware/mpcustomerjwtauthmiddleware.go index e023b74b..0286d975 100644 --- a/internal/middleware/mpcustomerjwtauthmiddleware.go +++ b/internal/middleware/mpcustomerjwtauthmiddleware.go @@ -5,7 +5,7 @@ import ( "PowerX/internal/types" "PowerX/internal/types/errorx" "PowerX/internal/uc" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "github.com/golang-jwt/jwt/v4" "github.com/pkg/errors" diff --git a/internal/middleware/webcustomergetmiddleware.go b/internal/middleware/webcustomergetmiddleware.go index 0ed60afe..b13f994d 100644 --- a/internal/middleware/webcustomergetmiddleware.go +++ b/internal/middleware/webcustomergetmiddleware.go @@ -4,7 +4,7 @@ import ( "PowerX/internal/config" "PowerX/internal/types/errorx" "PowerX/internal/uc" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "github.com/zeromicro/go-zero/rest/httpx" "net/http" diff --git a/internal/middleware/webcustomerjwtauthmiddleware.go b/internal/middleware/webcustomerjwtauthmiddleware.go index 940c8a29..408bc0fd 100644 --- a/internal/middleware/webcustomerjwtauthmiddleware.go +++ b/internal/middleware/webcustomerjwtauthmiddleware.go @@ -5,7 +5,7 @@ import ( "PowerX/internal/types" "PowerX/internal/types/errorx" "PowerX/internal/uc" - "PowerX/internal/uc/powerx/customerdomain" + "PowerX/internal/uc/powerx/crm/customerdomain" "context" "github.com/golang-jwt/jwt/v4" "github.com/pkg/errors" diff --git a/internal/model/customerdomain/contact.go b/internal/model/crm/customerdomain/contact.go similarity index 100% rename from internal/model/customerdomain/contact.go rename to internal/model/crm/customerdomain/contact.go diff --git a/internal/model/customerdomain/customer.go b/internal/model/crm/customerdomain/customer.go similarity index 100% rename from internal/model/customerdomain/customer.go rename to internal/model/crm/customerdomain/customer.go diff --git a/internal/model/customerdomain/lead.go b/internal/model/crm/customerdomain/lead.go similarity index 100% rename from internal/model/customerdomain/lead.go rename to internal/model/crm/customerdomain/lead.go diff --git a/internal/model/market/media.go b/internal/model/crm/market/media.go similarity index 100% rename from internal/model/market/media.go rename to internal/model/crm/market/media.go diff --git a/internal/model/market/promotion.go b/internal/model/crm/market/promotion.go similarity index 100% rename from internal/model/market/promotion.go rename to internal/model/crm/market/promotion.go diff --git a/internal/model/market/store.go b/internal/model/crm/market/store.go similarity index 98% rename from internal/model/market/store.go rename to internal/model/crm/market/store.go index 1add4dcb..a53ee2ae 100644 --- a/internal/model/market/store.go +++ b/internal/model/crm/market/store.go @@ -1,9 +1,9 @@ package market import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "gorm.io/gorm" "time" ) diff --git a/internal/model/membership/membership.go b/internal/model/crm/membership/membership.go similarity index 96% rename from internal/model/membership/membership.go rename to internal/model/crm/membership/membership.go index e50f9175..806caa01 100644 --- a/internal/model/membership/membership.go +++ b/internal/model/crm/membership/membership.go @@ -1,7 +1,7 @@ package membership import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/model/powermodel" "time" ) diff --git a/internal/model/product/artisan.go b/internal/model/crm/product/artisan.go similarity index 100% rename from internal/model/product/artisan.go rename to internal/model/crm/product/artisan.go diff --git a/internal/model/product/pivotproducttoproductcategory.go b/internal/model/crm/product/pivotproducttoproductcategory.go similarity index 100% rename from internal/model/product/pivotproducttoproductcategory.go rename to internal/model/crm/product/pivotproducttoproductcategory.go diff --git a/internal/model/product/pivotskutospecificoption.go b/internal/model/crm/product/pivotskutospecificoption.go similarity index 100% rename from internal/model/product/pivotskutospecificoption.go rename to internal/model/crm/product/pivotskutospecificoption.go diff --git a/internal/model/product/pivotstoretoartisan.go b/internal/model/crm/product/pivotstoretoartisan.go similarity index 100% rename from internal/model/product/pivotstoretoartisan.go rename to internal/model/crm/product/pivotstoretoartisan.go diff --git a/internal/model/product/pricebook.go b/internal/model/crm/product/pricebook.go similarity index 100% rename from internal/model/product/pricebook.go rename to internal/model/crm/product/pricebook.go diff --git a/internal/model/product/pricebookentry.go b/internal/model/crm/product/pricebookentry.go similarity index 100% rename from internal/model/product/pricebookentry.go rename to internal/model/crm/product/pricebookentry.go diff --git a/internal/model/product/priceconfig.go b/internal/model/crm/product/priceconfig.go similarity index 100% rename from internal/model/product/priceconfig.go rename to internal/model/crm/product/priceconfig.go diff --git a/internal/model/product/product.go b/internal/model/crm/product/product.go similarity index 100% rename from internal/model/product/product.go rename to internal/model/crm/product/product.go diff --git a/internal/model/product/productcategory.go b/internal/model/crm/product/productcategory.go similarity index 100% rename from internal/model/product/productcategory.go rename to internal/model/crm/product/productcategory.go diff --git a/internal/model/product/productspecific.go b/internal/model/crm/product/productspecific.go similarity index 100% rename from internal/model/product/productspecific.go rename to internal/model/crm/product/productspecific.go diff --git a/internal/model/product/sku.go b/internal/model/crm/product/sku.go similarity index 100% rename from internal/model/product/sku.go rename to internal/model/crm/product/sku.go diff --git a/internal/model/product/sku_test.go b/internal/model/crm/product/sku_test.go similarity index 100% rename from internal/model/product/sku_test.go rename to internal/model/crm/product/sku_test.go diff --git a/internal/model/trade/billingaddress.go b/internal/model/crm/trade/billingaddress.go similarity index 100% rename from internal/model/trade/billingaddress.go rename to internal/model/crm/trade/billingaddress.go diff --git a/internal/model/trade/cart.go b/internal/model/crm/trade/cart.go similarity index 97% rename from internal/model/trade/cart.go rename to internal/model/crm/trade/cart.go index 97070498..d0eca245 100644 --- a/internal/model/trade/cart.go +++ b/internal/model/crm/trade/cart.go @@ -1,8 +1,8 @@ package trade import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" ) type Cart struct { diff --git a/internal/model/trade/deliveryaddress.go b/internal/model/crm/trade/deliveryaddress.go similarity index 100% rename from internal/model/trade/deliveryaddress.go rename to internal/model/crm/trade/deliveryaddress.go diff --git a/internal/model/trade/inventory.go b/internal/model/crm/trade/inventory.go similarity index 100% rename from internal/model/trade/inventory.go rename to internal/model/crm/trade/inventory.go diff --git a/internal/model/trade/logistics.go b/internal/model/crm/trade/logistics.go similarity index 100% rename from internal/model/trade/logistics.go rename to internal/model/crm/trade/logistics.go diff --git a/internal/model/trade/order.go b/internal/model/crm/trade/order.go similarity index 98% rename from internal/model/trade/order.go rename to internal/model/crm/trade/order.go index 37e78d63..a53fae0e 100644 --- a/internal/model/trade/order.go +++ b/internal/model/crm/trade/order.go @@ -1,10 +1,10 @@ package trade import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "github.com/golang-module/carbon/v2" "github.com/zeromicro/go-zero/core/stringx" "time" diff --git a/internal/model/trade/payment.go b/internal/model/crm/trade/payment.go similarity index 100% rename from internal/model/trade/payment.go rename to internal/model/crm/trade/payment.go diff --git a/internal/model/trade/pivotordertonventorylog.go b/internal/model/crm/trade/pivotordertonventorylog.go similarity index 100% rename from internal/model/trade/pivotordertonventorylog.go rename to internal/model/crm/trade/pivotordertonventorylog.go diff --git a/internal/model/trade/pivotproducttopromotion.go b/internal/model/crm/trade/pivotproducttopromotion.go similarity index 100% rename from internal/model/trade/pivotproducttopromotion.go rename to internal/model/crm/trade/pivotproducttopromotion.go diff --git a/internal/model/trade/refund.go b/internal/model/crm/trade/refund.go similarity index 97% rename from internal/model/trade/refund.go rename to internal/model/crm/trade/refund.go index 7d0d1bf6..c814b00a 100644 --- a/internal/model/trade/refund.go +++ b/internal/model/crm/trade/refund.go @@ -1,7 +1,7 @@ package trade import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/model/powermodel" "time" ) diff --git a/internal/model/trade/shippingaddress.go b/internal/model/crm/trade/shippingaddress.go similarity index 100% rename from internal/model/trade/shippingaddress.go rename to internal/model/crm/trade/shippingaddress.go diff --git a/internal/model/trade/token.go b/internal/model/crm/trade/token.go similarity index 97% rename from internal/model/trade/token.go rename to internal/model/crm/trade/token.go index e1794fd4..6b18ed1e 100644 --- a/internal/model/trade/token.go +++ b/internal/model/crm/trade/token.go @@ -1,7 +1,7 @@ package trade import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/model/powermodel" "github.com/ArtisanCloud/PowerLibs/v3/database" ) diff --git a/internal/model/trade/warehouse.go b/internal/model/crm/trade/warehouse.go similarity index 100% rename from internal/model/trade/warehouse.go rename to internal/model/crm/trade/warehouse.go diff --git a/internal/model/wechat.go b/internal/model/wechat/miniprogram.go similarity index 68% rename from internal/model/wechat.go rename to internal/model/wechat/miniprogram.go index 72d99ad1..d776ec88 100644 --- a/internal/model/wechat.go +++ b/internal/model/wechat/miniprogram.go @@ -1,38 +1,17 @@ -package model +package wechat import ( - customerdomain2 "PowerX/internal/model/customerdomain" + "PowerX/internal/model" + customerdomain2 "PowerX/internal/model/crm/customerdomain" "fmt" "github.com/ArtisanCloud/PowerLibs/v3/security" - "gorm.io/datatypes" ) -// model -// 公众号的客户信息 -// https://developers.weixin.qq.com/doc/offiaccount/User_Management/Get_users_basic_information_UnionId.html#UinonId -type WechatOACustomer struct { - Customer *customerdomain2.Customer `gorm:"foreignKey:OpenId;references:OpenIdInWeChatOfficialAccount" json:"customer"` - - Model - Subscribe int `json:"subscribe"` - SessionKey string `json:"-"` - OpenId string `json:"openId"` - UnionId string `json:"unionId"` - Language string `json:"language"` - SubscribeTime int `json:"subscribeTime"` - Remark string `json:"remark"` - GroupId int `json:"groupId"` - TagIdList datatypes.JSON `json:"tagIdList"` - SubscribeScene string `json:"subscribeScene"` - QrScene int `json:"qrScene"` - QrSceneStr string `json:"qrSceneStr"` -} - // 小程序客户信息 type WechatMPCustomer struct { Customer *customerdomain2.Customer `gorm:"foreignKey:OpenId;references:OpenIdInMiniProgram" json:"customer"` - Model + model.Model UniqueID string `gorm:"unique" json:"uniqueId"` SessionKey string `json:"-"` OpenId string `json:"openId"` diff --git a/internal/model/wechat/offiaccount.go b/internal/model/wechat/offiaccount.go new file mode 100644 index 00000000..f87974e6 --- /dev/null +++ b/internal/model/wechat/offiaccount.go @@ -0,0 +1,28 @@ +package wechat + +import ( + "PowerX/internal/model" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "gorm.io/datatypes" +) + +// model +// 公众号的客户信息 +// https://developers.weixin.qq.com/doc/offiaccount/User_Management/Get_users_basic_information_UnionId.html#UinonId +type WechatOACustomer struct { + Customer *customerdomain2.Customer `gorm:"foreignKey:OpenId;references:OpenIdInWeChatOfficialAccount" json:"customer"` + + model.Model + Subscribe int `json:"subscribe"` + SessionKey string `json:"-"` + OpenId string `json:"openId"` + UnionId string `json:"unionId"` + Language string `json:"language"` + SubscribeTime int `json:"subscribeTime"` + Remark string `json:"remark"` + GroupId int `json:"groupId"` + TagIdList datatypes.JSON `json:"tagIdList"` + SubscribeScene string `json:"subscribeScene"` + QrScene int `json:"qrScene"` + QrSceneStr string `json:"qrSceneStr"` +} diff --git a/internal/model/wework.go b/internal/model/wechat/wework.go similarity index 91% rename from internal/model/wework.go rename to internal/model/wechat/wework.go index 38dd3388..25798987 100644 --- a/internal/model/wework.go +++ b/internal/model/wechat/wework.go @@ -1,9 +1,12 @@ -package model +package wechat -import "github.com/ArtisanCloud/PowerLibs/v3/object" +import ( + "PowerX/internal/model" + "github.com/ArtisanCloud/PowerLibs/v3/object" +) type WeWorkExternalContact struct { - Model + model.Model CorpId object.NullString `gorm:"index:idx_corp_id;column:corp_id" json:"corpId"` AppId object.NullString `gorm:"index:idx_app_id;column:app_id" json:"appId"` ExternalUserId object.NullString `gorm:"index:idx_external_user_id;column:external_user_id;not null;" json:"externalUserId"` diff --git a/internal/uc/powerx.go b/internal/uc/powerx.go index 7d5ec2e2..71ba279a 100644 --- a/internal/uc/powerx.go +++ b/internal/uc/powerx.go @@ -3,11 +3,13 @@ package uc import ( "PowerX/internal/config" "PowerX/internal/uc/powerx" - customerDomainUC "PowerX/internal/uc/powerx/customerdomain" - "PowerX/internal/uc/powerx/infoorganization" - "PowerX/internal/uc/powerx/market" - productUC "PowerX/internal/uc/powerx/product" - tradeUC "PowerX/internal/uc/powerx/trade" + customerDomainUC "PowerX/internal/uc/powerx/crm/customerdomain" + "PowerX/internal/uc/powerx/crm/infoorganization" + "PowerX/internal/uc/powerx/crm/market" + productUC "PowerX/internal/uc/powerx/crm/product" + tradeUC "PowerX/internal/uc/powerx/crm/trade" + "PowerX/internal/uc/powerx/scrm" + "PowerX/internal/uc/powerx/wechat" "github.com/pkg/errors" "github.com/robfig/cron/v3" "github.com/zeromicro/go-zero/core/stores/redis" @@ -45,13 +47,13 @@ type PowerXUseCase struct { Payment *tradeUC.PaymentUseCase Logistics *tradeUC.LogisticsUseCase RefundOrder *tradeUC.RefundOrderUseCase - WechatMP *powerx.WechatMiniProgramUseCase - WechatOA *powerx.WechatOfficialAccountUseCase + WechatMP *wechat.WechatMiniProgramUseCase + WechatOA *wechat.WechatOfficialAccountUseCase //WeWork *powerx.WeWorkUseCase - SCRM *powerx.SCRMUseCase + SCRM *scrm.SCRMUseCase MediaResource *powerx.MediaResourceUseCase Media *market.MediaUseCase - Scene *powerx.SceneUseCase + Scene *scrm.SceneUseCase } func NewPowerXUseCase(conf *config.Config) (uc *PowerXUseCase, clean func()) { @@ -122,8 +124,8 @@ func NewPowerXUseCase(conf *config.Config) (uc *PowerXUseCase, clean func()) { // 加载微信UseCase //uc.WeWork = powerx.NewWeWorkUseCase(db, conf) - uc.WechatMP = powerx.NewWechatMiniProgramUseCase(db, conf) - uc.WechatOA = powerx.NewWechatOfficialAccountUseCase(db, conf) + uc.WechatMP = wechat.NewWechatMiniProgramUseCase(db, conf) + uc.WechatOA = wechat.NewWechatOfficialAccountUseCase(db, conf) // 加载市场UseCase uc.Media = market.NewMediaUseCase(db) @@ -133,11 +135,11 @@ func NewPowerXUseCase(conf *config.Config) (uc *PowerXUseCase, clean func()) { // 加载SCRM UseCase c := cron.New() - uc.SCRM = powerx.NewSCRMUseCase(db, conf, c, uc.redis) + uc.SCRM = scrm.NewSCRMUseCase(db, conf, c, uc.redis) uc.SCRM.Schedule() // 加载Scene - uc.Scene = powerx.NewSceneUseCase(db, uc.redis) + uc.Scene = scrm.NewSceneUseCase(db, uc.redis) return uc, func() { _ = sqlDB.Close() diff --git a/internal/uc/powerx/customerdomain/authorizationcustomer.go b/internal/uc/powerx/crm/customerdomain/authorizationcustomer.go similarity index 94% rename from internal/uc/powerx/customerdomain/authorizationcustomer.go rename to internal/uc/powerx/crm/customerdomain/authorizationcustomer.go index f1b63b16..797f1b57 100644 --- a/internal/uc/powerx/customerdomain/authorizationcustomer.go +++ b/internal/uc/powerx/crm/customerdomain/authorizationcustomer.go @@ -1,8 +1,8 @@ package customerdomain import ( - "PowerX/internal/model" - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/wechat" "fmt" "github.com/golang-jwt/jwt/v4" "github.com/pkg/errors" @@ -56,7 +56,7 @@ func (uc *AuthorizationCustomerDomainUseCase) SignWebToken(customer *customerdom return uc.SignToken(token, jwtSecret, expiresAt) } -func (uc *AuthorizationCustomerDomainUseCase) SignMPToken(mpCustomer *model.WechatMPCustomer, jwtSecret string) oauth2.Token { +func (uc *AuthorizationCustomerDomainUseCase) SignMPToken(mpCustomer *wechat.WechatMPCustomer, jwtSecret string) oauth2.Token { now := time.Now() expiresAt := now.Add(CustomerTokenExpiredDuration) diff --git a/internal/uc/powerx/customerdomain/customer.go b/internal/uc/powerx/crm/customerdomain/customer.go similarity index 99% rename from internal/uc/powerx/customerdomain/customer.go rename to internal/uc/powerx/crm/customerdomain/customer.go index 820ad44a..c81d13e0 100644 --- a/internal/uc/powerx/customerdomain/customer.go +++ b/internal/uc/powerx/crm/customerdomain/customer.go @@ -1,7 +1,7 @@ package customerdomain import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/model/powermodel" "PowerX/internal/types" "PowerX/internal/types/errorx" diff --git a/internal/uc/powerx/customerdomain/lead.go b/internal/uc/powerx/crm/customerdomain/lead.go similarity index 98% rename from internal/uc/powerx/customerdomain/lead.go rename to internal/uc/powerx/crm/customerdomain/lead.go index 1e33fc36..c2a68f60 100644 --- a/internal/uc/powerx/customerdomain/lead.go +++ b/internal/uc/powerx/crm/customerdomain/lead.go @@ -1,7 +1,7 @@ package customerdomain import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "PowerX/internal/model/powermodel" "PowerX/internal/types" "PowerX/internal/types/errorx" diff --git a/internal/uc/powerx/infoorganization/category.go b/internal/uc/powerx/crm/infoorganization/category.go similarity index 100% rename from internal/uc/powerx/infoorganization/category.go rename to internal/uc/powerx/crm/infoorganization/category.go diff --git a/internal/uc/powerx/infoorganization/label.go b/internal/uc/powerx/crm/infoorganization/label.go similarity index 100% rename from internal/uc/powerx/infoorganization/label.go rename to internal/uc/powerx/crm/infoorganization/label.go diff --git a/internal/uc/powerx/infoorganization/tag.go b/internal/uc/powerx/crm/infoorganization/tag.go similarity index 100% rename from internal/uc/powerx/infoorganization/tag.go rename to internal/uc/powerx/crm/infoorganization/tag.go diff --git a/internal/uc/powerx/market/media.go b/internal/uc/powerx/crm/market/media.go similarity index 98% rename from internal/uc/powerx/market/media.go rename to internal/uc/powerx/crm/market/media.go index 74057429..0990bdf1 100644 --- a/internal/uc/powerx/market/media.go +++ b/internal/uc/powerx/crm/market/media.go @@ -1,7 +1,7 @@ package market import ( - model "PowerX/internal/model/market" + model "PowerX/internal/model/crm/market" "PowerX/internal/model/media" "PowerX/internal/model/powermodel" "PowerX/internal/types" diff --git a/internal/uc/powerx/market/store.go b/internal/uc/powerx/crm/market/store.go similarity index 99% rename from internal/uc/powerx/market/store.go rename to internal/uc/powerx/crm/market/store.go index d6674ae2..3125b645 100644 --- a/internal/uc/powerx/market/store.go +++ b/internal/uc/powerx/crm/market/store.go @@ -1,7 +1,7 @@ package market import ( - model "PowerX/internal/model/market" + model "PowerX/internal/model/crm/market" "PowerX/internal/model/media" "PowerX/internal/model/powermodel" "PowerX/internal/types" diff --git a/internal/uc/powerx/product/artisan.go b/internal/uc/powerx/crm/product/artisan.go similarity index 98% rename from internal/uc/powerx/product/artisan.go rename to internal/uc/powerx/crm/product/artisan.go index d711f84c..bf5a50dd 100644 --- a/internal/uc/powerx/product/artisan.go +++ b/internal/uc/powerx/crm/product/artisan.go @@ -1,10 +1,10 @@ package product import ( - "PowerX/internal/model/market" + "PowerX/internal/model/crm/market" + "PowerX/internal/model/crm/product" "PowerX/internal/model/media" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/product/pricebook.go b/internal/uc/powerx/crm/product/pricebook.go similarity index 99% rename from internal/uc/powerx/product/pricebook.go rename to internal/uc/powerx/crm/product/pricebook.go index a1b9e713..b92eff6a 100644 --- a/internal/uc/powerx/product/pricebook.go +++ b/internal/uc/powerx/crm/product/pricebook.go @@ -1,8 +1,8 @@ package product import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/product/pricebookentry.go b/internal/uc/powerx/crm/product/pricebookentry.go similarity index 99% rename from internal/uc/powerx/product/pricebookentry.go rename to internal/uc/powerx/crm/product/pricebookentry.go index 4f174bd0..d8327919 100644 --- a/internal/uc/powerx/product/pricebookentry.go +++ b/internal/uc/powerx/crm/product/pricebookentry.go @@ -1,8 +1,8 @@ package product import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/product/product.go b/internal/uc/powerx/crm/product/product.go similarity index 99% rename from internal/uc/powerx/product/product.go rename to internal/uc/powerx/crm/product/product.go index d40c88d4..dbdfd0c1 100644 --- a/internal/uc/powerx/product/product.go +++ b/internal/uc/powerx/crm/product/product.go @@ -2,9 +2,9 @@ package product import ( model2 "PowerX/internal/model" + model "PowerX/internal/model/crm/product" "PowerX/internal/model/media" "PowerX/internal/model/powermodel" - model "PowerX/internal/model/product" "PowerX/internal/types" "PowerX/internal/types/errorx" "PowerX/pkg/slicex" diff --git a/internal/uc/powerx/product/product_test.go b/internal/uc/powerx/crm/product/product_test.go similarity index 98% rename from internal/uc/powerx/product/product_test.go rename to internal/uc/powerx/crm/product/product_test.go index 72c2840c..3f81894b 100644 --- a/internal/uc/powerx/product/product_test.go +++ b/internal/uc/powerx/crm/product/product_test.go @@ -1,7 +1,7 @@ package product import ( - "PowerX/internal/model/product" + "PowerX/internal/model/crm/product" fmt2 "PowerX/pkg/printx" "encoding/json" "fmt" diff --git a/internal/uc/powerx/product/productcategory.go b/internal/uc/powerx/crm/product/productcategory.go similarity index 99% rename from internal/uc/powerx/product/productcategory.go rename to internal/uc/powerx/crm/product/productcategory.go index 7c340147..a81b7874 100644 --- a/internal/uc/powerx/product/productcategory.go +++ b/internal/uc/powerx/crm/product/productcategory.go @@ -1,8 +1,8 @@ package product import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "PowerX/internal/types/errorx" "context" "github.com/pkg/errors" diff --git a/internal/uc/powerx/product/productspecific.go b/internal/uc/powerx/crm/product/productspecific.go similarity index 99% rename from internal/uc/powerx/product/productspecific.go rename to internal/uc/powerx/crm/product/productspecific.go index 49099531..7de9ee4e 100644 --- a/internal/uc/powerx/product/productspecific.go +++ b/internal/uc/powerx/crm/product/productspecific.go @@ -1,8 +1,8 @@ package product import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/product/sku.go b/internal/uc/powerx/crm/product/sku.go similarity index 99% rename from internal/uc/powerx/product/sku.go rename to internal/uc/powerx/crm/product/sku.go index 70c252d3..b0016203 100644 --- a/internal/uc/powerx/product/sku.go +++ b/internal/uc/powerx/crm/product/sku.go @@ -1,8 +1,8 @@ package product import ( + "PowerX/internal/model/crm/product" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/trade/cart.go b/internal/uc/powerx/crm/trade/cart.go similarity index 99% rename from internal/uc/powerx/trade/cart.go rename to internal/uc/powerx/crm/trade/cart.go index fac2376c..ee0368c0 100644 --- a/internal/uc/powerx/trade/cart.go +++ b/internal/uc/powerx/crm/trade/cart.go @@ -1,8 +1,8 @@ package trade import ( + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/trade" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/trade/logisitic.go b/internal/uc/powerx/crm/trade/logisitic.go similarity index 99% rename from internal/uc/powerx/trade/logisitic.go rename to internal/uc/powerx/crm/trade/logisitic.go index 9eec656b..11b28750 100644 --- a/internal/uc/powerx/trade/logisitic.go +++ b/internal/uc/powerx/crm/trade/logisitic.go @@ -1,8 +1,8 @@ package trade import ( + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/trade" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/trade/order.go b/internal/uc/powerx/crm/trade/order.go similarity index 99% rename from internal/uc/powerx/trade/order.go rename to internal/uc/powerx/crm/trade/order.go index f64e98b2..9cc56208 100644 --- a/internal/uc/powerx/trade/order.go +++ b/internal/uc/powerx/crm/trade/order.go @@ -1,10 +1,10 @@ package trade import ( - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/product" + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/product" - "PowerX/internal/model/trade" "PowerX/internal/types" "PowerX/internal/types/errorx" "PowerX/internal/uc/powerx" diff --git a/internal/uc/powerx/trade/payment.go b/internal/uc/powerx/crm/trade/payment.go similarity index 99% rename from internal/uc/powerx/trade/payment.go rename to internal/uc/powerx/crm/trade/payment.go index f91cd5db..3cc3acd5 100644 --- a/internal/uc/powerx/trade/payment.go +++ b/internal/uc/powerx/crm/trade/payment.go @@ -2,9 +2,9 @@ package trade import ( "PowerX/internal/config" - customerdomain2 "PowerX/internal/model/customerdomain" + customerdomain2 "PowerX/internal/model/crm/customerdomain" + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/trade" "PowerX/internal/types" "PowerX/internal/types/errorx" "PowerX/internal/uc/powerx" diff --git a/internal/uc/powerx/trade/refundorder.go b/internal/uc/powerx/crm/trade/refundorder.go similarity index 99% rename from internal/uc/powerx/trade/refundorder.go rename to internal/uc/powerx/crm/trade/refundorder.go index 120f5dcf..0679ae74 100644 --- a/internal/uc/powerx/trade/refundorder.go +++ b/internal/uc/powerx/crm/trade/refundorder.go @@ -1,8 +1,8 @@ package trade import ( + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/trade" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/trade/shippingaddress.go b/internal/uc/powerx/crm/trade/shippingaddress.go similarity index 99% rename from internal/uc/powerx/trade/shippingaddress.go rename to internal/uc/powerx/crm/trade/shippingaddress.go index 2abf1ead..5514a2c7 100644 --- a/internal/uc/powerx/trade/shippingaddress.go +++ b/internal/uc/powerx/crm/trade/shippingaddress.go @@ -1,8 +1,8 @@ package trade import ( + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/trade" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/trade/token.go b/internal/uc/powerx/crm/trade/token.go similarity index 99% rename from internal/uc/powerx/trade/token.go rename to internal/uc/powerx/crm/trade/token.go index d115b912..4812495a 100644 --- a/internal/uc/powerx/trade/token.go +++ b/internal/uc/powerx/crm/trade/token.go @@ -1,8 +1,8 @@ package trade import ( + "PowerX/internal/model/crm/trade" "PowerX/internal/model/powermodel" - "PowerX/internal/model/trade" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" diff --git a/internal/uc/powerx/scene.go b/internal/uc/powerx/scene.go deleted file mode 100644 index d7f806ff..00000000 --- a/internal/uc/powerx/scene.go +++ /dev/null @@ -1,22 +0,0 @@ -package powerx - -import ( - "PowerX/internal/uc/powerx/scene" - "github.com/robfig/cron/v3" - "github.com/zeromicro/go-zero/core/stores/redis" - "gorm.io/gorm" -) - -type SceneUseCase struct { - db *gorm.DB - kv *redis.Redis - Cron *cron.Cron - Scene scene.IsceneInterface -} - -func NewSceneUseCase(db *gorm.DB, kv *redis.Redis) *SceneUseCase { - return &SceneUseCase{ - db: db, - Scene: scene.Repo(db, kv), - } -} diff --git a/internal/uc/powerx/scrm/scene.go b/internal/uc/powerx/scrm/scene.go new file mode 100644 index 00000000..6315f503 --- /dev/null +++ b/internal/uc/powerx/scrm/scene.go @@ -0,0 +1,22 @@ +package scrm + +import ( + "PowerX/internal/uc/powerx/scrm/scene" + "github.com/robfig/cron/v3" + "github.com/zeromicro/go-zero/core/stores/redis" + "gorm.io/gorm" +) + +type SceneUseCase struct { + db *gorm.DB + kv *redis.Redis + Cron *cron.Cron + Scene scene.IsceneInterface +} + +func NewSceneUseCase(db *gorm.DB, kv *redis.Redis) *SceneUseCase { + return &SceneUseCase{ + db: db, + Scene: scene.Repo(db, kv), + } +} diff --git a/internal/uc/powerx/scene/interface.go b/internal/uc/powerx/scrm/scene/interface.go similarity index 100% rename from internal/uc/powerx/scene/interface.go rename to internal/uc/powerx/scrm/scene/interface.go diff --git a/internal/uc/powerx/scene/qrcodescene.go b/internal/uc/powerx/scrm/scene/qrcodescene.go similarity index 100% rename from internal/uc/powerx/scene/qrcodescene.go rename to internal/uc/powerx/scrm/scene/qrcodescene.go diff --git a/internal/uc/powerx/scene/scene.go b/internal/uc/powerx/scrm/scene/scene.go similarity index 100% rename from internal/uc/powerx/scene/scene.go rename to internal/uc/powerx/scrm/scene/scene.go diff --git a/internal/uc/powerx/scrm.go b/internal/uc/powerx/scrm/scrm.go similarity index 99% rename from internal/uc/powerx/scrm.go rename to internal/uc/powerx/scrm/scrm.go index c856044a..10e6fd67 100644 --- a/internal/uc/powerx/scrm.go +++ b/internal/uc/powerx/scrm/scrm.go @@ -1,4 +1,4 @@ -package powerx +package scrm import ( "PowerX/internal/config" diff --git a/internal/uc/powerx/wechatmp.go b/internal/uc/powerx/wechat/wechatmp.go similarity index 79% rename from internal/uc/powerx/wechatmp.go rename to internal/uc/powerx/wechat/wechatmp.go index ed47a1fc..a4d5b1c8 100644 --- a/internal/uc/powerx/wechatmp.go +++ b/internal/uc/powerx/wechat/wechatmp.go @@ -1,9 +1,9 @@ -package powerx +package wechat import ( "PowerX/internal/config" - "PowerX/internal/model" "PowerX/internal/model/powermodel" + "PowerX/internal/model/wechat" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" @@ -72,10 +72,10 @@ func (uc *WechatMiniProgramUseCase) buildFindQueryNoPage(query *gorm.DB, opt *Fi return query } -func (uc *WechatMiniProgramUseCase) FindManyMPCustomers(ctx context.Context, opt *FindMPCustomerOption) types.Page[*model.WechatMPCustomer] { - var mpCustomers []*model.WechatMPCustomer +func (uc *WechatMiniProgramUseCase) FindManyMPCustomers(ctx context.Context, opt *FindMPCustomerOption) types.Page[*wechat.WechatMPCustomer] { + var mpCustomers []*wechat.WechatMPCustomer var count int64 - query := uc.db.WithContext(ctx).Model(&model.WechatMPCustomer{}) + query := uc.db.WithContext(ctx).Model(&wechat.WechatMPCustomer{}) if opt.PageIndex != 0 && opt.PageSize != 0 { query.Offset((opt.PageIndex - 1) * opt.PageSize).Limit(opt.PageSize) @@ -87,7 +87,7 @@ func (uc *WechatMiniProgramUseCase) FindManyMPCustomers(ctx context.Context, opt if err := query.Find(&mpCustomers).Error; err != nil { panic(errors.Wrap(err, "find mpCustomers failed")) } - return types.Page[*model.WechatMPCustomer]{ + return types.Page[*wechat.WechatMPCustomer]{ List: mpCustomers, PageIndex: opt.PageIndex, PageSize: opt.PageSize, @@ -95,9 +95,9 @@ func (uc *WechatMiniProgramUseCase) FindManyMPCustomers(ctx context.Context, opt } } -func (uc *WechatMiniProgramUseCase) FindOneMPCustomer(ctx context.Context, opt *FindMPCustomerOption) (*model.WechatMPCustomer, error) { - var mpCustomer *model.WechatMPCustomer - query := uc.db.WithContext(ctx).Model(&model.WechatMPCustomer{}) +func (uc *WechatMiniProgramUseCase) FindOneMPCustomer(ctx context.Context, opt *FindMPCustomerOption) (*wechat.WechatMPCustomer, error) { + var mpCustomer *wechat.WechatMPCustomer + query := uc.db.WithContext(ctx).Model(&wechat.WechatMPCustomer{}) if opt.PageIndex != 0 && opt.PageSize != 0 { query.Offset((opt.PageIndex - 1) * opt.PageSize).Limit(opt.PageSize) } @@ -110,9 +110,9 @@ func (uc *WechatMiniProgramUseCase) FindOneMPCustomer(ctx context.Context, opt * return mpCustomer, nil } -func (uc *WechatMiniProgramUseCase) UpsertMPCustomer(ctx context.Context, customer *model.WechatMPCustomer) (*model.WechatMPCustomer, error) { +func (uc *WechatMiniProgramUseCase) UpsertMPCustomer(ctx context.Context, customer *wechat.WechatMPCustomer) (*wechat.WechatMPCustomer, error) { - mpCustomers := []*model.WechatMPCustomer{customer} + mpCustomers := []*wechat.WechatMPCustomer{customer} _, err := uc.UpsertMPCustomers(ctx, mpCustomers) if err != nil { @@ -122,9 +122,9 @@ func (uc *WechatMiniProgramUseCase) UpsertMPCustomer(ctx context.Context, custom return customer, err } -func (uc *WechatMiniProgramUseCase) UpsertMPCustomers(ctx context.Context, customers []*model.WechatMPCustomer) ([]*model.WechatMPCustomer, error) { +func (uc *WechatMiniProgramUseCase) UpsertMPCustomers(ctx context.Context, customers []*wechat.WechatMPCustomer) ([]*wechat.WechatMPCustomer, error) { - err := powermodel.UpsertModelsOnUniqueID(uc.db.WithContext(ctx), &model.WechatMPCustomer{}, model.WechatMpCustomerUniqueId, customers, nil, false) + err := powermodel.UpsertModelsOnUniqueID(uc.db.WithContext(ctx), &wechat.WechatMPCustomer{}, wechat.WechatMpCustomerUniqueId, customers, nil, false) if err != nil { panic(errors.Wrap(err, "batch upsert mp customers failed")) diff --git a/internal/uc/powerx/wechatoa.go b/internal/uc/powerx/wechat/wechatoa.go similarity index 79% rename from internal/uc/powerx/wechatoa.go rename to internal/uc/powerx/wechat/wechatoa.go index e90b749d..c0a016dd 100644 --- a/internal/uc/powerx/wechatoa.go +++ b/internal/uc/powerx/wechat/wechatoa.go @@ -1,9 +1,9 @@ -package powerx +package wechat import ( "PowerX/internal/config" - "PowerX/internal/model" "PowerX/internal/model/powermodel" + "PowerX/internal/model/wechat" "PowerX/internal/types" "PowerX/internal/types/errorx" "context" @@ -71,10 +71,10 @@ func (uc *WechatOfficialAccountUseCase) buildFindQueryNoPage(query *gorm.DB, opt return query } -func (uc *WechatOfficialAccountUseCase) FindManyOACustomers(ctx context.Context, opt *FindOACustomerOption) types.Page[*model.WechatOACustomer] { - var mpCustomers []*model.WechatOACustomer +func (uc *WechatOfficialAccountUseCase) FindManyOACustomers(ctx context.Context, opt *FindOACustomerOption) types.Page[*wechat.WechatOACustomer] { + var mpCustomers []*wechat.WechatOACustomer var count int64 - query := uc.db.WithContext(ctx).Model(&model.WechatOACustomer{}) + query := uc.db.WithContext(ctx).Model(&wechat.WechatOACustomer{}) if opt.PageIndex != 0 && opt.PageSize != 0 { query.Offset((opt.PageIndex - 1) * opt.PageSize).Limit(opt.PageSize) @@ -86,7 +86,7 @@ func (uc *WechatOfficialAccountUseCase) FindManyOACustomers(ctx context.Context, if err := query.Find(&mpCustomers).Error; err != nil { panic(errors.Wrap(err, "find mpCustomers failed")) } - return types.Page[*model.WechatOACustomer]{ + return types.Page[*wechat.WechatOACustomer]{ List: mpCustomers, PageIndex: opt.PageIndex, PageSize: opt.PageSize, @@ -94,9 +94,9 @@ func (uc *WechatOfficialAccountUseCase) FindManyOACustomers(ctx context.Context, } } -func (uc *WechatOfficialAccountUseCase) FindOneOACustomer(ctx context.Context, opt *FindOACustomerOption) (*model.WechatOACustomer, error) { - var mpCustomer *model.WechatOACustomer - query := uc.db.WithContext(ctx).Model(&model.WechatOACustomer{}) +func (uc *WechatOfficialAccountUseCase) FindOneOACustomer(ctx context.Context, opt *FindOACustomerOption) (*wechat.WechatOACustomer, error) { + var mpCustomer *wechat.WechatOACustomer + query := uc.db.WithContext(ctx).Model(&wechat.WechatOACustomer{}) if opt.PageIndex != 0 && opt.PageSize != 0 { query.Offset((opt.PageIndex - 1) * opt.PageSize).Limit(opt.PageSize) } @@ -109,9 +109,9 @@ func (uc *WechatOfficialAccountUseCase) FindOneOACustomer(ctx context.Context, o return mpCustomer, nil } -func (uc *WechatOfficialAccountUseCase) UpsertOACustomer(ctx context.Context, customer *model.WechatOACustomer) (*model.WechatOACustomer, error) { +func (uc *WechatOfficialAccountUseCase) UpsertOACustomer(ctx context.Context, customer *wechat.WechatOACustomer) (*wechat.WechatOACustomer, error) { - mpCustomers := []*model.WechatOACustomer{customer} + mpCustomers := []*wechat.WechatOACustomer{customer} _, err := uc.UpsertOACustomers(ctx, mpCustomers) if err != nil { @@ -121,9 +121,9 @@ func (uc *WechatOfficialAccountUseCase) UpsertOACustomer(ctx context.Context, cu return customer, err } -func (uc *WechatOfficialAccountUseCase) UpsertOACustomers(ctx context.Context, customers []*model.WechatOACustomer) ([]*model.WechatOACustomer, error) { +func (uc *WechatOfficialAccountUseCase) UpsertOACustomers(ctx context.Context, customers []*wechat.WechatOACustomer) ([]*wechat.WechatOACustomer, error) { - err := powermodel.UpsertModelsOnUniqueID(uc.db.WithContext(ctx), &model.WechatOACustomer{}, model.WechatMpCustomerUniqueId, customers, nil, false) + err := powermodel.UpsertModelsOnUniqueID(uc.db.WithContext(ctx), &wechat.WechatOACustomer{}, wechat.WechatMpCustomerUniqueId, customers, nil, false) if err != nil { panic(errors.Wrap(err, "batch upsert mp customers failed")) diff --git a/internal/uc/powerx/wework.go b/internal/uc/powerx/wechat/wework.go similarity index 98% rename from internal/uc/powerx/wework.go rename to internal/uc/powerx/wechat/wework.go index 19736cd8..2d9155e3 100644 --- a/internal/uc/powerx/wework.go +++ b/internal/uc/powerx/wechat/wework.go @@ -1,4 +1,4 @@ -package powerx +package wechat import ( "PowerX/internal/config" diff --git a/test/someuc_test.go b/test/someuc_test.go index be33cafa..06c4dd71 100644 --- a/test/someuc_test.go +++ b/test/someuc_test.go @@ -1,7 +1,7 @@ package test import ( - "PowerX/internal/model/customerdomain" + "PowerX/internal/model/crm/customerdomain" "context" "github.com/brianvoe/gofakeit/v6" "testing"