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 |
|
Damonny
|
bfe46ddbec
|
update:订单处理逻辑调整
|
2025-02-23 14:15:32 +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 |
|
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
|
3fa0c5ab11
|
prod config
|
2025-02-19 14:38:18 +08:00 |
|
Damonny
|
2e351ce1ff
|
create: 新增抖店订单推送，抓取
|
2025-02-19 14:02:31 +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
|
91a6ad43aa
|
ordersMapper.updateById(updateObj);
|
2025-01-13 09:47:10 +08:00 |
|
Owen
|
f765fd9579
|
ordersMapper.updateById(updateObj);
|
2025-01-12 21:59:04 +08:00 |
|
Owen
|
2a877955a0
|
testing Id
|
2025-01-12 20:33:56 +08:00 |
|
Owen
|
3d5a6aae7b
|
在不发货的地区编码中
|
2025-01-12 16:35:27 +08:00 |
|
Damonny
|
43d1fc9fa8
|
订单生产流程优化
|
2025-01-12 01:58:10 +08:00 |
|
Owen
|
ce6cae1edb
|
在不发货的地区编码中
|
2025-01-12 00:35:13 +08:00 |
|
Owen
|
093285163e
|
在不发货的地区编码中
|
2025-01-12 00:16:18 +08:00 |
|
Owen
|
9bc5046739
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2025-01-11 23:55:11 +08:00 |
|
Damonny
|
a231bc0059
|
订单审核流程优化
|
2025-01-11 23:54:56 +08:00 |
|
Owen
|
a87c65542e
|
在不发货的地区编码中
|
2025-01-11 23:54:55 +08:00 |
|
Owen
|
b42bb50737
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2025-01-11 23:51:19 +08:00 |
|
Owen
|
c7119e4518
|
在不发货的地区编码中
|
2025-01-11 23:51:12 +08:00 |
|
Damonny
|
4c4038a647
|
订单审核流程优化
|
2025-01-11 23:27:58 +08:00 |
|
Damonny
|
421f3453b7
|
订单初始化处理
|
2025-01-11 21:59:12 +08:00 |
|
Owen
|
1e99ffc20a
|
在不发货的地区编码中
|
2025-01-11 21:53:38 +08:00 |
|
Owen
|
012c6953e3
|
在不发货的地区编码中
|
2025-01-11 21:48:17 +08:00 |
|
Owen
|
6fa2fad27f
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2025-01-11 21:45:04 +08:00 |
|
Owen
|
b37a5da8ab
|
在不发货的地区编码中
|
2025-01-11 21:44:53 +08:00 |
|
Damonny
|
5b7bf9e155
|
订单审核信息处理
|
2025-01-11 21:40:54 +08:00 |
|
Damonny
|
dd0d0c61da
|
订单信息处理
|
2025-01-11 21:28:10 +08:00 |
|
Damonny
|
7eac0a3518
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-11 21:13:17 +08:00 |
|
Damonny
|
9e2582e7af
|
订单信息处理
|
2025-01-11 21:13:08 +08:00 |
|
Owen
|
ce51488359
|
是否自动生产
|
2025-01-11 20:52:22 +08:00 |
|
Owen
|
76b19ef413
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2025-01-11 20:14:00 +08:00 |
|
Owen
|
f294f1b965
|
是否自动生产
|
2025-01-11 20:13:53 +08:00 |
|
Damonny
|
d5e3675143
|
create:订单操作日志新增雪花id
|
2025-01-11 20:04:19 +08:00 |
|
Damonny
|
d95e7f3627
|
create:新增订单操作日志
|
2025-01-11 18:54:07 +08:00 |
|
Owen
|
f282828075
|
是否自动生产
|
2025-01-11 18:39:19 +08:00 |
|
Owen
|
44d3eb78f0
|
是否自动生产
|
2025-01-11 18:36:36 +08:00 |
|
Owen
|
ce0f11691e
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2025-01-11 18:09:00 +08:00 |
|
Owen
|
d39bcada52
|
是否自动生产
|
2025-01-11 18:08:52 +08:00 |
|
Damonny
|
a224639cb2
|
create:提交订单上游状态sql
|
2025-01-11 17:08:48 +08:00 |
|
Damonny
|
6799b16ac3
|
upcreate:提交订单接口
|
2025-01-10 21:33:03 +08:00 |
|
Owen
|
bfa2212148
|
sms
|
2025-01-10 18:10:16 +08:00 |
|
Owen
|
f711ad2468
|
sms
|
2025-01-10 14:20:19 +08:00 |
|
Owen
|
3e61923c7b
|
sms
|
2025-01-09 23:33:51 +08:00 |
|
Owen
|
7f683548ff
|
sms
|
2025-01-09 22:27:02 +08:00 |
|
Owen
|
66658793de
|
sms
|
2025-01-09 22:22:25 +08:00 |
|
Owen
|
b7070ea28c
|
广东
|
2025-01-08 18:30:55 +08:00 |
|
Owen
|
17e37de2b3
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2025-01-08 17:31:35 +08:00 |
|
Owen
|
e9b7e75810
|
广东
|
2025-01-08 17:31:24 +08:00 |
|
Owen
|
c5fafdaeac
|
广东
|
2025-01-08 17:18:41 +08:00 |
|
Damonny
|
1a86bf07fd
|
update: 订单DOupdate
|
2025-01-08 03:23:51 +08:00 |
|
Owen
|
37000b0aa5
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2025-01-07 23:10:51 +08:00 |
|
Owen
|
3fdec6ca30
|
广东
|
2025-01-07 23:10:42 +08:00 |
|
Damonny
|
2760261b16
|
update: 订单DOupdate
|
2025-01-07 22:32:07 +08:00 |
|
Damonny
|
29ea20370b
|
update: 订单DOupdate
|
2025-01-07 22:31:05 +08:00 |
|
Damonny
|
0e65ee028d
|
update: 订单sqlupdate
|
2025-01-07 22:22:52 +08:00 |
|
Owen
|
89c205b5c8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-07 22:10:27 +08:00 |
|
Owen
|
0c285e742b
|
广东
|
2025-01-07 22:10:17 +08:00 |
|
Damonny
|
e302e38e51
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-06 23:47:56 +08:00 |
|
Damonny
|
24492b6f92
|
update: 订单sqlupdate
|
2025-01-06 23:47:46 +08:00 |
|
Owen
|
6268aa1d86
|
黑名单
|
2025-01-06 23:47:13 +08:00 |
|
Owen
|
05d3849c58
|
staging
|
2025-01-05 22:14:56 +08:00 |
|
Owen
|
7beaad5d14
|
staging
|
2025-01-05 19:15:19 +08:00 |
|
Owen
|
8221ea32a5
|
staging
|
2025-01-05 14:22:10 +08:00 |
|
Owen
|
2d611051f0
|
staging
|
2025-01-04 23:10:29 +08:00 |
|
Owen
|
c351099c0b
|
staging
|
2025-01-04 20:49:06 +08:00 |
|
Owen
|
b0e7e3efc9
|
staging
|
2025-01-04 02:38:53 +08:00 |
|
Damonny
|
30959c0470
|
update: 订单生产维护
|
2025-01-03 05:31:08 +08:00 |
|
Owen
|
8fd8f09d1e
|
广州电信
|
2025-01-02 20:04:27 +08:00 |
|
Owen
|
a55e0ba820
|
广州电信
|
2025-01-01 20:56:26 +08:00 |
|
Owen
|
a0eb3d87be
|
广州电信
|
2025-01-01 20:02:30 +08:00 |
|
Owen
|
86b3442354
|
广州电信
|
2025-01-01 17:01:00 +08:00 |
|
Owen
|
778f7d2111
|
Feat: Api fix log
|
2024-12-31 21:14:01 +08:00 |
|
Owen
|
ef2c585013
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2024-12-31 12:35:31 +08:00 |
|
Owen
|
708053adf8
|
Feat: Api fix log
|
2024-12-31 12:35:19 +08:00 |
|
Damonny
|
3f8340b4b8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-12-31 12:34:56 +08:00 |
|
Damonny
|
6cc98f5f60
|
update: 订单审核维护
|
2024-12-31 12:34:45 +08:00 |
|
Owen
|
7701cd7c6f
|
Feat: Api fix log
|
2024-12-31 11:20:18 +08:00 |