liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突处理

Browse Source
This commit is contained in:
苏尹岚
2020-01-09 08:46:26 +08:00
parent 19ab93ab1e 27e13ecb99
commit 70376fb6e7
10 changed files with 131 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/cms.go
View File

@@ -141,6 +141,8 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
"autoReplyTypeName": model.AutoReplyTypeName,
"complaintReasons": model.ComplaintReasons,
"supplementType": model.SupplementTypeName,
"operateType": model.OperateTypeName,
"thingType": model.ThingTypeName,
},
}
}

2
business/jxstore/cms/store_sku.go
View File

@@ -1089,7 +1089,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
setStoreSkuBindStatus(skuBind, model.SyncFlagSaleMask)
updateFieldMap[model.FieldStatus] = 1
}
if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制
if skuBindInfo.UnitPrice != 0 && skuBind.UnitPrice != unitPrice && isCanChangePrice { // 这里是否需要加此条件限制
skuBind.UnitPrice = unitPrice
skuBind.Price = jxutils.CaculateSkuPrice(unitPrice, v.SpecQuality, v.SpecUnit, v.SkuNameUnit)
skuBind.JxPrice = jxutils.CaculatePriceByPricePack(storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage), skuBind.Price)