Merge pull request #285 from ArtisanCloud/dev/michaelhu

Dev/michaelhu
ArtisanCloud · Sep 6, 2024 · be5588b · be5588b
2 parents 1b40481 + 3336b98
commit be5588b
Show file tree

Hide file tree

Showing 63 changed files with 5,287 additions and 3,925 deletions.
diff --git a/api.csv b/api.csv
diff --git a/api/admin.crm.api b/api/admin.crm.api
@@ -11,6 +11,6 @@ import "admin/crm/product/product.api"
 import "admin/crm/product/artisan.api"
 import "admin/crm/trade/tokenproduct.api"
 import "admin/crm/trade/shippingaddress.api"
-import "admin/crm/trade/billingaddress.api"
-import "admin/crm/trade/deliveryaddress.api"
-import "admin/crm/trade/warehouse.api"
+//import "admin/crm/trade/billingaddress.api"
+//import "admin/crm/trade/deliveryaddress.api"
+//import "admin/crm/trade/warehouse.api"
diff --git a/api/admin/crm/business/opportunity.api b/api/admin/crm/business/opportunity.api
@@ -3,8 +3,8 @@ syntax = "v1"
 info(
  title: "商机管理"
  desc: "商机管理"
- author: "YourName"
- email: "yourEmail@example.com"
+ author: "Matrix-X"
+ email: "matrix-x@artisan-cloud.com"
  version: "v1"
 )
 

diff --git a/api/admin/crm/product/product.api b/api/admin/crm/product/product.api
@@ -197,7 +197,7 @@ type (
  ProductId int64 `path:"id"`
  }
 
- DisableProductReply struct{
+ DisableProductReply{
  ProductId int64 `json:"id"`
  }
 

diff --git a/api/admin/crm/trade/billingaddress.api b/api/admin/crm/trade/billingaddress.api
@@ -16,27 +16,27 @@ info(
 )
 
 service PowerX {
- @doc("查询账单地址列表")
+ @doc "查询账单地址列表"
  @handler ListBillingAddressesPage
  get /billing/page-list (ListBillingAddressesPageRequest) returns (ListBillingAddressesPageReply)
 
- @doc("查询账单地址详情")
+ @doc "查询账单地址详情"
  @handler GetBillingAddress
  get /billing/:id (GetBillingAddressRequest) returns (GetBillingAddressReply)
 
- @doc("创建账单地址")
+ @doc "创建账单地址"
  @handler CreateBillingAddress
  post /billing (CreateBillingAddressRequest) returns (CreateBillingAddressReply)
 
- @doc("更新账单地址")
+ @doc "更新账单地址"
  @handler PutBillingAddress
  put /billing/:id (PutBillingAddressRequest) returns (PutBillingAddressReply)
 
- @doc("部分更新账单地址")
+ @doc "部分更新账单地址"
  @handler PatchBillingAddress
  patch /billing/:id (PatchBillingAddressRequest) returns (PatchBillingAddressReply)
 
- @doc("删除账单地址")
+ @doc "删除账单地址"
  @handler DeleteBillingAddress
  delete /billing/:id (DeleteBillingAddressRequest) returns (DeleteBillingAddressReply)
 }

diff --git a/api/admin/crm/trade/deliveryaddress.api b/api/admin/crm/trade/deliveryaddress.api
@@ -16,27 +16,27 @@ info(
 )
 
 service PowerX {
- @doc("查询订单发货地址列表")
+ @doc "查询订单发货地址列表"
  @handler ListDeliveryAddressesPage
  get /delivery/page-list (ListDeliveryAddressesPageRequest) returns (ListDeliveryAddressesPageReply)
 
- @doc("查询订单发货地址详情")
+ @doc "查询订单发货地址详情"
  @handler GetDeliveryAddress
  get /delivery/:id (GetDeliveryAddressRequest) returns (GetDeliveryAddressReply)
 
- @doc("创建订单发货地址")
+ @doc "创建订单发货地址"
  @handler CreateDeliveryAddress
  post /delivery (CreateDeliveryAddressRequest) returns (CreateDeliveryAddressReply)
 
- @doc("更新订单发货地址")
+ @doc "更新订单发货地址"
  @handler PutDeliveryAddress
  put /delivery/:id (PutDeliveryAddressRequest) returns (PutDeliveryAddressReply)
 
- @doc("部分更新订单发货地址")
+ @doc "部分更新订单发货地址"
  @handler PatchDeliveryAddress
  patch /delivery/:id (PatchDeliveryAddressRequest) returns (PatchDeliveryAddressReply)
 
- @doc("删除订单发货地址")
+ @doc "删除订单发货地址"
  @handler DeleteDeliveryAddress
  delete /delivery/:id (DeleteDeliveryAddressRequest) returns (DeleteDeliveryAddressReply)
 }

diff --git a/api/admin/crm/trade/logistics.api b/api/admin/crm/trade/logistics.api
@@ -16,27 +16,27 @@ info (
 
 service PowerX {
 
- @doc("查询物流列表")
+ @doc "查询物流列表"
  @handler ListLogisticss
  get /logisticses (ListLogisticssRequest) returns (ListLogisticssResponse)
 
- @doc("获取物流详情")
+ @doc "获取物流详情"
  @handler GetLogistics
  get /logisticses/:id (GetLogisticsRequest) returns (GetLogisticsResponse)
 
- @doc("创建物流")
+ @doc "创建物流"
  @handler CreateLogistics
  post /logisticses (CreateLogisticsRequest) returns (CreateLogisticsResponse)
 
- @doc("更新物流")
+ @doc "更新物流"
  @handler UpdateLogistics
  put /logisticses/:id (UpdateLogisticsRequest) returns (UpdateLogisticsResponse)
 
- @doc("部分更新物流")
+ @doc "部分更新物流"
  @handler PatchLogistics
  patch /logisticses/:id (PatchLogisticsRequest) returns (PatchLogisticsResponse)
 
- @doc("删除物流")
+ @doc "删除物流"
  @handler DeleteLogistics
  delete /logisticses/:id (DeleteLogisticsRequest) returns (DeleteLogisticsResponse)
 }

diff --git a/api/admin/crm/trade/order.api b/api/admin/crm/trade/order.api
@@ -17,35 +17,35 @@ import "./payment.api"
  middleware: UserJWTAuth
 )
 service PowerX {
- @doc("查询订单列表")
+ @doc "查询订单列表"
  @handler ListOrdersPage
  get /orders/page-list (ListOrdersPageRequest) returns (ListOrdersPageReply)
 
- @doc("查询订单详情")
+ @doc "查询订单详情"
  @handler GetOrder
  get /orders/:id (GetOrderRequest) returns (GetOrderReply)
 
- @doc("创建订单")
+ @doc "创建订单"
  @handler CreateOrder
  post /orders (CreateOrderRequest) returns (CreateOrderReply)
 
- @doc("更新订单")
+ @doc "更新订单"
  @handler PutOrder
  put /orders/:id (PutOrderRequest) returns (PutOrderReply)
 
- @doc("部分更新订单")
+ @doc "部分更新订单"
  @handler PatchOrder
  patch /orders/:id (PatchOrderRequest) returns (PatchOrderReply)
 
- @doc("删除订单")
+ @doc "删除订单"
  @handler DeleteOrder
  delete /orders/:id (DeleteOrderRequest) returns (DeleteOrderReply)
 
- @doc("导出订单")
+ @doc "导出订单"
  @handler ExportOrders
  get /orders/export (ExportOrdersRequest) returns (ExportOrdersReply)
 
- @doc("导入订单")
+ @doc "导入订单"
  @handler ImportOrders
  post /orders/import returns (ImportOrdersReply)
 

diff --git a/api/admin/crm/trade/refundorder.api b/api/admin/crm/trade/refundorder.api
@@ -16,27 +16,27 @@ info(
  middleware: UserJWTAuth
 )
 service PowerX {
- @doc("查询退款单列表")
+ @doc "查询退款单列表"
  @handler ListRefundOrdersPage
  get /refund-order/page-list (ListRefundOrdersPageRequest) returns (ListRefundOrdersPageReply)
 
- @doc("查询退款单详情")
+ @doc "查询退款单详情"
  @handler GetRefundOrder
  get /refund-order/:id (GetRefundOrderRequest) returns (GetRefundOrderReply)
 
- @doc("创建退款单")
+ @doc "创建退款单"
  @handler CreateRefundOrder
  post /refund-order (CreateRefundOrderRequest) returns (CreateRefundOrderReply)
 
- @doc("更新退款单")
+ @doc "更新退款单"
  @handler PutRefundOrder
  put /refund-order/:id (PutRefundOrderRequest) returns (PutRefundOrderReply)
 
- @doc("部分更新退款单")
+ @doc "部分更新退款单"
  @handler PatchRefundOrder
  patch /refund-order/:id (PatchRefundOrderRequest) returns (PatchRefundOrderReply)
 
- @doc("删除退款单")
+ @doc "删除退款单"
  @handler DeleteRefundOrder
  delete /refund-order/:id (DeleteRefundOrderRequest) returns (DeleteRefundOrderReply)
 }

diff --git a/api/admin/crm/trade/shippingaddress.api b/api/admin/crm/trade/shippingaddress.api
@@ -16,27 +16,27 @@ info(
 )
 
 service PowerX {
- @doc("查询收货地址列表")
+ @doc "查询收货地址列表"
  @handler ListShippingAddressesPage
  get /shipping/page-list (ListShippingAddressesPageRequest) returns (ListShippingAddressesPageReply)
 
- @doc("查询收货地址详情")
+ @doc "查询收货地址详情"
  @handler GetShippingAddress
  get /shipping/:id (GetShippingAddressRequest) returns (GetShippingAddressReply)
 
- @doc("创建收货地址")
+ @doc "创建收货地址"
  @handler CreateShippingAddress
  post /shipping (CreateShippingAddressRequest) returns (CreateShippingAddressReply)
 
- @doc("更新收货地址")
+ @doc "更新收货地址"
  @handler PutShippingAddress
  put /shipping/:id (PutShippingAddressRequest) returns (PutShippingAddressReply)
 
- @doc("部分更新收货地址")
+ @doc "部分更新收货地址"
  @handler PatchShippingAddress
  patch /shipping/:id (PatchShippingAddressRequest) returns (PatchShippingAddressReply)
 
- @doc("删除收货地址")
+ @doc "删除收货地址"
  @handler DeleteShippingAddress
  delete /shipping/:id (DeleteShippingAddressRequest) returns (DeleteShippingAddressReply)
 }

diff --git a/api/admin/crm/trade/warehouse.api b/api/admin/crm/trade/warehouse.api
@@ -15,28 +15,27 @@ info (
 )
 
 service PowerX {
-
- @doc("查询仓库列表")
+ @doc "查询仓库列表"
  @handler ListWarehouses
  get /warehouses (ListWarehousesRequest) returns (ListWarehousesResponse)
 
- @doc("获取仓库详情")
+ @doc "获取仓库详情"
  @handler GetWarehouse
  get /warehouses/:id (GetWarehouseRequest) returns (GetWarehouseResponse)
 
- @doc("创建仓库")
+ @doc "创建仓库"
  @handler CreateWarehouse
  post /warehouses (CreateWarehouseRequest) returns (CreateWarehouseResponse)
 
- @doc("更新仓库")
+ @doc "更新仓库"
  @handler UpdateWarehouse
  put /warehouses/:id (UpdateWarehouseRequest) returns (UpdateWarehouseResponse)
 
- @doc("部分更新仓库")
+ @doc "部分更新仓库"
  @handler PatchWarehouse
  patch /warehouses/:id (PatchWarehouseRequest) returns (PatchWarehouseResponse)
 
- @doc("删除仓库")
+ @doc "删除仓库"
  @handler DeleteWarehouse
  delete /warehouses/:id (DeleteWarehouseRequest) returns (DeleteWarehouseResponse)
 }

diff --git a/api/admin/dictionary.api b/api/admin/dictionary.api
@@ -84,11 +84,11 @@ type (
  Total int64 `json:"total"`
  }
 
- GetDictionaryTypeRequest struct{
+ GetDictionaryTypeRequest{
  DictionaryType string `path:"type"`
  }
 
- GetDictionaryTypeReply struct{
+ GetDictionaryTypeReply{
  *DictionaryType
  }
 )
@@ -150,12 +150,12 @@ type (
  List []DictionaryItem `json:"list"`
  }
 
- GetDictionaryItemRequest struct{
+ GetDictionaryItemRequest{
  DictionaryType string `path:"type"`
  DictionaryItem string `path:"key"`
  }
 
- GetDictionaryItemReply struct{
+ GetDictionaryItemReply{
  *DictionaryItem
  }
 )

diff --git a/api/admin/scrm/app/weworkapp.api b/api/admin/scrm/app/weworkapp.api
@@ -24,8 +24,6 @@ service PowerX {
  get /options returns (AppWeWorkListReply)
 }
 
-
-
 type (
  ApplicationRequest {
  AgentId int `form:"agentId"`
@@ -45,13 +43,15 @@ type (
  HomeUrl string `json:"homeUrl"`
  CustomizedPublishStatus int `json:"customizedPublishStatus"`
  }
- AllowUserinfos {
- User []User `json:"user"`
- }
- User {
+
+ WeworkUser {
  Userid string `json:"userId"`
  }
 
+ AllowUserinfos {
+ User []WeworkUser `json:"user"`
+ }
+
  AllowPartys {
  Partyid []int `json:"partyId"`
  }
@@ -60,9 +60,6 @@ type (
  }
 )
 
-
-
-
 type (
  AppWeWorkListReply {
  List []*AppWechat `json:"list"`

diff --git a/api/admin/scrm/organization/weworuser.api → api/admin/scrm/organization/weworkuser.api b/api/admin/scrm/organization/weworuser.api → api/admin/scrm/organization/weworkuser.api
diff --git a/api/mp/product/productcategory.api b/api/mp/product/productcategory.api
@@ -28,13 +28,13 @@ service PowerX {
 }
 
 type (
- ListProductCategoriesRequest struct{
+ ListProductCategoriesRequest{
  CategoryPId int `form:"categoryPId,optional"`
  NeedChildren bool `form:"needChildren,optional"`
  Limit int `form:"limit,optional"`
  }
 
- ListProductCategoriesReply struct{
+ ListProductCategoriesReply{
  ProductCategories []*ProductCategory `json:"list"`
  }
 )