From 840f61899ced8d8c35cb1ad65094398da062a7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 21 Jul 2020 11:32:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=9C=E5=9B=AD=E6=96=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E9=83=A8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go  |  8 ++++----
 business/jxutils/weixinmsg/weixinmsg.go | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

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()
 }