云众

upstream/yunzmall/yunzmall.go

@@ -25,11 +25,6 @@ type Client struct {
 	Url         string
 	DB          int
 	Source      int
-	Goods       goodsLogic
-	Logistics   logisticsLogic
-	Order       orderLogic
-	Refund      refundLogic
-	Storage     storageLogic
 }
 
 var server *Client

upstream/yunzmall/yunzmall_goods.go

@@ -10,8 +10,6 @@ import (
 type goodsLogic struct {
 }
 
-var Goods = goodsLogic{}
-
 type GoodsCursorListReq struct {
 	Cursor   int `json:"cursor,omitempty"` //游标
 	PageSize int `json:"pageSize"`         //每页个数
@@ -94,10 +92,10 @@ type GoodsCursorListRes struct {
 	} `json:"data"`
 }
 
-// CursorList 选品列表API(全量，cursor)
-func (s goodsLogic) CursorList(ctx context.Context, req GoodsCursorListReq) (res *GoodsCursorListRes, err error) {
+// GoodsCursorList 选品列表API(全量，cursor)
+func (s *Client) GoodsCursorList(ctx context.Context, req GoodsCursorListReq) (res *GoodsCursorListRes, err error) {
 	var method = "/app/product/storage/cursorList"
-	result, err := post(ctx, method, gconv.Map(req))
+	result, err := s.post(ctx, method, gconv.Map(req))
 	if err != nil {
 		return
 	}
@@ -314,10 +312,10 @@ type GoodsDetailRes struct {
 	} `json:"data"`
 }
 
-// Detail 商品详情
-func (s goodsLogic) Detail(ctx context.Context, req interface{}) (res *GoodsDetailRes, err error) {
+// GoodsDetail 商品详情
+func (s *Client) GoodsDetail(ctx context.Context, req interface{}) (res *GoodsDetailRes, err error) {
 	var method = "/app/product/storage/detailList"
-	result, err := post(ctx, method, g.Map{
+	result, err := s.post(ctx, method, g.Map{
 		"ids": gconv.Ints(req),
 	})
 	if err != nil {
@@ -428,10 +426,10 @@ type GoodsListRes struct {
 	} `json:"data"`
 }
 
-// List 商品列表
-func (s goodsLogic) List(ctx context.Context, req GoodsListReq) (res *GoodsListRes, err error) {
+// GoodsList 商品列表
+func (s *Client) GoodsList(ctx context.Context, req GoodsListReq) (res *GoodsListRes, err error) {
 	var method = "/app/product/storage/list"
-	result, err := post(ctx, method, gconv.Map(req))
+	result, err := s.post(ctx, method, gconv.Map(req))
 	if err != nil {
 		return
 	}

upstream/yunzmall/yunzmall_logistics.go

@@ -21,10 +21,10 @@ type LogisticsCompanyRes struct {
 	} `json:"data"`
 }
 
-// Company 快递公司
-func (s logisticsLogic) Company(ctx context.Context) (res *LogisticsCompanyRes, err error) {
+// LogisticsCompany 快递公司
+func (s *Client) LogisticsCompany(ctx context.Context) (res *LogisticsCompanyRes, err error) {
 	var method = "/app/order/cloud/company/list"
-	result, err := get(ctx, method, g.Map{})
+	result, err := s.get(ctx, method, g.Map{})
 	if err != nil {
 		return
 	}
@@ -53,10 +53,10 @@ type LogisticsTraceRes struct {
 	} `json:"data"`
 }
 
-//Delivery 获取物流信息
-func (s logisticsLogic) Delivery(ctx context.Context, req string) (res *LogisticsTraceRes, err error) {
+//LogisticsDelivery 获取物流信息
+func (s *Client) LogisticsDelivery(ctx context.Context, req string) (res *LogisticsTraceRes, err error) {
 	var method = "/app/order/Logistic"
-	result, err := post(ctx, method, g.Map{
+	result, err := s.post(ctx, method, g.Map{
 		"order_sn": req,
 	})
 	if err != nil {

upstream/yunzmall/yunzmall_order.go

@@ -10,8 +10,6 @@ import (
 type orderLogic struct {
 }
 
-var Order = orderLogic{}
-
 type OrderAddress struct {
 	Area        string `json:"area"`
 	City        string `json:"city"`
@@ -40,10 +38,10 @@ type OrderBeforeRes struct {
 	} `json:"data"`
 }
 
-// Before 前置校验
-func (s orderLogic) Before(ctx context.Context, req OrderBeforeReq) (res *OrderBeforeRes, err error) {
+// OrderBefore 前置校验
+func (s *Client) OrderBefore(ctx context.Context, req OrderBeforeReq) (res *OrderBeforeRes, err error) {
 	var method = "/app/order/beforeCheck"
-	result, err := post(ctx, method, gconv.Map(req))
+	result, err := s.post(ctx, method, gconv.Map(req))
 	if err != nil {
 		return
 	}
@@ -429,10 +427,10 @@ type OrderCreateRes struct {
 	} `json:"data"`
 }
 
-// Create 下单
-func (s orderLogic) Create(ctx context.Context, req OrderCreateReq) (res *OrderCreateRes, err error) {
+// OrderCreate 下单
+func (s *Client) OrderCreate(ctx context.Context, req OrderCreateReq) (res *OrderCreateRes, err error) {
 	var method = "/app/order"
-	result, err := post(ctx, method, gconv.Map(req))
+	result, err := s.post(ctx, method, gconv.Map(req))
 	if err != nil {
 		return
 	}
@@ -454,10 +452,10 @@ type OrderAvailableRes struct {
 	Msg string `json:"msg"`
 }
 
-// Available 可售检测
-func (s orderLogic) Available(ctx context.Context, req OrderAvailableReq) (res *OrderAvailableRes, err error) {
+// OrderAvailable 可售检测
+func (s *Client) OrderAvailable(ctx context.Context, req OrderAvailableReq) (res *OrderAvailableRes, err error) {
 	var method = "/app/order/availableCheck"
-	result, err := post(ctx, method, gconv.Map(req))
+	result, err := s.post(ctx, method, gconv.Map(req))
 	if err != nil {
 		return
 	}
@@ -574,10 +572,10 @@ type OrderDetailRes struct {
 	} `json:"data"`
 }
 
-// Detail 订单详情
-func (s orderLogic) Detail(ctx context.Context, req string) (res *OrderDetailRes, err error) {
+// OrderDetail 订单详情
+func (s *Client) OrderDetail(ctx context.Context, req string) (res *OrderDetailRes, err error) {
 	var method = "/app/order/orderDetail"
-	result, err := get(ctx, method, g.Map{
+	result, err := s.get(ctx, method, g.Map{
 		"order_sn": req,
 	})
 	if err != nil {

upstream/yunzmall/yunzmall_refund.go

@@ -10,16 +10,14 @@ import (
 type refundLogic struct {
 }
 
-var Refund = refundLogic{}
-
 type RefundBeforeRes struct {
 	CommonRes
 	Data map[string]string `json:"data"`
 }
 
-func (s refundLogic) Before(ctx context.Context, req string) (res *RefundBeforeRes, err error) {
+func (s *Client) RefundBefore(ctx context.Context, req string) (res *RefundBeforeRes, err error) {
 	var method = "/app/afterSales/getAfterSalesTypeNameMap"
-	result, err := get(ctx, method, g.Map{
+	result, err := s.get(ctx, method, g.Map{
 		"order_item_id": req,
 	})
 	if err != nil {
@@ -113,10 +111,10 @@ type RefundDetailRes struct {
 	} `json:"data"`
 }
 
-// Detail 详情
-func (s refundLogic) Detail(ctx context.Context, req interface{}) (res *RefundDetailRes, err error) {
+// RefundDetail 详情
+func (s *Client) RefundDetail(ctx context.Context, req interface{}) (res *RefundDetailRes, err error) {
 	var method = "/app/afterSales/get"
-	result, err := get(ctx, method, g.Map{
+	result, err := s.get(ctx, method, g.Map{
 		"id": gconv.Int(req),
 	})
 	if err != nil {
@@ -167,10 +165,10 @@ type RefundAddressRes struct {
 	} `json:"data"`
 }
 
-// Address 退货地址
-func (s refundLogic) Address(ctx context.Context, req interface{}) (res *RefundAddressRes, err error) {
+// RefundAddress 退货地址
+func (s *Client) RefundAddress(ctx context.Context, req interface{}) (res *RefundAddressRes, err error) {
 	var method = "/app/supplier/findShopAddressByOrderId"
-	result, err := get(ctx, method, g.Map{
+	result, err := s.get(ctx, method, g.Map{
 		"after_sales_id": gconv.Int(req),
 	})
 	if err != nil {
@@ -188,10 +186,10 @@ type RefundReasonRes struct {
 	Msg string `json:"msg"`
 }
 
-// Reason 售后原因
-func (s refundLogic) Reason(ctx context.Context, afterSaleType, isReceived int) (res *RefundReasonRes, err error) {
+// RefundReason 售后原因
+func (s *Client) RefundReason(ctx context.Context, afterSaleType, isReceived int) (res *RefundReasonRes, err error) {
 	var method = "/app/afterSales/reason/list"
-	result, err := get(ctx, method, g.Map{
+	result, err := s.get(ctx, method, g.Map{
 		"after_sale_type": afterSaleType,
 		"is_received":     isReceived,
 	})
@@ -223,10 +221,10 @@ type RefundCreateRes struct {
 	Data int `json:"data"`
 }
 
-// Create 申请售后
-func (s refundLogic) Create(ctx context.Context, req RefundCreateReq) (res *RefundCreateRes, err error) {
+// RefundCreate 申请售后
+func (s *Client) RefundCreate(ctx context.Context, req RefundCreateReq) (res *RefundCreateRes, err error) {
 	var method = "/app/afterSales/create"
-	result, err := post(ctx, method, gconv.Map(req))
+	result, err := s.post(ctx, method, gconv.Map(req))
 	if err != nil {
 		return
 	}
@@ -242,10 +240,10 @@ type RefundSendReq struct {
 	ShippingAddressID int    `json:"shipping_address_id"` //售后商家收货地址 通过售后id获取默认商家售后退货地址 获得
 }
 
-// Send 售后发货
-func (s refundLogic) Send(ctx context.Context, req RefundSendReq) (res *CommonRes, err error) {
+// RefundSend 售后发货
+func (s *Client) RefundSend(ctx context.Context, req RefundSendReq) (res *CommonRes, err error) {
 	var method = "app/afterSales/send"
-	result, err := post(ctx, method, gconv.Map(req))
+	result, err := s.post(ctx, method, gconv.Map(req))
 	if err != nil {
 		return
 	}

upstream/yunzmall/yunzmall_storage.go

@@ -10,12 +10,10 @@ import (
 type storageLogic struct {
 }
 
-var Storage = storageLogic{}
-
-// Add 添加选品库商品
-func (s storageLogic) Add(ctx context.Context, req interface{}) (res *CommonRes, err error) {
+// StorageAdd 添加选品库商品
+func (s *Client) StorageAdd(ctx context.Context, req interface{}) (res *CommonRes, err error) {
 	var method = "/app/product/storage/addStorage"
-	result, err := post(ctx, method, g.Map{
+	result, err := s.post(ctx, method, g.Map{
 		"ids": gconv.Ints(req),
 	})
 	if err != nil {
@@ -25,10 +23,10 @@ func (s storageLogic) Add(ctx context.Context, req interface{}) (res *CommonRes,
 	return
 }
 
-// Delete 删除选品库商品
-func (s storageLogic) Delete(ctx context.Context, req interface{}) (res *CommonRes, err error) {
+// StorageDelete 删除选品库商品
+func (s *Client) StorageDelete(ctx context.Context, req interface{}) (res *CommonRes, err error) {
 	var method = "/app/product/storage/deleteStorage"
-	result, err := post(ctx, method, g.Map{
+	result, err := s.post(ctx, method, g.Map{
 		"ids": gconv.Ints(req),
 	})
 	if err != nil {