Merge remote-tracking branch 'origin/mark' into lcw

2019-04-28 15:36:24 +08:00
parent dcb9122425 7bdcf5bb95
commit a12d6f04f1
44 changed files with 914 additions and 245 deletions
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -15,7 +15,6 @@ import (
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/orm"
 )

 const (
@@ -70,9 +69,9 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
 		order.Status = model.WaybillStatusDelivering
 	case dadaapi.OrderStatusFinished:
 		order.Status = model.WaybillStatusDelivered
-	case dadaapi.OrderStatusCanceled:
+	case dadaapi.OrderStatusCanceled, dadaapi.OrderStatusExpired:
 		order.Status = model.WaybillStatusCanceled
-	case dadaapi.OrderStatusExpired, dadaapi.OrderStatusAddOrderFailed:
+	case dadaapi.OrderStatusAddOrderFailed:
 		order.Status = model.WaybillStatusFailed
 	default:
 		order.Status = model.WaybillStatusUnknown
@@ -102,7 +101,7 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal

 // IDeliveryPlatformHandler
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.CreateWaybillPolicy) (bill *model.Waybill, err error) {
-	db := orm.NewOrm()
+	db := dao.GetDB()
 	deliveryFee, addFee, err := delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
 	if err != nil {
 		return nil, err
@@ -133,17 +132,18 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.

 			if globals.EnableStoreWrite {
 				// 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单
-				var lists []orm.ParamsList
-				num, err2 := db.Raw(`
-		SELECT vendor_waybill_id
-		FROM waybill
-		WHERE waybill_created_at > DATE_ADD(NOW(), interval -2 day)
-		AND vendor_order_id = ?
-		AND waybill_vendor_id = ?
-		`, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada).ValuesList(&lists)
+				var waybillList []*model.Waybill
+				err2 := dao.GetRows(db, &waybillList, `
+					SELECT *
+					FROM waybill
+					WHERE waybill_created_at > DATE_ADD(NOW(), interval -2 day)
+					AND vendor_order_id = ?
+					AND waybill_vendor_id = ?
+					ORDER BY id DESC
+					`, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada)
 				var result *dadaapi.CreateOrderResponse
-				if err = err2; err == nil && num > 0 {
-					globals.SugarLogger.Debugf("CreateWaybill orderID:%s num=%d use ReaddOrder", order.VendorOrderID, num)
+				if err = err2; err == nil && len(waybillList) > 0 && waybillList[0].Status != model.WaybillStatusFailed {
+					globals.SugarLogger.Debugf("CreateWaybill orderID:%s len(waybillList)=%d use ReaddOrder", order.VendorOrderID, len(waybillList))
 					result, err = api.DadaAPI.ReaddOrder(billParams, addParams)
 				} else {
 					if err != nil {
@@ -192,7 +192,7 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
 	return err
 }

-func (c *DeliveryHandler) getDataCityCodeFromOrder(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
+func (c *DeliveryHandler) getDataCityCodeFromOrder(order *model.GoodsOrder, db *dao.DaoDB) (retVal string, err error) {
 	jxStoreID := jxutils.GetSaleStoreIDFromOrder(order)
 	sql := `
 		SELECT t2.tel_code
@@ -200,11 +200,10 @@ func (c *DeliveryHandler) getDataCityCodeFromOrder(order *model.GoodsOrder, db o
 		JOIN place t2 on t1.city_code = t2.code
 		WHERE t1.id = ?
 		`
-	db2 := dao.WrapDB(db)
 	codeInfo := &struct {
 		TelCode string
 	}{}
-	if err = dao.GetRow(db2, codeInfo, sql, jxStoreID); err != nil {
+	if err = dao.GetRow(db, codeInfo, sql, jxStoreID); err != nil {
 		globals.SugarLogger.Errorf("GetDataCityCodeFromOrder can not find store info for vendorID:%d, store:%s, error:%v", order.VendorID, order.VendorStoreID, err)
 		if err == nil {
 			err = ErrCanNotFindDadaCityCode
@@ -214,11 +213,10 @@ func (c *DeliveryHandler) getDataCityCodeFromOrder(order *model.GoodsOrder, db o
 	return codeInfo.TelCode, nil
 }

-func (c *DeliveryHandler) getDadaShopID(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
+func (c *DeliveryHandler) getDadaShopID(order *model.GoodsOrder, db *dao.DaoDB) (retVal string, err error) {
 	saleStoreID := jxutils.GetSaleStoreIDFromOrder(order)
-	db2 := dao.WrapDB(db)
-	storeCourierList, err2 := dao.GetOpenedStoreCouriersByStoreID(db2, saleStoreID, model.VendorIDDada)
-	if err = err2; err != nil && err != orm.ErrNoRows {
+	storeCourierList, err2 := dao.GetOpenedStoreCouriersByStoreID(db, saleStoreID, model.VendorIDDada)
+	if err = err2; err != nil && !dao.IsNoRowsError(err) {
 		return "", err
 	}
 	if len(storeCourierList) == 0 {
--- a/business/partner/delivery/delivery.go
+++ b/business/partner/delivery/delivery.go
@@ -12,7 +12,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
 )

 const (
@@ -57,10 +56,10 @@ func CallCreateWaybillPolicy(policy partner.CreateWaybillPolicy, refDeliveryFee,
 	return nil
 }

-func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db orm.Ormer) (deliveryFee, addFee int64, err error) {
+func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db *dao.DaoDB) (deliveryFee, addFee int64, err error) {
 	globals.SugarLogger.Debugf("CalculateOrderDeliveryFee orderID:%s", order.VendorOrderID)
 	if db == nil {
-		db = orm.NewOrm()
+		db = dao.GetDB()
 	}
 	jxStoreID := jxutils.GetSaleStoreIDFromOrder(order)
 	var lng, lat float64
@@ -69,8 +68,7 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o
 		Lng   int
 		Lat   int
 	}{}
-	db2 := dao.WrapDB(db)
-	if err = dao.GetRow(db2, priceInfo, `
+	if err = dao.GetRow(db, priceInfo, `
 		SELECT t2.mtps_price price, t1.lng, t1.lat
 		FROM store t1
 		JOIN place t2 ON t1.city_code = t2.code
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -115,7 +115,7 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re

 // IDeliveryPlatformHandler
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.CreateWaybillPolicy) (bill *model.Waybill, err error) {
-	db := orm.NewOrm()
+	db := dao.GetDB()
 	deliveryFee, addFee, err := delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
 	if err == nil {
 		if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, deliveryFee, order, model.VendorIDMTPS); err != nil {
@@ -201,16 +201,15 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
 	return nil
 }

-func (c *DeliveryHandler) getDeliveryID(order *model.GoodsOrder, db orm.Ormer) (retVal int64, err error) {
+func (c *DeliveryHandler) getDeliveryID(order *model.GoodsOrder, db *dao.DaoDB) (retVal int64, err error) {
 	// jxorder表当前已经有50多万条记录了，加100万避免冲突
 	// 508505
 	return order.ID + 1000000, nil
 }

-func (c *DeliveryHandler) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
+func (c *DeliveryHandler) getMTPSShopID(order *model.GoodsOrder, db *dao.DaoDB) (retVal string, err error) {
 	saleStoreID := jxutils.GetSaleStoreIDFromOrder(order)
-	db2 := dao.WrapDB(db)
-	storeCourierList, err2 := dao.GetOpenedStoreCouriersByStoreID(db2, saleStoreID, model.VendorIDMTPS)
+	storeCourierList, err2 := dao.GetOpenedStoreCouriersByStoreID(db, saleStoreID, model.VendorIDMTPS)
 	if err = err2; err != nil && err != orm.ErrNoRows {
 		return "", err
 	}
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -166,6 +166,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 					shopID = store.ID
 				}
 				store2, err2 := p.ReadStore(store.VendorStoreID)
+				// globals.SugarLogger.Debugf("ebai UpdateStore2 store2:%s, err2:%v", utils.Format4Output(store2, true), err2)
 				if err = err2; err == nil {
 					if store2.ID == store.ID {
 						shopID = -1
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -387,16 +387,13 @@ func (p *PurchaseHandler) RefreshStoresAllSkusID(ctx *jxcontext.Context, parentT
 func genSkuParamsFromStoreSkuInfo(storeSku *tStoreSkuFullInfo) (params map[string]interface{}) {
 	price := jxutils.CaculateSkuVendorPrice(storeSku.Price, storeSku.PricePercentage)
 	params = map[string]interface{}{
-		"name":         jxutils.ComposeSkuName(storeSku.Prefix, storeSku.Name, storeSku.Comment, storeSku.Unit, storeSku.SpecQuality, storeSku.SpecUnit, 0),
-		"status":       jxSkuStatus2Ebai(jxutils.MergeSkuStatus(storeSku.SkuStatus, storeSku.Status)),
-		"left_num":     model.MaxStoreSkuStockQty,
-		"sale_price":   price,
-		"market_price": price,
-		"category_id":  storeSku.CatEbaiID,
-		"cat1_id":      getEbaiCat(storeSku.EbaiCat1ID, 1),
-		"cat2_id":      getEbaiCat(storeSku.EbaiCat2ID, 2),
-		"cat3_id":      getEbaiCat(storeSku.EbaiCat3ID, 3),
-		"weight":       storeSku.Weight,
+		"name":        jxutils.ComposeSkuName(storeSku.Prefix, storeSku.Name, storeSku.Comment, storeSku.Unit, storeSku.SpecQuality, storeSku.SpecUnit, 0),
+		"left_num":    model.MaxStoreSkuStockQty,
+		"category_id": storeSku.CatEbaiID,
+		"cat1_id":     getEbaiCat(storeSku.EbaiCat1ID, 1),
+		"cat2_id":     getEbaiCat(storeSku.EbaiCat2ID, 2),
+		"cat3_id":     getEbaiCat(storeSku.EbaiCat3ID, 3),
+		"weight":      storeSku.Weight,
 		"photos": []map[string]interface{}{
 			map[string]interface{}{
 				"is_master": true,
@@ -404,6 +401,13 @@ func genSkuParamsFromStoreSkuInfo(storeSku *tStoreSkuFullInfo) (params map[strin
 			},
 		},
 	}
+	if storeSku.EbaiSyncStatus&(model.SyncFlagPriceMask|model.SyncFlagNewMask) != 0 {
+		params["sale_price"] = price
+		params["market_price"] = price
+	}
+	if storeSku.EbaiSyncStatus&(model.SyncFlagSaleMask|model.SyncFlagNewMask) != 0 {
+		params["status"] = jxSkuStatus2Ebai(jxutils.MergeSkuStatus(storeSku.SkuStatus, storeSku.Status))
+	}
 	// todo 饿百如果给的UPC是空要报错，但如果我要删除UPC怎么弄？
 	if storeSku.Upc != "" {
 		params["upc"] = storeSku.Upc
--- a/business/partner/purchase/jd/sku.go
+++ b/business/partner/purchase/jd/sku.go
@@ -15,11 +15,14 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
+	"github.com/astaxie/beego"
 )

 const (
-	DefBrandID      = 35247
-	DefJdCategoryID = 20362
+	DefBrandID = 35247
+
+	DefJdCategoryID      = 20362
+	DefJdCategoryID4Jxgy = 22410 // 其他国产水果
 )

 type tSkuInfoExt struct {
@@ -36,6 +39,13 @@ var (
 	}
 )

+func getDefJdCategoryID() int {
+	if beego.BConfig.RunMode == "jxgy" {
+		return DefJdCategoryID4Jxgy
+	}
+	return DefJdCategoryID
+}
+
 func (p *PurchaseHandler) CreateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) (err error) {
 	var jdPid int64
 	if cat.ParentID != 0 {
@@ -134,7 +144,7 @@ func (p *PurchaseHandler) cuSku(db *dao.DaoDB, sku *model.Sku, handler func(skuE
 		// 	shopCategories = append(shopCategories, skuInfoExt.SkuCatID)
 		// }
 		if skuInfoExt.JdCategoryID == 0 {
-			skuInfoExt.JdCategoryID = DefJdCategoryID
+			skuInfoExt.JdCategoryID = getDefJdCategoryID()
 		}
 		if skuInfoExt.BrandID == 0 {
 			skuInfoExt.BrandID = DefBrandID
@@ -176,6 +186,12 @@ func (p *PurchaseHandler) CreateSku(db *dao.DaoDB, sku *model.Sku, userName stri
 		if skuExt.IsSpu == 0 {
 			if globals.EnableStoreWrite {
 				vendorSkuID, err = api.JdAPI.AddSku(utils.Int2Str(sku.ID), skuExt.JdCategoryID, shopCategories, skuExt.BrandID, skuName, price, jxutils.IntWeight2Float(sku.Weight), []string{skuExt.Img}, jxStatus2jdStatus(sku.Status), true, addParams)
+				if err != nil {
+					if jdSkuID := jdapi.GetJdSkuIDFromError(err); jdSkuID > 0 {
+						vendorSkuID = utils.Int64ToStr(jdSkuID)
+						err = nil
+					}
+				}
 			}
 		} else {
 			vendorSkuID, err = p.syncSkuNameAsSpu(db, sku, skuExt, price, skuName, shopCategories, addParams)
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -301,6 +301,7 @@ func (p *PurchaseHandler) GetStoreStatus(ctx *jxcontext.Context, vendorStoreID s
 	return storeStatus, err
 }

+// 当前京东的storeCrud消息不会在门店状态改变时发送，所以意义不大，先放在这里
 func (c *PurchaseHandler) onStoreMsg(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) {
 	var err error
 	if msg.StatusID == jdapi.StatusIDUpdateStore {
@@ -308,6 +309,11 @@ func (c *PurchaseHandler) onStoreMsg(msg *jdapi.CallbackOrderMsg) (response *jda
 		vendorStoreID := msg.BillID
 		if storeStatus, err = c.GetStoreStatus(jxcontext.AdminCtx, vendorStoreID); err == nil {
 			err = partner.CurStoreManager.OnStoreStatusChanged(vendorStoreID, model.VendorIDJD, storeStatus)
+		} else {
+			// 可能在门店删除的情况下会出查不到门店的错误
+			if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 4 {
+				err = nil
+			}
 		}
 	}
 	return jdapi.Err2CallbackResponse(err, "")
--- a/business/partner/purchase/weimob/wsc/wsc_test.go
+++ b/business/partner/purchase/weimob/wsc/wsc_test.go
@@ -3,6 +3,8 @@ package wsc
 import (
 	"testing"

+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -19,7 +21,7 @@ func init() {
 }

 func TestGetVendorCategories(t *testing.T) {
-	vendorCatList, err := new(PurchaseHandler).GetVendorCategories()
+	vendorCatList, err := new(PurchaseHandler).GetVendorCategories(jxcontext.AdminCtx)
 	if err != nil {
 		t.Fatal(err.Error())
 	}