From c8ab2b231091f41690f6bd2f0957a78ff43c3e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 4 Feb 2021 17:57:05 +0800 Subject: [PATCH] aa --- business/jxstore/cms/store_sku.go | 3 +++ business/model/dao/store.go | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 695a71910..c05db6dd1 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4425,6 +4425,9 @@ func CreateSkusAndFocusFromWx(ctx *jxcontext.Context, productInfo *jdapi.Product if strings.Contains(productInfo.OriginalName, upcSpecName1) { originName = strings.ReplaceAll(productInfo.OriginalName, upcSpecName1, "") } + if strings.Contains(productInfo.OriginalName, "*") { + originName = strings.ReplaceAll(productInfo.OriginalName, "*", "") + } _, name, _, specUnit, unit, specQuality := jxutils.SplitSkuName(originName) productInfo.Name = name productInfo.SpecQuality = specQuality diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 0f8f976fb..c0e595e4b 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -57,6 +57,8 @@ type StoreDetail struct { YbAppID string `orm:"column(yb_app_id)" json:"ybAppID"` YbAppKey string `json:"ybAppKey"` YbStorePrefix string `json:"ybStorePrefix"` + + MtwmToken string `json:"mtwmToken"` } // 带快递门店信息的 @@ -101,7 +103,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo SELECT t1.*, t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee_deduction_sill, t2.delivery_fee_deduction_fee, t2.sync_status, t2.vendor_org_code, t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.is_order, t2.yb_app_id, t2.yb_app_key, t2.yb_store_prefix, - t2.jds_street_code, t2.jds_street_name, t2.is_supply_goods, t2.vendor_pay_percentage, + t2.jds_street_code, t2.jds_street_name, t2.is_supply_goods, t2.vendor_pay_percentage, t2.mtwm_token, t3.value price_percentage_pack_str, t4.value freight_deduction_pack_str, province.name province_name,