Commit Graph

8210 Commits

Author SHA1 Message Date
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
Owen 9c219f6989 Fix:BeanUtils.copyProperties(ordersDO,ordersSaveReqVO); 2025-02-28 16:07:56 +08:00
Damonny af16f5e13c update:订单解密逻辑调整 2025-02-25 17:55:50 +08:00
Owen 058bf99296 Fix:BeanUtils.copyProperties(ordersDO,ordersSaveReqVO); 2025-02-25 17:38:42 +08:00
Owen 73194f5f42 日志TenantContextHolder.setTenantId(162L) 2025-02-25 09:49:42 +08:00
Owen 33aec4def3 TENANT_ID 2025-02-24 17:34:03 +08:00
Owen f5006baf55 Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-02-23 14:16:07 +08:00
Damonny bfe46ddbec update:订单处理逻辑调整 2025-02-23 14:15:32 +08:00
Owen 6b194e8c3f Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-02-23 14:11:56 +08:00
Owen b8161c5a69 日志 2025-02-23 14:11:49 +08:00
Damonny 598b5b084f update:订单处理逻辑调整 2025-02-23 13:40:14 +08:00
Damonny f5f6e45f43 update:订单处理逻辑调整 2025-02-23 01:23:21 +08:00
Damonny 324df6b903 update:号码匹配修改 2025-02-23 00:46:18 +08:00
Owen 4295baf3bc insertOrdersToDatabase sql fix getOnSale 2025-02-22 12:19:50 +08:00
Owen 3e6c3adcca Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
# Conflicts:
#	yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
2025-02-22 12:18:53 +08:00
Owen eb1c8ca0a9 insertOrdersToDatabase sql fix getOnSale 2025-02-22 12:18:04 +08:00
Damonny a624d0d05e update:查询sql修改 2025-02-22 12:16:21 +08:00
Owen 446abe8a69 Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-02-22 11:57:48 +08:00
Owen 8c604aa626 insertOrdersToDatabase sql fix getOnSale 2025-02-22 11:57:41 +08:00
Damonny 0446aa6d70 update:风控订单进入抓单流程 2025-02-22 11:06:25 +08:00
Damonny 0b0f69a454 update:订单执行修改 2025-02-21 22:23:21 +08:00
Damonny c8559a5451 update:订单执行日志打印 2025-02-21 14:30:38 +08:00
Owen 6ef2974124 prod sql 2025-02-20 16:50:48 +08:00
Owen 57d2e23ce3 prod sql 2025-02-20 16:43:13 +08:00
Owen 31b3f38806 prod config back 2025-02-20 16:38:02 +08:00
Owen 518670714f Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-02-20 16:10:41 +08:00
Owen 106681e8b6 prod config 2025-02-20 16:10:24 +08:00
Damonny d7896bec03 update:生产环境中间件地址修改 2025-02-20 15:46:34 +08:00
Owen 792230adee prod config 2025-02-20 15:40:42 +08:00
Owen 3fa0c5ab11 prod config 2025-02-19 14:38:18 +08:00
Owen 32953ea5c5 Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-02-19 14:36:29 +08:00
Owen ff5ad662d2 prod config 2025-02-19 14:36:11 +08:00
Damonny 2e351ce1ff create: 新增抖店订单推送,抓取 2025-02-19 14:02:31 +08:00
Owen 4ef5a9d8b9 prod config 2025-02-17 21:38:01 +08:00
Owen 6e1da5f795 ordersMapper.updateById(updateObj); 2025-02-11 21:36:35 +08:00
Owen 0c4fc76368 ordersMapper.updateById(updateObj); 2025-02-10 11:13:55 +08:00
Damonny 7d8271ba59 create: 新增抖店、电话外呼依赖 2025-02-06 16:37:50 +08:00
Owen 203bb87b66 ordersMapper.updateById(updateObj); 2025-02-06 14:42:41 +08:00
Owen 61f0848fad Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop 2025-02-06 14:42:22 +08:00