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

business/jxcallback/scheduler/defsch/defsch.go

@@ -717,9 +717,10 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 			if savedOrderInfo.retryCount <= maxWaybillRetryCount {
 				savedOrderInfo.isNeedCreate3rdWaybill = true
 				excludeVendorIDs := savedOrderInfo.GetWaybillVendorIDs()
-				if order.VendorID == model.VendorIDJX {
+				//TODO 取消京西不自动发美团 2020-06-02
-					excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
+				// if order.VendorID == model.VendorIDJX {
-				}
+				// 	excludeVendorIDs = append(excludeVendorIDs, model.VendorIDMTPS)
+				// }
 				if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {
 					savedOrderInfo.retryCount++
 				}

business/partner/purchase/jd/order.go

@@ -73,7 +73,7 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string)
 	if err == nil {
 		if orderSettlement != nil {
 			updateOrderBySettleMent(order, orderSettlement)
-			globals.SugarLogger.Debugf("updateOrderBySettleMent", order.NewEarningPrice)
+			globals.SugarLogger.Debugf("updateOrderBySettleMent: %v , %v", order.NewEarningPrice, order.TotalShopMoney)
 			err = partner.CurOrderManager.UpdateOrderFields(order, []string{ /*"WaybillTipMoney", */ "TotalShopMoney", "PmSubsidyMoney", "NewEarningPrice"})
 		}
 	}

business/partner/purchase/jdshop/store_sku.go

@@ -76,20 +76,15 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 					if img != "" {
 						suffix := img[strings.LastIndex(img, "."):]
 						if suffix != ".png" {
-							if resBinary, _, err := jxutils.DownloadFileByURL(img + model.SkuNameImgToPng); err == nil {
+							if resBinary, _, _ := jxutils.DownloadFileByURL(img + model.SkuNameImgToPng); err == nil {
-								downloadURL, err2 := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix()))
+								downloadURL, _ := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix()))
-								err = err2
+								imageURL, _ = uploadImg(downloadURL, name, "tou")
-								imageURL, err = uploadImg(downloadURL, name, "tou")
 							}
 						} else {
-							imageURL, err = uploadImg(img, name, "tou")
+							imageURL, _ = uploadImg(img, name, "tou")
 						}
 					}
-					err2 := api.JdShopAPI.TransparentImageAdd(createSkuResult.WareID, imageURL)
+					api.JdShopAPI.TransparentImageAdd(createSkuResult.WareID, imageURL)
-					if err2 != nil {
-						failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-						return failedList, err
-					}
 				}
 				var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
 				var resultAttrs = make(map[string]int64)
@@ -309,6 +304,9 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 		if status == -1 {
 			return fmt.Errorf("京东商城店内分类创建失败！")
 		}
+		if err != nil {
+			return err
+		}
 		time.Sleep(time.Second * 2)
 		// flag := false
 		// for {
@@ -323,6 +321,9 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 				break
 			}
 		}
+		if storeCat.VendorCatID == "" {
+			return fmt.Errorf("京东商城店内分类创建可能失败了！storeID: %v", storeID)
+		}
 		// 	if flag {
 		// 		break
 		// 	}
@@ -480,6 +481,10 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		createSkuParamWare.PromiseID = jdshopapi.JdsPromiseID
 	}
 
+	if storeSku.VendorVendorCatID == jdshopapi.JdsBeefCatID {
+		createSkuParamWare.MultiCategoryID = jdshopapi.JdsBeefLastCatID
+	}
+
 	//上传京东图片
 	//规则，有两张就传两张，没有就重复传一张
 	pic1, err := uploadImg(storeSku.Img, name, "1")
@@ -527,6 +532,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		gcjkValueID int64                  //国产，进口的id
 		lbValueID   int64                  //类别的ID
 		bcztValueID int64                  //保存状态ID
+		rmsjValueID int64                  //热卖时间ID
 		attrsProp   []*jdshopapi.CreateSkuParamAttrs
 	)
 	attrs, err := api.JdShopAPI.FindAttrs(int(storeSku.VendorVendorCatID))
@@ -545,6 +551,8 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			attrIDs[v.Name] = v.ID
 		} else if v.Name == "保存状态" {
 			attrIDs[v.Name] = v.ID
+		} else if v.Name == "热卖时间" {
+			attrIDs[v.Name] = v.ID
 		}
 	}
 	values, _, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["贮存条件"])
@@ -581,6 +589,35 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		}
 		attrsProp = append(attrsProp, attrbczt)
 	}
+	if attrIDs["热卖时间"] != 0 {
+		values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(attrIDs["热卖时间"])
+		err = err2
+		for _, v := range values2 {
+			if v.Name == "12月" {
+				rmsjValueID = v.ID
+			}
+		}
+		attrrmsj := &jdshopapi.CreateSkuParamAttrs{
+			AttrID:     utils.Int2Str(attrIDs["热卖时间"]),
+			AttrValues: []string{utils.Int64ToStr(rmsjValueID)},
+		}
+		attrsProp = append(attrsProp, attrrmsj)
+	}
+	if storeSku.VendorVendorCatID == jdshopapi.JdsBeefCatID {
+		var exValueID int64
+		values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(150390)
+		err = err2
+		for _, v := range values2 {
+			if v.Name == "其他" {
+				exValueID = v.ID
+			}
+		}
+		attrex := &jdshopapi.CreateSkuParamAttrs{
+			AttrID:     utils.Int2Str(150390),
+			AttrValues: []string{utils.Int64ToStr(exValueID)},
+		}
+		attrsProp = append(attrsProp, attrex)
+	}
 	attrZctj := &jdshopapi.CreateSkuParamAttrs{
 		AttrID:     utils.Int2Str(attrIDs["贮存条件"]),
 		AttrValues: []string{utils.Int64ToStr(zctjValueID)},