Merge branch 'fix/release' into dev

# Conflicts:
#	cmd/build.sh
#	modules/pay/eanipay/base.go

call/pay.go

@@ -405,6 +405,7 @@ func ReturnBackWithdraw(or *common.WithdrawOrder, originStatus, status uint8, pa
 	}
 	if status == common.StatusROrderFail {
 		status = common.StatusROrderCreate
+		u["status"] = status
 		u["callback_time"] = 0
 	}
 	if len(payChannel) > 0 {

modules/pay/eanipay/base.go

@@ -102,7 +102,7 @@ func (s *Sub) PackPayReq() interface{} {
 		MerchantTradeNo: r.OrderID,
 		Amount:          fmt.Sprintf("%d", r.Amount),
 		Currency:        "INR",
-		Description:     "TeenPatti",
+		Description:     "BW",
 		Payer:           Payer{UserID: fmt.Sprintf("%d", r.UID), Name: r.Name, Email: r.Email, Phone: r.Phone},
 		PayMethod: struct {
 			Type string `json:"type"` // UPI
@@ -123,7 +123,7 @@ func (s *Sub) PackWithdrawReq() interface{} {
 		MerchantTradeNo: r.OrderID,
 		Amount:          fmt.Sprintf("%d", r.Amount),
 		Currency:        "INR",
-		Description:     "TeenPatti",
+		Description:     "BW",
 		NotifyUrl:       values.GetWithdrawCallback(values.EaniPay),
 	}
 	if r.PayType == common.WithdrawTypeBank {

modules/pay/values/values.go

@@ -238,20 +238,20 @@ func PayCallback(w PayWay) {
 
 // 获取支付回调路径
 func GetPayCallback(way PayWay) string {
-	return config.GetConfig().Pay.CallbackURL + config.GetConfig().Pay.Addr + "/callback/pay/" + fmt.Sprintf("%d", way)
+	return config.GetConfig().Pay.CallbackURL + "/callback/pay/" + fmt.Sprintf("%d", way)
 }
 
 // 获取退出回调路径
 func GetWithdrawCallback(way PayWay) string {
-	return config.GetConfig().Pay.CallbackURL + config.GetConfig().Pay.Addr + "/callback/withdraw/" + fmt.Sprintf("%d", way)
+	return config.GetConfig().Pay.CallbackURL + "/callback/withdraw/" + fmt.Sprintf("%d", way)
 }
 
 func GetFrontCallback() string {
-	return config.GetConfig().Pay.CallbackURL + config.GetConfig().Pay.Addr + "/common/front/payCallback"
+	return config.GetConfig().Pay.CallbackURL + "/common/front/payCallback"
 }
 
 func GetFrontCallbackFail() string {
-	return config.GetConfig().Pay.CallbackURL + config.GetConfig().Pay.Addr + "/common/front/payCallback/fail"
+	return config.GetConfig().Pay.CallbackURL + "/common/front/payCallback/fail"
 }
 
 // 根据body里的字段直接拼接出签名字符串

modules/web/handler/share.go

@@ -106,7 +106,12 @@ func ShareInfo(c *gin.Context) {
 	resp.RechargeCount = call.GetUserShareRecharges(a.UID, 1)
 	resp.TotalRecharge = call.GetUserShareRechargeAmount(a.UID, 1)
 	if channel != nil {
-		resp.ShareLink = channel.URL + "?code=" + shareInfo.Share + "&ch=" + fmt.Sprintf("%d", channel.ChannelID)
+		num := 10000
+		channelId := channel.ChannelID
+		if channel.ChannelID < num {
+			channelId += num
+		}
+		resp.ShareLink = channel.URL + "?code=" + shareInfo.Share + "&ch=" + fmt.Sprintf("%d", channelId)
 		if a.Prefix != "" {
 			resp.ShareLink = a.Prefix + "." + resp.ShareLink
 		} else {

modules/web/handler/sys.go

@@ -131,6 +131,7 @@ func Config(c *gin.Context) {
 	resp := &values.ConfigResp{}
 	a.Data = resp
 	channel := call.GetChannelByID(a.Channel)
+	log.Debug("Config channel:%v,channel:%+v", a.Channel, channel)
 	if channel == nil {
 		return
 	}
@@ -139,4 +140,5 @@ func Config(c *gin.Context) {
 	resp.FBPixelID = channel.FBPixelID
 	// resp.FBAccessToken = channel.FBAccessToken
 	resp.Channel = channel.ChannelID
+
 }