Explorar el Código

feat:p719 subscribepay调整

fuwencai hace 4 meses
padre
commit
f132101613

+ 2 - 1
src/jfw/modules/subscribepay/src/entity/equityCode.go

@@ -216,7 +216,7 @@ func (e *EquityCode) UpdateEquityCode(b bool) bool {
 			"orderCode":   e.OrderCode,
 		}
 		//订单异常 或 权益异常
-		if b {
+		if b { //  //
 			updateMap = map[string]interface{}{
 				"userId":      "",
 				"receiveTime": nil,
@@ -1293,6 +1293,7 @@ func (e *EquityCode) InitUserInfo() error {
 	}
 	if users != nil && len(*users) > 0 {
 		e.userInfo = (*users)[0]
+		e.UserId = qu.ObjToString(e.userInfo["_id"])
 		//  补充用户小程序accountId
 		baseUserId := qu.Int64All(e.userInfo["base_user_id"])
 		baseUserRes := util.BaseMysql.SelectBySql(`select person_id from base_service.base_user where id=?`, baseUserId)

+ 3 - 3
src/jfw/modules/subscribepay/src/service/equityCode.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	. "app.yhyue.com/moapp/jybase/api"
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/modules/subscribepay/src/config"
@@ -9,7 +10,6 @@ import (
 	"log"
 	"strings"
 	"time"
-	. "app.yhyue.com/moapp/jybase/api"
 
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/dchest/captcha"
@@ -185,12 +185,12 @@ func (e *EquityCode) Submit() {
 			if foreignCode == "" {
 				result["isxcx"] = 0
 				log.Println(phone, equityCode, "没有找到对应的小程序code,去验证是不是剑鱼产品")
-				// TODO 超级订阅、大会员、数据流量包走其他的
+				//  超级订阅、大会员、数据流量包走其他的
 				status, isMemberProduct := nec.H5Exchange()
 				if status == 1 {
 					result["name"] = giftName
 					if isMemberProduct {
-						// todo  返回配置
+						//   返回配置
 						result["list"] = config.Config.ExchangeInfo.Member
 					} else {
 						result["list"] = config.Config.ExchangeInfo.Other