Merge remote-tracking branch 'origin/feature/v4.7.55' into feature/v4.7.55

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -404,8 +404,11 @@ func (this *vipSubscribeStruct) RenewSubVip(userId string, end string, positionT
 			"i_entid":  entId,
 			"i_type":   1,
 		}
-		if !util.MQFW.Update("entniche_rule", query,
-			bson.M{"$set": set}, true, false) {
+		if !util.MQFW.Update("ent_user", query, map[string]interface{}{
+			"$set": map[string]interface{}{
+				"l_vip_endtime": endTime.Unix(),
+			},
+		}, true, false) {
 			log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
 			return false
 		}

src/jfw/modules/subscribepay/src/pay/wxPay.go

@@ -1,14 +1,15 @@
 package pay
 
 import (
-	"jy/src/jfw/modules/subscribepay/src/config"
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
+	"jy/src/jfw/modules/subscribepay/src/config"
 	"log"
 	"net/rpc"
-	util "app.yhyue.com/moapp/jybase/common"
 	"time"
+
+	util "app.yhyue.com/moapp/jybase/common"
 )
 
 const (
@@ -93,8 +94,7 @@ type WeixinStruct struct {
 }
 
 func init() {
-	payConfig := config.WxPayConf["jy/src/jfw/modules/subscribepay/src/pay"].(map[string]interface{})
-
+	payConfig := config.WxPayConf["pay"].(map[string]interface{})
 	WxStruct = &WeixinStruct{
 		Appid:                 util.ObjToString(config.WxPayConf["appid"]),
 		Appid_app:             util.ObjToString(config.WxPayConf["appid_app"]),