Commit Graph

91 Commits (434009bd188ba42878d4ca2e1b84a9aecb8030de)

Author SHA1 Message Date
ELF 773068b57c 优化代码
zhanglingsheng a685e7340e 礼包列表过滤超级签
Your Name b54f73e4c2 OA获取信息
Your Name 31e90a9dee OA获取信息
Your Name f9eac7138f OA获取信息
Your Name 90105716d5 OA获取信息修改
Your Name 93bbc57ef2 OA获取信息修改
Your Name 94480951cb OA获取信息修改
tpingzhang 29883f60ac 修改重复插入问题 增加唯一索引 记录重复插入异常
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
zhengchanglong 68c9c492c5 微信支付回跳修改
zhengchanglong 8a7bcb13d3 Merge branch 'dev_zcl' into dev
zhengchanglong ee6e3a8624 修改测试金额
zhengchanglong 2b8cbf0021 Merge branch 'dev_zcl' into dev
zhengchanglong 46e5b1198c 修改金额
zhengchanglong be9586bc5b 支付流程修改
zhengchanglong f0dc10cd60 支付流程修改
tpingzhang 464e9f244b 正常充值不需要验证spend表 是否重复充值
zhengchanglong e30580791e 超级前购买测试金额改为0.01
zhengchanglong 86040c88c6 超级签购买错误信息页面
tpingzhang 9ac3bf3397 测试
tpingzhang b5b43b0875 支付状态
zhengchanglong 5f5be5d57e 超级签充值流程修改
tpingzhang 5be8421011 旧版
zhengchanglong 2ba3b915b9 超级前充值金额修改
zhengchanglong e2fc2e5128 修改超级签充值流程
chenzhi 95fc99816f 价格
chenzhi e4b72a1847 新增blank页
elf@home 4c5473a27f 修改bug
zhengchanglong f338c3d210 超级签充值金额修改
chenzhi 8f5f4ba9bc 礼包领取
zhengchanglong 0a62987665 修改超级签名BUG
ELF 145144ba51 解决冲突
ELF 4a403076b9 解决冲突
tpingzhang 99f4d30af0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 41075f8abc Merge branch 'serveridnull' into dev
tpingzhang f7ca69eba6 支付回调域名
zhengchanglong c3cb46cab0 超级签充值BUG修复
tpingzhang f05e7a3149 支付回调域名
tpingzhang ba644484e7 Merge branch 'serveridnull' into dev
tpingzhang 81f85e672d 支付回调域名
tpingzhang bd10995fad Merge branch 'serveridnull' into dev
tpingzhang 8a5f833335 apple alipay
tpingzhang 6fbc15359b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 63f8e24208 解决冲突
tpingzhang cdb5e1e699 去掉pay_header
tpingzhang a6c99cda3a 1,修改server_id传0 增加game_player_id
2,微信限额》=3000
3,小程序
zhengchanglong ae6a18303a 超级签名充值测试金额改为0.01
zhengchanglong 059900320b 超级签回跳地址是否需要https判断
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql