164 Commits (master)

Author SHA1 Message Date
yqyg16603827325@126.com cac0de9eb3 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
yqyg16603827325@126.com 20c5ca3057 prod环境bug修改 3 years ago
bynt 274caabf25 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
bynt a28ada1f86 同步订单过期时间删除 3 years ago
wujingtao 2e07f668ee 主账号查询的条件key修改 3 years ago
wujingtao 2e3ea1684a 支付信息的配置文件 3 years ago
wujingtao 9e1372dce3 查询同步支付信息逻辑 3 years ago
yqyg16603827325@126.com 88d7498563 新增支付订单接口 3 years ago
bynt e546c984cc 同步过程修改 适配前端查询 3 years ago
wujingtao 5952d37087 修改查询子账号的sql语句 3 years ago
wujingtao 860ce97936 账号同步历史数据支付逻辑 3 years ago
yqyg16603827325@126.com 4c57a2dd0e 支付新需求增加 3 years ago
bynt 687944981d 消息接收通知 增加订单条数统计 3 years ago
bynt 2c82689893 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
bynt b4aa01bf32 账号设置修改为主账号 3 years ago
wujingtao 48e4209b03 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
wujingtao 08b355236d 修复授权bug 3 years ago
bynt 8f8d3413fd 账号修改状态 3 years ago
yqyg16603827325@126.com 06e54fae69 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
yqyg16603827325@126.com 75d200d320 定时读取数据适应分表逻辑代码 3 years ago
wujingtao b7c9cd8241 配置文件版本问题 3 years ago
wujingtao 219609c500 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
wujingtao ec4cbae947 取消好评和差点的群发 3 years ago
bynt 91a1f8f23e 修改配置文件 解决查询优化问题 3 years ago
wujingtao 613f0c062d 定时任务配置分表 3 years ago
wujingtao cbc25e8668 支付回调逻辑 3 years ago
bynt d4cbe6a4fe Merge remote-tracking branch 'origin/dev' into dev 3 years ago
bynt d05bb30fba 修改登录逻辑 3 years ago
yqyg16603827325@126.com 9d8acf5134 支付回调回滚逻辑代码修改 3 years ago
bynt f3d415b02b Merge remote-tracking branch 'origin/dev' into dev 3 years ago
bynt ba783ff819 修改发送数据逻辑 3 years ago
yqyg16603827325@126.com 23fc20b82d 支付回调回滚逻辑代码提交 3 years ago
wujingtao f702addce0 定时检测账号授权时间和手动回滚逻辑 3 years ago
wujingtao b0b305e750 修改授权逻辑 3 years ago
wujingtao 64ab68f69c 调整授权逻辑参数 3 years ago
wujingtao 5a8672bb60 调整授权逻辑参数 3 years ago
wujingtao 2d82f49f63 打印日志记录 3 years ago
bynt e785f68061 修改查询 3 years ago
wujingtao dc7601add8 代码合并 3 years ago
bynt 897d33f582 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java
3 years ago
bynt 944037faae 时间格式问题 3 years ago
yqyg16603827325@126.com b6e2971c3b 支付数据同步逻辑代码提交 3 years ago
wujingtao 9cf816a2f8 修改授权 3 years ago
bynt 9bc063ec5d Merge remote-tracking branch 'origin/dev' into dev 3 years ago
bynt eae7b46c86 修改分表分库逻辑 解决消息通知服务 3 years ago
yqyg16603827325@126.com f364e100a1 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
yqyg16603827325@126.com f341b0ea32 定时任务数据备份逻辑代码提交 3 years ago
wujingtao e05c882dde 账号 和支付 逻辑代码修改 3 years ago
wujingtao 4589137cff 账号 和支付 逻辑代码 3 years ago
yqyg16603827325@126.com e59900f466 支付逻辑代码提交 3 years ago
bynt da5823d92b 解决登录问题 3 years ago
bynt 5002eb4004 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/AuthorizationController.java
3 years ago
bynt 82921799cf 解决登录问题 3 years ago
wujingtao aa58da1714 修改账号请求逻辑 3 years ago
bynt dba2daeffb 修改解析数据内容 3 years ago
wujingtao 8e7d294945 修改请求方式 将feign转为http请求 3 years ago
bynt 64f4140ad5 修改实体内容 3 years ago
wujingtao 45c6cae60c 提交账号管理接口 3 years ago
bynt 0b72453a5e 再次修改整体项目结构 简化配置 3 years ago
bynt 5f7ba1d39b Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ConfirmReceiptJob.java
#	service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/EvaluateRemindJob.java
#	service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PaymentRemindJob.java
#	service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PositiveThankJob.java
#	service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/DelayRemindServiceImpl.java
#	service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java
#	service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/application-dev.yml
#	trade-pojo/src/main/java/com/hchbox/enums/TradeEnum.java
3 years ago
bynt fcb3e403ab 修改项目数据结构 增加后台登录接口 增加订单状态 3 years ago
wujingtao ee938cad40 定时任务逻辑代码调整 3 years ago
wujingtao 6d7f8119f6 调整订单表的实体和配置文件 3 years ago
bynt 094a7b1a22 修改部分前后端交互逻辑 修改数据库连接版本 修改同步逻辑 3 years ago
wujingtao ab8d47818b 调整配置文件 3 years ago
wujingtao 8d7a37e605 调整ww推送定时任务 保存记录的逻辑 3 years ago
bynt 476c63a6a0 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
bynt 3022a560be 修改实体内容 3 years ago
wujingtao 32ad0f7fa6 查询子账号信息 3 years ago
bynt 0c24b59edc 修改配置参数 3 years ago
bynt 2e29d04943 修改部分查询条件 增加配置参数 3 years ago
bynt a0dc34ab46 修改gateway部分参数 增加部分查询逻辑 3 years ago
wujingtao 0552c0b545 定时任务发送 3 years ago
bynt a61a901e23 修改配置文件参数 3 years ago
bynt e782295f3a 修改参数 3 years ago
bynt 0f2d0a4673 修改部分参数传递 增加定时任务修改 3 years ago
ninftao ca21ccba7f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	service/trade-service-others/trade-service-others-account/src/main/resources/application.yml
3 years ago
ninftao ac8ad6507a 增加登录相关查询付费内容 3 years ago
wujingtao d38e750299 账户充值和兑换的代码调整 3 years ago
土豆兄弟 568d5e3843 fix: review code
对账户相关逻辑进行修改意见
3 years ago
wujingtao 4342af8ae8 账户的充值和兑换 3 years ago
ninftao 91645930d6 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
ninftao 320b4eea4b 增加用户解析实体,Hystrix相关配置 3 years ago
bynt 236088f593 修改发送实体 3 years ago
bynt 5d0749ab67 增加订单加解密功能 3 years ago
bynt e99c7e00d9 修改部分代码细节 3 years ago
ninftao bc35d26180 修改部分消息代码 3 years ago
土豆兄弟 df61320093 docs: 添加文件
添加了相关的文件来对应用的功能点进行了综述与说明
3 years ago
bynt 14255d650e 修改全局变量 增加全局异常变量 3 years ago
土豆兄弟 c82c902cfc build: 调整+补充注释
对之前的代码结构进行了一些小调整,并添加了相关的注释
3 years ago
ninftao e978f63cc0 新增黑名单策略 修改设置枚举类型 3 years ago
bynt a3c9265c31 修改AppSetting 新增黑名单策略 3 years ago
bynt 3cfca885d8 修改部分实体对应 服务正常运行 3 years ago
bynt 34368958d4 修改下单成功交易信息 3 years ago
ninftao 5df82cc1e5 修改部分代码逻辑 后续需更改 3 years ago
bynt c8adc5929a 修改 接收消息参数 增加基础商品 3 years ago
bynt 3733c7f095 修改登录方式 3 years ago
bynt 703747c2eb 修改task 增加加解密方式 3 years ago
ninftao 1d76d2ee85 增加banner图 修改登录账号dto 3 years ago
bynt c0e303dbf0 增加 websocket相关代码 3 years ago