Merge branch 'feature/v4.8.49' into dev/v4.8.49_zsy

src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go

@@ -137,7 +137,7 @@ func GetContacts(entName string, entType int) (list []interface{}) {
                         a.id,a.name_id,a.contact_name,a.contact_tel,a.source_type,a.publishtime,b.infoid
                     FROM
                         dws_f_ent_contact a
-                    LEFT JOIN dws_f_bpmc_relation b ON (cast(a.id as char) = b.contact_id )
+                    LEFT JOIN dws_f_bpmc_relation b ON (a.id = b.contact_id )
                     WHERE a.name_id = ?  AND (if(a.source_type=2,true,(a.identity_type &(1 << ?)) > 0 ))) m
                     LEFT JOIN dws_f_bid_baseinfo n ON m.infoid = n.infoid
                     where (if(m.source_type=1,projectname is not null,true)) order by publishtime desc;`

src/jfw/modules/subscribepay/src/util/sellerOrder.go

@@ -104,8 +104,7 @@ func SendStationMessages(href, userId, action, msgType, title, content, link, an
 		ret  MessageRet
 		cont []byte
 	)
-
-	user, _ := MQFW.FindById("user", userId, "base_user_id")
+	user, _ := MQFW.FindById("user", userId, `{"base_user_id":1}`)
 	if user != nil && qutil.IntAll((*user)["base_user_id"]) > 0 {
 		var token string
 		identityList := config.Middleground.UserCenter.IdentityList(qutil.Int64All((*user)["base_user_id"]))
@@ -128,7 +127,6 @@ func SendStationMessages(href, userId, action, msgType, title, content, link, an
 		}
 		if token != "" {
 			androidUrl = fmt.Sprintf("%s&identity=%s", androidUrl, token)
-			iosUrl = fmt.Sprintf("%s&identity=%s", iosUrl, token)
 		}
 	}
 
@@ -136,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=%d&details=您的订单%s处于未支付状态，为了使您获取更多...",
-		href, action, userId, msgType, title, content, link, NowFormat(Date_Short_Layout), androidUrl, iosUrl, weChatUrl, name, OrderCode, 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)