Commit Graph

305 Commits (24d222ee68f07c0f77941b3d7bd0583cfcf37e0d)

Author SHA1 Message Date
jiahuiwen 1b37f3963e rizhi 2021-10-27 17:55:33 +08:00
jiahuiwen 6e7a1e2bc4 日志 2021-10-27 17:52:06 +08:00
jiahuiwen 382218b56e 修改编码 2021-10-27 17:43:22 +08:00
jiahuiwen 73fad773b3 测试 2021-10-27 17:37:11 +08:00
jiahuiwen 041636e563 修改解析 2021-10-27 15:52:42 +08:00
jiahuiwen 14c95c8a48 修改解析 2021-10-27 14:19:27 +08:00
jiahuiwen e129b5d745 添加參數 2021-10-27 14:10:38 +08:00
jiahuiwen 7e58454a6f 删除 2021-10-27 14:06:50 +08:00
jiahuiwen 5272dc8c01 添加日志 2021-10-27 14:02:12 +08:00
jiahuiwen f2e36a79ab 参数解析修改 2021-10-27 13:33:27 +08:00
jiahuiwen f3b75dc163 参数测试 2021-10-27 09:43:56 +08:00
jiahuiwen dde63b41f4 添加参数 2021-10-27 08:09:25 +08:00
jiahuiwen 69701121ab 测试log 2021-10-26 17:54:45 +08:00
jiahuiwen e6ea389c7b 使用就解析参数方法 2021-10-26 17:42:50 +08:00
jiahuiwen 523dd0110b 添加日志 2021-10-26 17:35:31 +08:00
jiahuiwen 33941d7f5a 修改参数获取方式 2021-10-26 17:29:16 +08:00
jiahuiwen aac6bee5fc 增加好游戏(游心)支付回调 2021-10-26 13:42:04 +08:00
xuexinpeng 6ce2c87cc2 quick支付回调又改回去md 2021-08-19 15:12:29 +08:00
duhui 4fa852ff0f quick修改回调地址 2021-08-17 14:52:02 +08:00
lvxinran 94bc3a99e9 透传修改 2021-08-13 20:39:40 +08:00
lvxinran 3377c2f278 发货机兼容 2021-08-13 20:32:23 +08:00
lvxinran 80a665d144 动游发货修改 2021-08-13 14:25:04 +08:00
mengchengzhen df3ba41d46 秘钥大小写问题 2021-07-22 17:08:58 +08:00
mengchengzhen c7332e70c3 动游sdk 2021-07-22 10:09:43 +08:00
mengchengzhen 16072138ab 游心 2021-07-16 14:08:24 +08:00
lvxinran 567b6e46f0 添加字段 2021-07-16 11:53:45 +08:00
lvxinran ffc9c92c6e Merge branch 'master_jieling' of http://60.1.1.230/mashiyu/delivery-server into master_jieling 2021-07-16 10:53:13 +08:00
lvxinran 6e1dce0614 ios修改 2021-07-16 10:53:05 +08:00
mengchengzhen 36a254c1aa 游心 2021-07-15 18:00:31 +08:00
mengchengzhen 13c257c3b7 游心sdk 2021-07-15 14:57:45 +08:00
lvxinran a42c363e0c 强转int 2021-06-30 16:42:06 +08:00
lvxinran 109b866547 修改判断 2021-06-30 16:36:16 +08:00
lvxinran 5e7c817921 元判断 2021-06-30 16:18:23 +08:00
lvxinran df1808921a 装配注解 2021-06-30 16:10:05 +08:00
lvxinran d84eab26e3 自动注入 2021-06-30 16:08:13 +08:00
duhui 1d95a179db 日志2 2021-06-30 15:58:04 +08:00
duhui 7e8dd76454 日志 2021-06-30 15:49:11 +08:00
duhui f48d6f388a 下标越界2 2021-06-30 15:43:11 +08:00
duhui 9539fa1d79 下标越界 2021-06-30 15:41:43 +08:00
duhui 0458131cb7 qiuck渠道支付修改 2021-06-30 15:27:19 +08:00
duhui e2342f2c44 支付接口添加字段 2021-06-30 13:53:37 +08:00
mengchengzhen 2d3677557a mhtquick 2021-06-29 16:32:50 +08:00
mengchengzhen 389c7af250 mhtquick 2021-06-29 16:23:33 +08:00
mengchengzhen 7eb6fdd5d3 元转分 2021-06-29 11:11:42 +08:00
mengchengzhen 1a8d0a1cc1 double转int 2021-06-29 10:54:51 +08:00
mengchengzhen 31018fc7ee long转int 2021-06-29 10:44:06 +08:00
mengchengzhen 468a3cebad long转int 2021-06-29 10:21:00 +08:00
mengchengzhen ab4426b3fa 猕猴桃quick支付 2021-06-28 18:10:07 +08:00
mengchengzhen a45f2e71f5 quick支付 2021-06-28 10:17:27 +08:00
lvxinran ee2dc9aac8 double和int兼容 2021-06-18 16:44:52 +08:00
lvxinran 9146c71e90 密钥修改 2021-06-18 16:13:50 +08:00
duhui 2922e45480 CH和XP支付添加cc值 2021-06-10 17:10:30 +08:00
duhui 74f5291d0a 下标越界兼容 2021-06-10 15:25:44 +08:00
duhui 75f38e7406 猕猴桃支付,添加cc值 2021-06-10 15:16:24 +08:00
xuexinpeng e8fbcbbcef 支付金额校验 2021-06-10 14:49:59 +08:00
xuexinpeng 15e7eb8651 删除log 2021-06-09 16:14:50 +08:00
xuexinpeng 70f05ea533 草花返回值 2021-06-09 15:19:00 +08:00
xuexinpeng bb8d984787 测试log 2021-06-09 15:02:11 +08:00
xuexinpeng 592c59cc92 草花支付 2021-06-09 14:53:03 +08:00
xuexinpeng 6722e70ef6 草花支付 2021-06-09 13:40:24 +08:00
lvxinran d4245a800f 草花支付 2021-06-08 18:23:31 +08:00
lvxinran 44c5fa596a 猕猴桃专服支付修改 2021-06-08 15:55:26 +08:00
lvxinran a1386d9336 xp加密修改 2021-06-02 20:30:19 +08:00
lvxinran fde85470b3 xp加密修改 2021-06-09 05:42:36 +08:00
lvxinran 556dab25d5 xp密钥修改 2021-06-09 05:36:33 +08:00
lvxinran 11bd641263 xp发货 2021-06-09 04:47:37 +08:00
lvxinran b6463a9e25 代码回滚 2021-05-19 09:32:17 +08:00
lvxinran 40ee81df65 发货修改 2021-05-11 14:54:25 +08:00
lvxinran d7d6029e33 订单时间修改 2021-04-02 11:21:11 +08:00
lvxinran 4f4e029088 测试代码提交 2021-04-05 00:41:12 +08:00
lvxinran eb124d4382 充值金额和商品id添加 2021-03-22 15:18:49 +08:00
lvxinran 3f52134a27 字符串切割 2021-03-16 17:03:10 +08:00
lvxinran b507cb7b71 支付秘钥修改 2021-03-16 16:17:19 +08:00
lvxinran b581c27260 修改支付秘钥 2021-03-16 15:48:56 +08:00
lvxinran fd86d6344c 灵动国内先遣服sdk 2021-03-15 18:05:12 +08:00
zhangshanxue f0acd97aa9 ios支付秘钥修改 2020-12-04 22:05:58 +08:00
zhangshanxue 75df42d9f3 发货机单位 2020-11-25 07:53:03 +08:00
zhangshanxue 63d9bee224 订单入库日志打点提交 2020-11-10 16:26:51 +08:00
zhangshanxue e2363f303d 订单发货id修改 2020-09-14 13:07:07 +08:00
zhangshanxue 13a20684de 订单发货id修改 2020-09-14 11:52:57 +08:00
zhangshanxue a60b4ec672 订单查询 2020-09-11 17:56:34 +08:00
zhangshanxue 75a45fd121 订单查询 2020-09-01 15:47:24 +08:00
zhangshanxue 1ac5f0f9bd 灵动网页支付 2020-08-21 22:53:13 +08:00
zhangshanxue fd55e6833c 灵动网页支付 2020-08-21 20:45:45 +08:00
zhangshanxue 2cc43277ea 灵动网页支付发货机 2020-08-21 11:58:43 +08:00
zhangshanxue efac72d27e 海外支付 2020-08-12 14:53:56 +08:00
zhangshanxue 89b80bb716 测试和正式充值 2020-08-18 02:36:39 +08:00
zhangshanxue cb5da3c40b 测试服秘钥修改 2020-08-11 08:47:58 +08:00
zhangshanxue 23d140ee4b 测试服秘钥修改 2020-08-11 08:47:30 +08:00
zhangshanxue d4b226e1e7 测试服支付秘钥修改 2020-08-06 21:33:32 +08:00
zhangshanxue d7152b8764 no message 2020-07-26 23:45:43 +08:00
zhangshanxue 6ea74bd854 灵动sdk接入 2020-07-26 23:42:10 +08:00
zhangshanxue 04779e01c1 灵动sdk接入 2020-07-26 23:28:34 +08:00
zhangshanxue 359bff3de9 灵动sdk接入 2020-07-26 23:06:18 +08:00
zhangshanxue f99a6156dd 灵动sdk接入 2020-07-26 22:59:45 +08:00
zhangshanxue a3eaa2d977 灵动sdk接入 2020-07-26 21:12:21 +08:00
zhangshanxue ab746d58b6 灵动sdk接入 2020-07-26 20:54:42 +08:00
zhangshanxue 51a8fc36ca 灵动sdk接入 2020-07-26 20:37:38 +08:00
zhangshanxue 7ae35afd90 充值 2020-07-19 21:16:27 +08:00
zhangshanxue b17d5ee774 灵动sdk接入 2020-07-28 21:11:08 +08:00
wangyuan 4a5eee2c64 fix response 2019-09-16 10:57:57 +08:00
wangyuan 7ceac5f191 fix 2019-09-12 16:27:00 +08:00
wangyuan a46f5408c0 fix 2019-09-12 16:19:13 +08:00
wangyuan 32525c518b fix recharge 2019-09-12 14:52:04 +08:00
wangyuan e4e02f1f76 recharge 2019-09-05 19:32:33 +08:00
wangyuan c821620971 fix db 2019-09-05 10:34:44 +08:00
wangyuan cbbfa933f2 fix 2019-09-05 10:27:48 +08:00
wangyuan 6f40d90a42 log 2019-09-05 10:23:04 +08:00
wangyuan 14a2a9fc0c recharge change 2019-09-05 10:00:02 +08:00
wangyuan ec3df8af3e fix 2019-09-04 18:05:48 +08:00
wangyuan f88b00c04f fix recharge 2019-09-04 17:12:24 +08:00
wangyuan d2a22d0a3a add parm check 2019-09-04 15:48:03 +08:00
wangyuan 40f3b6067d log 2019-07-03 16:57:04 +08:00
wangyuan 8bcafe79f3 low 2019-07-03 16:18:32 +08:00
wangyuan 92ca12ea3d recharge 2019-07-03 15:55:51 +08:00
wangyuan 38830b0670 jieling-delivery 2019-07-03 11:32:11 +08:00
gaojie 6922a6dfb1 fix 2019-06-27 09:53:51 +08:00
gaojie ac4036d979 rpc 2019-05-21 13:38:29 +08:00
gaojie afaf52cb59 redis 连接哨兵 2019-05-20 10:49:47 +08:00
gaojie 4bf512fbfe 发货机日志 2019-05-16 17:33:46 +08:00
gaojie d0d61c8c88 添加alkData所需要的数据 2019-05-09 13:40:04 +08:00
gaojie eb60e1a336 fix 2019-04-29 10:26:41 +08:00
gaojie 3e4b56a926 去掉平台发货 2019-03-27 10:29:07 +08:00
gaojie 07e1d0fe86 区分第三方充值还是非第三方充值 2019-03-26 14:45:41 +08:00
gaojie 4811b4b200 log 2019-03-15 17:50:40 +08:00
gaojie 5917401893 充值发货 2019-03-02 18:29:08 +08:00
gaojie 599b18f201 fix 2019-03-01 10:36:19 +08:00
gaojie 839abf13b5 充值发货区分android还是ios 2019-03-01 10:27:43 +08:00
gaojie 6e3552c86e 初始化保存发货机的内网ip 2019-02-27 12:26:07 +08:00
gaojie b30cfabad6 增加发邮件唯一表示判断 2019-02-27 10:45:35 +08:00
gaojie 630968b0de fix 2019-02-26 11:52:26 +08:00
gaojie 496da0a54d fix 2019-02-26 09:54:58 +08:00
gaojie 5c26dc3c10 FIX 2019-02-22 17:51:13 +08:00
gaojie 217e8f8e9b 保存发货机服务器的地址 2019-02-22 16:18:46 +08:00
gaojie 423eec7744 海外充值发货 2019-02-21 18:02:50 +08:00
gaojie bd378026ea 用户查询,充值发货,发送奖励 2019-02-20 15:39:07 +08:00
mashiyu 286b12942d 海外发货机 2019-02-19 11:08:18 +08:00
mashiyu 501a37d37b 兼容老环境提交 2018-07-10 02:40:32 +08:00
mashiyu 83937647a4 容错 2018-06-27 22:25:42 +08:00
mashiyu 9c3afdfe6a 订单号 2018-06-27 22:21:57 +08:00
mashiyu a76b9aa248 更新发货机 2018-06-27 20:51:54 +08:00
mashiyu 067aea691f 发货机优化 2018-06-26 11:30:38 +08:00
mashiyu 528a33aa9a iap支付发货 2018-06-08 11:21:13 +08:00
mashiyu 1556ae6316 增加ios支付处理 2018-05-18 16:31:49 +08:00
mashiyu fbd7f01062 test 2018-03-08 12:31:32 +08:00
mashiyu 290547394e 优化 2018-02-28 16:04:04 +08:00
mashiyu c5c64b3edb 漏提 2018-02-11 11:51:07 +08:00
mashiyu 845c68a760 误删 2018-02-11 11:47:19 +08:00
mashiyu c4e24a5862 删除 2018-02-11 11:36:56 +08:00
gaojie 118dc206d9 获取rpc 地址 2018-02-11 11:34:27 +08:00
gaojie c25811fd7c 去除mongo加载 2018-02-09 10:12:07 +08:00
gaojie 6f3cbbdd1c 测试发货 2017-12-11 09:44:16 +08:00
mashiyu 3fd282d2dd 发货机 2017-12-02 18:37:50 +08:00
mashiyu 9483f79048 发货rpc 2017-12-02 14:18:36 +08:00
mashiyu f3a5d08997 发货机 2017-10-17 20:32:10 +08:00