- adjust package structure.

2018-06-20 15:53:08 +08:00
parent 9ca830c240
commit 157d36c47f
9 changed files with 139 additions and 124 deletions
--- a/business/elm/controller/order.go
+++ b/business/elm/controller/order.go
@@ -5,6 +5,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/elm/models"
 	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/globals2"
 	"github.com/astaxie/beego/orm"
 )

@@ -46,12 +47,12 @@ func (o *OrderController) NewOrder(msg *elmapi.ELMCallbackMsg, orderId string) *
 		return errResponseDBError
 	}
 	if created || rec.Type != msg.Type {
-		result, err := globals.ElmAPI.GetOrder(orderId)
+		result, err := globals2.ElmAPI.GetOrder(orderId)
 		if err != nil {
 			globals.SugarLogger.Warnf("call GetOrder error:%v", err)
 			return errResponseCallELMAPIError
 		}
-		err = globals.FreshFoodAPI.NewELMOrder(result)
+		err = globals2.FreshFoodAPI.NewELMOrder(result)
 		if err != nil {
 			globals.SugarLogger.Warnf("internal error:%v", err)
 			return errResponseInternal
@@ -74,7 +75,7 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.ELMCallbackMsg, orderId
 		return errResponseDBError
 	}
 	if rec.Type != msg.Type {
-		err = globals.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimestamp())
+		err = globals2.FreshFoodAPI.ELMOrderStatus(orderId, msg.Type, utils.GetCurTimestamp())
 		if err != nil {
 			globals.SugarLogger.Warnf("internal error:%v", err)
 			return errResponseInternal
@@ -83,7 +84,7 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.ELMCallbackMsg, orderId
 			utils.CallFuncLogError(func() error {
 				_, err := db.Update(rec, "Type")
 				return err
-			}, globals.ErrStrAccessDB)
+			}, globals2.ErrStrAccessDB)
 		}
 	} else {
 		globals.SugarLogger.Infof("duplicate elm msg received:%v", msg)
--- a/business/freshfood/freshfood.go
+++ b/business/freshfood/freshfood.go
@@ -9,7 +9,7 @@ import (
 	"git.rosy.net.cn/baseapi/platform/mtpsapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jd/models"
-	"go.uber.org/zap"
+	"git.rosy.net.cn/jx-callback/globals"
 )

 const (
@@ -75,13 +75,12 @@ const (
 )

 type FreshFoodAPI struct {
-	baseURL     string
-	sugarLogger *zap.SugaredLogger
-	client      *http.Client
+	baseURL string
+	client  *http.Client
 }

-func NewFreshFoodAPI(baseURL string, sugarredLogger *zap.SugaredLogger) *FreshFoodAPI {
-	return &FreshFoodAPI{baseURL, sugarredLogger, &http.Client{Timeout: time.Second * 5}}
+func NewFreshFoodAPI(baseURL string) *FreshFoodAPI {
+	return &FreshFoodAPI{baseURL, &http.Client{Timeout: time.Second * 5}}
 }

 func (f *FreshFoodAPI) AccessFreshFood(apiStr string, params url.Values) error {
@@ -90,14 +89,14 @@ func (f *FreshFoodAPI) AccessFreshFood(apiStr string, params url.Values) error {
 	for i := 0; i < retryCount; i++ {
 		// _, err := f.client.PostForm(fullURL, params)
 		err = error(nil)
-		f.sugarLogger.Debug(fullURL)
-		f.sugarLogger.Debug(params)
+		globals.SugarLogger.Debug(fullURL)
+		globals.SugarLogger.Debug(params)
 		if err == nil {
 			break
 		}
 	}
 	if err != nil {
-		f.sugarLogger.Warnf("Call %s error:%v", fullURL, err)
+		globals.SugarLogger.Warnf("Call %s error:%v", fullURL, err)
 	}
 	return err
 }
--- a/business/jd/controller/order.go
+++ b/business/jd/controller/order.go
@@ -8,6 +8,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jd/models"
 	"git.rosy.net.cn/jx-callback/compat/corm"
 	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/globals2"
 	"github.com/astaxie/beego/orm"
 )

@@ -119,7 +120,7 @@ func (c *OrderController) OrderStatus(order *jdapi.JDOrderMsg) *jdapi.JDCallback
 						utils.CallFuncLogError(func() error {
 							_, err := db.Update(rec, "OrderStatus", "OrderStatusTime", "Code")
 							return err
-						}, globals.ErrStrAccessDB)
+						}, globals2.ErrStrAccessDB)
 						addOrderMsg(order)
 					}
 				} else {
@@ -135,7 +136,7 @@ func (c *OrderController) OrderStatus(order *jdapi.JDOrderMsg) *jdapi.JDCallback
 }

 func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.JDDeliveryStatusMsg) *jdapi.JDCallbackResponse {
-	err := globals.FreshFoodAPI.JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg)
+	err := globals2.FreshFoodAPI.JDOrderDeliveryStatus(jdOrderDeliveryStatusMsg)

 	if err != nil {
 		globals.SugarLogger.Errorf("Error when calling JDOrderDeliveryStatus, error:%v", err)
@@ -147,11 +148,11 @@ func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.JD

 //-----------
 func acceptOrder(order *jdapi.JDOrderMsg) {
-	globals.Jdapi.OrderAcceptOperate(order.BillId, true)
+	globals2.Jdapi.OrderAcceptOperate(order.BillId, true)
 }

 func newOrder(order *jdapi.JDOrderMsg) error {
-	result, err := globals.Jdapi.LegacyQuerySingleOrder(order.BillId)
+	result, err := globals2.Jdapi.LegacyQuerySingleOrder(order.BillId)
 	acceptOrder(order)
 	if err != nil {
 		globals.SugarLogger.Errorf("error when query jd order:%s, error:%v", order.BillId, err)
@@ -183,13 +184,13 @@ func newOrder(order *jdapi.JDOrderMsg) error {

 			resultByteArr := utils.MustMarshal(data)
 			rec.Data = string(resultByteArr)
-			err = globals.FreshFoodAPI.NewJDOrder(rec)
+			err = globals2.FreshFoodAPI.NewJDOrder(rec)
 			if err == nil {
 				db := orm.NewOrm()
 				utils.CallFuncLogError(func() error {
 					_, err := db.Update(rec, "Data", "Code", "Msg", "Success", "CityName", "OrderStatus", "OrderStatusTime")
 					return err
-				}, globals.ErrStrAccessDB)
+				}, globals2.ErrStrAccessDB)
 			} else {
 				globals.SugarLogger.Errorf("Error when calling NewJDOrder error:%v", err)
 			}
@@ -223,7 +224,7 @@ func normalOrderStatus(order *jdapi.JDOrderMsg) error {

 	rec.OrderStatus = utils.Str2Int(order.StatusId)
 	rec.OrderStatusTime = order.Timestamp
-	err = globals.FreshFoodAPI.JDOrderStatus(rec)
+	err = globals2.FreshFoodAPI.JDOrderStatus(rec)
 	if err != nil {
 		globals.SugarLogger.Warnf("access freshfood failed, error:%v", err)
 		return err
@@ -233,6 +234,6 @@ func normalOrderStatus(order *jdapi.JDOrderMsg) error {
 	utils.CallFuncLogError(func() error {
 		_, err := db.Update(rec, "OrderStatus", "OrderStatusTime", "Code")
 		return err
-	}, globals.ErrStrAccessDB)
+	}, globals2.ErrStrAccessDB)
 	return err
 }
--- a/business/mtps/controller/order.go
+++ b/business/mtps/controller/order.go
@@ -2,7 +2,7 @@ package controller

 import (
 	"git.rosy.net.cn/baseapi/platform/mtpsapi"
-	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/globals2"
 )

 type OrderController struct {
@@ -18,9 +18,9 @@ func Error2Response(err error) *mtpsapi.MtpsCallbackResponse {
 }

 func (c *OrderController) OrderStatusChanged(order *mtpsapi.MtpsCallbackOrderMsg) *mtpsapi.MtpsCallbackResponse {
-	return Error2Response(globals.FreshFoodAPI.MtpsOrderStatusChanged(order))
+	return Error2Response(globals2.FreshFoodAPI.MtpsOrderStatusChanged(order))
 }

 func (c *OrderController) OrderException(order *mtpsapi.MtpsCallbackOrderExceptionMsg) *mtpsapi.MtpsCallbackResponse {
-	return Error2Response(globals.FreshFoodAPI.MtpsOrderException(order))
+	return Error2Response(globals2.FreshFoodAPI.MtpsOrderException(order))
 }