Commit Graph

8198 Commits

Author SHA1 Message Date
Damonny f3a6b6cbc4 update:强制提交使订单可以进入发货流程 2025-03-07 15:10:55 +08:00
Damonny d4947dce0b update:修改订单失败成功通知顺序 2025-03-07 14:36:14 +08:00
Damonny 37dcf068f3 Merge remote-tracking branch 'origin/develop' into develop 2025-03-07 11:19:31 +08:00
Damonny f7abead0e5 update:修改订单失败原因内容添加 2025-03-07 11:18:57 +08:00
Owen 2e24e0c508 Fix:联通电信 2025-03-07 10:39:02 +08:00
Owen e8e97e4f6d Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-03-07 09:29:16 +08:00
Owen 64530b9418 Fix:联通电信 2025-03-07 09:28:38 +08:00
Damonny 362f1708cc update:修改订单提交顺序 2025-03-07 09:17:15 +08:00
Damonny 193cc8e9bf update:修改订单提交顺序 2025-03-07 09:13:57 +08:00
Owen e8c263982b Merge remote-tracking branch 'origin/develop' into develop 2025-03-06 21:49:39 +08:00
Owen 292a5c1367 Fix:联通电信 2025-03-06 21:49:29 +08:00
Damonny 97adce6acf update:新增订单审核日志 2025-03-06 18:53:45 +08:00
Owen 705424ea29 Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-03-06 18:06:42 +08:00
Owen bda92676f1 Fix:联通电信 2025-03-06 18:03:53 +08:00
Damonny 0d4b13c396 Merge remote-tracking branch 'origin/develop' into develop 2025-03-06 14:13:28 +08:00
Damonny cbaa55ce66 update:调整消息队列内容 2025-03-06 14:13:17 +08:00
Owen 866211675f Fix:湖南电信 2025-03-06 12:24:41 +08:00
Owen 1090608853 Fix:湖南电信 2025-03-06 12:21:40 +08:00
Owen 7d24de49d8 Fix:湖南电信 2025-03-06 12:19:58 +08:00
Owen e4394a6b6e Fix:湖南电信 2025-03-06 12:10:47 +08:00
Owen 70f20834d5 Fix:湖南电信 2025-03-06 11:22:11 +08:00
Owen 1a8b730e71 Fix:湖南电信 2025-03-05 15:56:33 +08:00
Owen b6360e5c5e Fix:湖南电信 2025-03-05 10:44:56 +08:00
Owen 45262aea17 Fix:湖南电信 2025-03-04 17:07:08 +08:00
Owen be16384de2 Fix:湖南电信 2025-03-04 15:48:27 +08:00
Owen e02a8108f7 Fix:获得黑名单 2025-03-04 11:47:09 +08:00
Owen 70bbe04064 Fix:联通地址,日志异步 2025-03-04 10:55:53 +08:00
Owen 93124340e5 Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-03-04 10:15:57 +08:00
Owen 5fcb9231ae PageResult<SuperiorApiLogDO> selectPage(SuperiorApiLogPageReqVO reqVO) 2025-03-04 10:15:47 +08:00
Damonny a87b5d1a10 update:调整消息队列内容 2025-03-03 22:32:46 +08:00
Owen 9f0094ec73 PageResult<SuperiorApiLogDO> selectPage(SuperiorApiLogPageReqVO reqVO) 2025-03-03 20:17:16 +08:00
Damonny 7b62d6f7a8 update:调整日志入库bug 2025-03-03 18:36:13 +08:00
Damonny 01e68a051d update:调整异步策略,bug 2025-03-03 18:19:02 +08:00
Damonny 9a8decd608 update:调整异步策略 2025-03-03 18:10:39 +08:00
Damonny c0b98c69c4 update:审核订单加上事务 2025-03-03 17:54:47 +08:00
Owen e4932e1f3c Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-03-03 17:46:41 +08:00
Owen 20af8e34fa PageResult<SuperiorApiLogDO> selectPage(SuperiorApiLogPageReqVO reqVO) 2025-03-03 17:46:34 +08:00
Damonny ed65ed80c9 update:增加订单审核日志打印 2025-03-03 17:31:45 +08:00
Damonny cb990f37c6 update:修改订单地区编码问题 2025-03-03 17:24:00 +08:00
Damonny a47cc8f1d4 Merge remote-tracking branch 'origin/develop' into develop 2025-03-03 17:10:26 +08:00
Damonny b582519281 update:修改自动进生产的问题,订单执行顺序调整 2025-03-03 17:10:12 +08:00
Owen 3adeeba2bf Merge remote-tracking branch 'origin/develop' into develop 2025-03-03 17:09:09 +08:00
Owen 6855c0d848 getAndDealSuperiorMsg 2025-03-03 17:09:00 +08:00
Damonny 2e075a07de update:修改自动进生产的问题,订单状态 2025-03-03 16:54:21 +08:00
Owen 7c6a016ff7 Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-03-03 15:51:15 +08:00
Owen 365798d145 ordersDO.setPlanMobileProduced(ordersDO.getPlanMobile()); 2025-03-03 15:51:08 +08:00
Damonny 46d23820cf update:修改自动进生产的问题 2025-03-03 15:38:19 +08:00
Damonny 83b6913648 update:bug修改 2025-03-02 02:53:02 +08:00
Owen 8a67786220 Fix:BeanUtils.copyProperties(ordersDO,ordersSaveReqVO); 2025-02-28 16:15:42 +08:00
Owen 47ac8a2ea9 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
2025-02-28 16:08:21 +08:00