Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/partner/purchase/tiktok_store/store_sku2_utils.go

@@ -364,11 +364,18 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 			//	continue
 			//}
 
-			// 创建子商品
+			// 修改商品
 			//param.FreightId = freightId
-			param.ProductId = utils.Str2Int64(storeSku.VendorSkuID)
+			param.ProductId = utils.Str2Int64(storeSku.VendorMainId)
 			param.MainProductId = utils.Str2Int64(storeSku.VendorMainId)
 			param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, param.MainProductId, storeSku)
+			if err := api.EditStoreCommodity(param); err != nil {
+				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
+				storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID)
+				continue
+			}
+
+			param.ProductId = utils.Str2Int64(storeSku.VendorSkuID)
 			//param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResult.ProductId, storeSku)
 			// 获取门店限售模板
 			//saleLimitId, err := CreateSaleTemp(utils.Str2Int64(vendorStoreID), api)

controllers/tiktok_delivery.go

@@ -153,7 +153,7 @@ func (c *LogisticsController) LogisticsQuery() {
 
 	// 查询订单的运单是否存在
 	data, err := dao.GetWayBillsByWayBillId(dao.GetDB(), param.TrackNo)
-	if err != nil {
+	if err != nil || len(data) == 0 {
 		globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
 		c.Data["json"] = LogisticsQueryRest{
 			Result:     false,