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

business/partner/purchase/tiktok_store/order.go

@@ -71,7 +71,6 @@ func (p *PurchaseHandler) getStatusFromVendorStatus(vendorStatus int64) int {
 }
 
 func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
-	globals.SugarLogger.Debugf("Map2Order=====:%s", utils.Format4Output(orderData, false))
 	order, _, _ = c.getOrder(orderData["VendorOrgCode"].(string), orderData["vendorOrderID"].(string), "")
 	return order
 }

business/partner/purchase/tiktok_store/store.go

@@ -460,7 +460,6 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
 		param.Columns = nil
 		param.Template.TemplateName += "固定运费模板"
 	}
-	globals.SugarLogger.Debugf("param.Template.TemplateName===============%s", param.Template.TemplateName)
 	resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param)
 	if err != nil {
 		return 0, err
@@ -507,10 +506,8 @@ func UpdateFreightTemplate(storeCode int) error {
 			param.Columns = nil
 			param.Template.TemplateName += "固定运费模板"
 		}
-		globals.SugarLogger.Debugf("param.Template.TemplateName=============%s", param.Template.TemplateName)
 		_, err = getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateUpdate(param)
 		if err != nil {
-			globals.SugarLogger.Debugf("err==================%v", err)
 			return err
 		}
 	}

business/partner/purchase/tiktok_store/store_sku2_utils.go

@@ -530,9 +530,13 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk
 					{InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)},
 				},
 			}
-			sku.StockNum = localSku.Stock
+			stock := 0
+			if localSku.Stock == 0 {
+				stock = 9999
+			}
+			sku.StockNum = stock
 			sku.SkuType = 1
-			sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)}
+			sku.StockNumMap = map[string]int64{storeId: int64(stock)}
 			skuSize = append(skuSize, sku)
 		}
 	case 2:
@@ -552,9 +556,13 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk
 						{InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)},
 					},
 				}
-				sku.StockNum = localSku.Stock
+				stock := 0
+				if localSku.Stock == 0 {
+					stock = 9999
+				}
+				sku.StockNum = stock
 				sku.SkuType = 1
-				sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)}
+				sku.StockNumMap = map[string]int64{storeId: int64(stock)}
 				skuSize = append(skuSize, sku)
 			}
 		}
@@ -578,10 +586,14 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk
 							{InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)},
 						},
 					}
-					sku.StockNum = localSku.Stock
+					stock := 0
+					if localSku.Stock == 0 {
+						stock = 9999
+					}
+					sku.StockNum = stock
 					sku.StockNum = 0
 					sku.SkuType = 1
-					sku.StockNumMap = map[string]int64{storeId: int64(localSku.Stock)}
+					sku.StockNumMap = map[string]int64{storeId: int64(stock)}
 					skuSize = append(skuSize, sku)
 				}
 			}

business/partner/purchase/tiktok_store/warehouse.go

@@ -95,12 +95,10 @@ func BindStoreWarehouse(VendorOrgCode, outWarehouseID string, storeIDs int64) er
 
 // /warehouse/getWarehouseByStore 门店id获取绑定仓库详情包括电子围栏
 func GetWarehouseByStore(appOrgCode string, storeID int64) (map[int64][]warehouse_getWarehouseByStore_response.WarehouseInfoMapItem, error) {
-	globals.SugarLogger.Debugf("appOrgCode====%s,storeID=====%d", appOrgCode, storeID)
 	info, err := getAPI(appOrgCode, 0, "").GetWarehouseByStore(storeID)
 	if err != nil {
 		return nil, err
 	}
-	globals.SugarLogger.Debugf("err===================== %v", err)
 	return info, nil
 }