diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 5cd0adb5b..52094bbf0 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -224,10 +224,10 @@ func isStoreSkuSyncNeedDelete(storeSku *dao.StoreSkuSyncInfo) bool { storeSku.NameID == 0 || storeSku.NameStatus != model.SkuStatusNormal { return true } - if storeSku.Status != model.SkuStatusNormal { - storeSku.IsDeletedBySku = true - return true - } + // if storeSku.Status != model.SkuStatusNormal { + // storeSku.IsDeletedBySku = true + // return true + // } return false } diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index aed904b7b..cbdf4a3a6 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -5,6 +5,8 @@ import ( "strings" "time" + "github.com/astaxie/beego" + "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/jxutils/jxcontext" @@ -174,7 +176,14 @@ func getOrderDetailBrief(order *model.GoodsOrder) (brief string) { sb.WriteString("份(") sb.WriteString(jxutils.IntPrice2StandardString(order.Skus[0].SalePrice)) 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("元") return sb.String() }