sync: port tangguo_server upstream changes

Ported 7 commits (3a79d6a..3dcf693) from tangguo_server:
- 版本控制: comment out 2FA in admin.go
- 支付和广告调试: pay/ad refactor across appg/adser/rechargeser/pingctrl
- 对接统计: add bili_sync statistics endpoint
- 代码优化: ginUtil improvements
- 修改es/修改appID/代码调整: cumulative updates

Preserved hgmj-local differences:
- ES table prefix stays 91jd_ (not tangguo_)
- BillPlatformID stays 91短剧 (not 糖果短剧)
- admin googauth label stays @91短剧
- appg.go retains LouFengH5/DataBuriedPoint fields
- rechargeser.go retains reportser event reporting

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-10-08 17:18:41 +08:00
co-authored by Claude Opus 4.7
parent 625e89c15d
commit 97f679d130
18 changed files with 750 additions and 218 deletions
+20 -13
View File
@@ -99,17 +99,19 @@ func Recharge(ctx context.Context, in *RechargeRequest, ua ua.UA, deduct *Activi
// 下单
now := time.Now()
res, err := (&rchgutil.Recharge{
TradeNo: order.ID.Hex(),
Money: rchgutil.FenToYuan(order.Money),
Type: order.RechargeType,
Info: rchgutil.PayInfo{
PlayerId: strconv.FormatUint(order.UID, 10),
PlayerIp: order.UserIP,
DeviceId: order.DevID,
Tel: order.Tel,
DeviceType: order.DevType,
},
res, err := (&rchgutil.Rchg{
TransNo: order.ID.Hex(),
UID: strconv.FormatUint(order.UID, 10),
DevID: order.DevID,
UserIP: order.UserIP,
Name: u.Name,
Tel: order.Tel,
DevType: order.DevType,
Money: order.Money,
Channel: "self",
CreatedAt: now,
PayMethod: order.RechargeType,
ProductType: 0,
}).ToPayNew(ctx)
if err != nil {
log.ErrorX(ctx, fmt.Sprintf("用户ID[%d] 支付方式[%s] 购买类型[%d] 产品ID[%v] 产品子ID[%v] 下单请求异常[%v]",
@@ -129,8 +131,8 @@ func Recharge(ctx context.Context, in *RechargeRequest, ua ua.UA, deduct *Activi
ProgressAt: &now,
OID: &res.OID,
Mode: &res.Mode,
//Channel: &res.CID,
Rate: &res.Rebate,
Channel: &res.CID,
Rate: &res.Rate,
}
if err = rchgordmod.Update(nil, order.ID, set); err != nil {
log.ErrorX(ctx, fmt.Sprintf("用户ID[%d] 支付方式[%s] 购买类型[%d] 产品ID[%v] 产品子ID[%v] 更新订单异常[%v]",
@@ -541,6 +543,11 @@ func RechargeCallBack(ctx context.Context, oid string, payMoney int64, tradeNo s
if r.ProductType == 1 {
return errors.New("瓦力游戏已下架")
}
// 回调订单号需与下单时支付平台返回的订单号一致
if r.OID != "" && oid != r.OID {
log.ErrorX(ctx, "充值回调支付平台订单号不一致", log.Any("oid", oid), log.Any("orderOid", r.OID), log.Any("tradeNo", tradeNo))
return errors.New("oid 错误")
}
// 新版充值---根据购买类型处理
var (
fn func(*db.MongoTool) error