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-07-21 11:32:15 +08:00
parent f69c2d55f2
commit 840f61899c
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/cms/sync_store_sku.go
View File

@@ -224,10 +224,10 @@ func isStoreSkuSyncNeedDelete(storeSku *dao.StoreSkuSyncInfo) bool {
storeSku.NameID == 0 || storeSku.NameStatus != model.SkuStatusNormal { storeSku.NameID == 0 || storeSku.NameStatus != model.SkuStatusNormal {
return true return true
} }
if storeSku.Status != model.SkuStatusNormal { // if storeSku.Status != model.SkuStatusNormal {
storeSku.IsDeletedBySku = true // storeSku.IsDeletedBySku = true
return true // return true
} // }
return false return false
} }

11
business/jxutils/weixinmsg/weixinmsg.go
View File

@@ -5,6 +5,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/astaxie/beego"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/authz/autils" "git.rosy.net.cn/jx-callback/business/authz/autils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -174,7 +176,14 @@ func getOrderDetailBrief(order *model.GoodsOrder) (brief string) {
sb.WriteString("份（") sb.WriteString("份（")
sb.WriteString(jxutils.IntPrice2StandardString(order.Skus[0].SalePrice)) sb.WriteString(jxutils.IntPrice2StandardString(order.Skus[0].SalePrice))
sb.WriteString("元/份）等，预计收入") sb.WriteString("元/份）等，预计收入")
sb.WriteString(jxutils.IntPrice2StandardString(order.ShopPrice)) //TODO 2020-07-20 果园和菜市不同
var price int64
if beego.BConfig.RunMode == "jxgy" {
price = order.EarningPrice
} else {
price = order.ShopPrice
}
sb.WriteString(jxutils.IntPrice2StandardString(price))
sb.WriteString("元") sb.WriteString("元")
return sb.String() return sb.String()
} }