1

business/jxutils/jxutils_cms.go

@@ -508,7 +508,7 @@ func GetVendorName(vendorID int) (vendorName string) {
 func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int) (earningPrice int64) {
 	//TODO 2021-07-05 16:50菜市和果园一样，取低的
 	//TODO 2021-07-05 18:48  还是改回来
-	if beego.BConfig.RunMode == "jxgy" {
+	if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
 		earningPrice = salePrice
 		if salePrice != 0 {
 			if shopPrice > 0 && shopPrice < earningPrice {

business/jxutils/weixinmsg/weixinmsg.go

@@ -497,7 +497,7 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
 	}
 	title := fmt.Sprintf(suffix+"老板，您的订单%s第%d号订单, %s被取消了！", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID)
 	var price int64
-	if beego.BConfig.RunMode == "jxgy" {
+	if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
 		price = order.NewEarningPrice
 	} else {
 		if order.EarningType == model.EarningTypePoints {