Explorar el Código

Merge branch 'dev/v4.8.49_dx' of qmx/jy into feature/v4.8.49

duxin hace 1 año
padre
commit
56d23e1c62
Se han modificado 1 ficheros con 2 adiciones y 17 borrados
  1. 2 17
      src/jfw/modules/subscribepay/src/util/sellerOrder.go

+ 2 - 17
src/jfw/modules/subscribepay/src/util/sellerOrder.go

@@ -8,7 +8,6 @@ import (
 	"jy/src/jfw/modules/subscribepay/src/config"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
 
 	qutil "app.yhyue.com/moapp/jybase/common"
@@ -135,8 +134,8 @@ func SendStationMessages(href, userId, action, msgType, title, content, link, an
 	if VipType == 1 {
 		name = "超级订阅(续费)"
 	}
-	pushHref := fmt.Sprintf("%s?_action=%s&userIds=%s&msgType=%s&title=%s&content=%s&link=%s&sendMode=2&sendTime=%s&androidUrl=%s&iosUrl=%s&weChatUrl=%s&_token=12311&reqSource=1&callPlatform=dyhxd&name=%s&orderid=%s&ordermoney=%s&details=您的订单%s处于未支付状态,为了使您获取更多...",
-		href, action, userId, msgType, title, content, link, NowFormat(Date_Short_Layout), androidUrl, iosUrl, weChatUrl, name, OrderCode, OrderMoneyFormStr(OrderMoney), OrderCode)
+	pushHref := fmt.Sprintf("%s?_action=%s&userIds=%s&msgType=%s&title=%s&content=%s&link=%s&sendMode=2&sendTime=%s&androidUrl=%s&iosUrl=%s&weChatUrl=%s&_token=12311&reqSource=1&callPlatform=dyhxd&name=%s&orderid=%s&ordermoney=%.2f&details=您的订单%s处于未支付状态,为了使您获取更多...",
+		href, action, userId, msgType, title, content, link, NowFormat(Date_Short_Layout), androidUrl, iosUrl, weChatUrl, name, OrderCode, float64(OrderMoney)/100, OrderCode)
 	log.Info("href:", pushHref)
 	log.Println(pushHref)
 	resp, err := http.Get(pushHref)
@@ -185,20 +184,6 @@ func SendStationMessages(href, userId, action, msgType, title, content, link, an
 	//	}
 }
 
-// OrderMoneyFormStr 金额取值
-func OrderMoneyFormStr(orderMoney int) string {
-	if orderMoney == 0 {
-		return "0"
-	}
-	str := fmt.Sprintf("%.2f", float64(orderMoney)/100)
-	if strings.Contains(str, ".00") {
-		str = strings.ReplaceAll(str, ".00", "")
-	} else if strings.HasSuffix(str, "0") {
-		str = strings.TrimRight(str, "0")
-	}
-	return str
-}
-
 // 加密
 func encode(i *identity.IdentityInfo) string {
 	b, _ := json.Marshal(i)