diff --git a/business/model/dao/act.go b/business/model/dao/act.go index c14e94230..99d66a19d 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -59,7 +59,7 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs } sql := fmt.Sprintf(` SELECT t1.*, - t2.id map_id, t2.vendor_id, t2.vendor_act_id, t2.sync_status, + t2.id map_id, t2.vendor_id, t2.vendor_act_id, t2.sync_status, t2.actual_act_price, t3.vendor_store_id, CASE t2.vendor_id WHEN 0 THEN diff --git a/business/model/store.go b/business/model/store.go index ed7af85f9..8f42c054b 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -57,24 +57,24 @@ var ( StoreDeliveryTypeByStore: "门店自送", } BankName = map[string]string{ - "ICB": "工商银行", - "CCB": "建设银行", - "ABC": "农业银行", + "ICB": "中国工商银行", + "CCB": "中国建设银行", + "ABC": "中国农业银行", "BOC": "中国银行", - "PSBC": "邮储银行", + "PSBC": "中国邮储银行", "CITIC": "中信银行", - "CEB": "光大银行", - "HXB": "华夏银行", - "CMBC": "民生银行", + "CEB": "中国光大银行", + "HXB": "中国华夏银行", + "CMBC": "中国民生银行", "CMB": "招商银行", "SHB": "上海银行", "BJB": "北京银行", "BEA": "东亚银行", "CIB": "兴业银行", "NBB": "宁波银行", - "SPDB": "浦发银行", + "SPDB": "上海浦发银行", "GDB": "广发银行", - "BOCOM": "交通银行", + "BOCOM": "中国交通银行", "SPAB": "平安银行", "BSB": "包商银行", "CSCB": "长沙银行", diff --git a/business/partner/purchase/ebai/act.go b/business/partner/purchase/ebai/act.go index 56b56aacf..8493cd7e0 100644 --- a/business/partner/purchase/ebai/act.go +++ b/business/partner/purchase/ebai/act.go @@ -35,7 +35,7 @@ func actStoreSu2Ebai4Add(oneStoreActSku []*model.ActStoreSku2) (skus []*ebaiapi. if model.IsSyncStatusNeedCreate(v.SyncStatus) { skus = append(skus, &ebaiapi.ActivitySkuInfo4Add{ SkuID: v.VendorSkuID, - SpecialPrice: v.ActPrice, + SpecialPrice: v.ActualActPrice, Stock: v.Stock, }) } diff --git a/business/partner/purchase/jd/act.go b/business/partner/purchase/jd/act.go index e98b9861e..fe1ffe954 100644 --- a/business/partner/purchase/jd/act.go +++ b/business/partner/purchase/jd/act.go @@ -147,7 +147,7 @@ func storeSku2Jd(actStoreSku []*model.ActStoreSku2, handler func(syncStatus int) jdActStoreSku = append(jdActStoreSku, &jdapi.PromotionSku{ StationNo: utils.Str2Int64(v.VendorStoreID), SkuID: utils.Str2Int64(v.VendorSkuID), - PromotionPrice: v.ActPrice, + PromotionPrice: v.ActualActPrice, LimitSkuCount: v.Stock, }) } diff --git a/business/partner/purchase/mtwm/act.go b/business/partner/purchase/mtwm/act.go index 8606085d7..07e6d5aad 100644 --- a/business/partner/purchase/mtwm/act.go +++ b/business/partner/purchase/mtwm/act.go @@ -44,7 +44,7 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle // Period: "", // WeeksTime: "", SettingType: mtwmapi.SettingTypeAsPrice, - ActPrice: jxutils.IntPrice2Standard(v.ActPrice), + ActPrice: jxutils.IntPrice2Standard(v.ActualActPrice), // DiscountCoefficient: 0, Sequence: int(v.ActPrice), ItemID: utils.Str2Int64WithDefault(v.VendorActID, 0),