From f20b816f561286d5f58da3f8edfc7bb3afad6c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 7 Jan 2021 14:28:56 +0800 Subject: [PATCH] aa --- business/jxutils/smsmsg/smsmsg.go | 23 +++++++++++++++++++++-- conf/app.conf | 1 + globals/globals.go | 2 ++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go index be2ec0eeb..8791b462a 100644 --- a/business/jxutils/smsmsg/smsmsg.go +++ b/business/jxutils/smsmsg/smsmsg.go @@ -62,10 +62,29 @@ func getOrderNotifyPhone(order *model.GoodsOrder) (phoneList []string) { func NotifyNewOrder(order *model.GoodsOrder) (err error) { if isPushSMS(order) { - err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, globals.SMSNewOrderTemplate, map[string]interface{}{ + temp := "" + var price int64 + store, _ := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode) + if store.VendorPayPercentage < 50 && store.VendorPayPercentage != 0 { + temp = globals.SMSNewOrderTemplate + price = order.ActualPayPrice + } else if store.VendorPayPercentage > 50 { + temp = globals.SMSNewOrderTemplateQ + price = order.ShopPrice + } else if store.VendorPayPercentage == 0 { + if store.PayPercentage > 50 { + temp = globals.SMSNewOrderTemplateQ + price = order.ShopPrice + } else { + temp = globals.SMSNewOrderTemplate + price = order.ActualPayPrice + } + } + + err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, temp, map[string]interface{}{ "daySeq": order.OrderSeq, "consigneeName": order.ConsigneeName, - "payMoney": jxutils.IntPrice2StandardString(order.ActualPayPrice), + "payMoney": jxutils.IntPrice2StandardString(price), }, order) } return err diff --git a/conf/app.conf b/conf/app.conf index b311abbac..76d3564e8 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -128,6 +128,7 @@ storeNameEbai2 = "好菜鲜生" smsSignName = "京西菜市" smsMobileVerifyTemplate = "SMS_175583158" smsNewOrderTemplate = "SMS_175583150" +smsNewOrderTemplateQ = "SMS_181856710" smsOrderCanceledTemplate = "SMS_175573134" smsNewUserOrderTemplate = "SMS_190284055" diff --git a/globals/globals.go b/globals/globals.go index 8408c0a8f..15d4a930b 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -49,6 +49,7 @@ var ( SMSSignName string SMSMobileVerifyTemplate string SMSNewOrderTemplate string + SMSNewOrderTemplateQ string SMSOrderCanceledTemplate string SMSNewUserOrderTemplate string @@ -125,6 +126,7 @@ func Init() { SMSSignName = beego.AppConfig.String("smsSignName") SMSMobileVerifyTemplate = beego.AppConfig.String("smsMobileVerifyTemplate") SMSNewOrderTemplate = beego.AppConfig.String("smsNewOrderTemplate") + SMSNewOrderTemplateQ = beego.AppConfig.String("smsNewOrderTemplateQ") SMSOrderCanceledTemplate = beego.AppConfig.String("smsOrderCanceledTemplate") SMSNewUserOrderTemplate = beego.AppConfig.String("smsNewUserOrderTemplate")