mergemark

This commit is contained in:
苏尹岚
2019-11-26 10:26:14 +08:00
25 changed files with 1208 additions and 289 deletions

View File

@@ -466,7 +466,7 @@ func GetVendorName(vendorID int) (vendorName string) {
func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) (earningPrice int64) {
earningPrice = salePrice
if shopPrice > 0 && shopPrice < earningPrice {
if salePrice == 0 || shopPrice > 0 && shopPrice < earningPrice {
earningPrice = shopPrice
}
if storePayPercentage <= 0 {