袁野
|
302736a0c9
|
优化话费业务流程
|
2 years ago |
袁野
|
249e59b74b
|
优化话费定时任务代码
|
2 years ago |
袁野
|
06013e1aae
|
1
|
2 years ago |
袁野
|
ff0c2b148f
|
优化话费定时任务代码
|
2 years ago |
袁野
|
6d737de408
|
优化话费定时任务代码
|
2 years ago |
袁野
|
ac8801bed3
|
优化话费定时任务代码
|
2 years ago |
袁野
|
03f9ca62a0
|
优化话费定时任务代码
|
2 years ago |
袁野
|
d8847b8af9
|
优化话费定时任务代码
|
2 years ago |
袁野
|
1adc37c728
|
优化话费定时任务代码
|
2 years ago |
袁野
|
2d13835ab0
|
优化话费定时任务代码
|
2 years ago |
袁野
|
c7fd02d5f4
|
提交2。0代码
|
2 years ago |
袁野
|
59c01a9e48
|
提交2。0代码
|
2 years ago |
袁野
|
4a540ae44b
|
提交2。0代码
|
2 years ago |
袁野
|
b19460705a
|
提交2。0代码
|
2 years ago |
袁野
|
a0f8008517
|
提交2。0代码
|
2 years ago |
袁野
|
22d8ff4e84
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
袁野
|
a4f1ba2e4b
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
袁野
|
7137fec396
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
袁野
|
1b565faba0
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
袁野
|
4f93b703d6
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
袁野
|
c1ad172bae
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
袁野
|
884daa1f39
|
提交代理商
|
2 years ago |
袁野
|
dc5daa769e
|
修改首页没有积分专区
|
2 years ago |
袁野
|
0e514bfc8f
|
修改首页没有积分专区
|
2 years ago |
袁野
|
3bbc59e4af
|
修改首页没有积分专区
|
2 years ago |
袁野
|
3aca2b3b0d
|
1
|
3 years ago |
袁野
|
7ed5736e25
|
修改话费查询bug
|
3 years ago |
袁野
|
497a7a30af
|
修改区域公司
|
3 years ago |
袁野
|
6363e152c3
|
1
|
3 years ago |
袁野
|
f9744d94e4
|
提交修改
|
3 years ago |
袁野
|
a8c626e445
|
提价修改代码
|
3 years ago |
袁野
|
1b9547e022
|
修改话费定时任务问题
|
3 years ago |
袁野
|
3cd01161b4
|
修改话费定时任务问题
|
3 years ago |
袁野
|
a860b4d79c
|
修改话费定时任务问题
|
3 years ago |
袁野
|
62a73d7088
|
修改请求接口
|
3 years ago |
袁野
|
a80c81224b
|
修改请求接口
|
3 years ago |
袁野
|
a74da6f088
|
修改话费订单导出
|
3 years ago |
袁野
|
98a3c14aec
|
修改短信话术 修改 修改工会卡终端号
|
3 years ago |
袁野
|
e6d01c986b
|
修改短信话术 修改 修改工会卡终端号
|
3 years ago |
袁野
|
3b12e413ad
|
合并话费修改
|
3 years ago |
袁野
|
c2853a33d6
|
合并话费修改
|
3 years ago |
袁野
|
40f188eb20
|
合并代码
|
3 years ago |
袁野
|
37a82dbd9f
|
合并代码
|
3 years ago |
袁野
|
620fd4738c
|
合并代码
|
3 years ago |
袁野
|
2ed7494790
|
合并代码
|
3 years ago |
袁野
|
a1edf5d198
|
合并代码
|
3 years ago |
袁野
|
a46d1da807
|
修改话费接口
|
3 years ago |
袁野
|
6432781136
|
1
|
3 years ago |
袁野
|
8ed1c066ab
|
1
|
3 years ago |
袁野
|
cf66c227f8
|
修改代码
|
3 years ago |