Commit Graph

297 Commits (b3612fdfb61a6d47ff497d7fdac036a9f89452cc)

Author SHA1 Message Date
cxxxxxxx详 795437c02a Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 3e069e26e3 更新token自动任务 1 year ago
wangchaoxu 670b223828 自动采购任务 1 year ago
cxxxxxxx详 ccf9859e4f Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 2741076b82 铺货历史返回productid 1 year ago
qiushengjie 05b597e164 Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie 91863aeffa 搬家完善 1 year ago
wangchaoxu 89596c6cf5 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
1 year ago
wangchaoxu 25f42c241f 自动采购任务 1 year ago
qiushengjie 8b6dc93f6c Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie 91379f7457 xml问题 1 year ago
ljl 0e2d50414f Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
ljl 758b20dd6b yh 1 year ago
daixiaogang 0f86a50eab AnalysisRelateProductDsOrderTask 1 year ago
daixiaogang ee3c204c71 rsyncOpPageTimer问题修复
售后同步问题-未完全完成
1 year ago
ljl 2c3b301e64 解决冲突 1 year ago
ljl 2f5e8e7058 修改 1 year ago
qiushengjie 5fe417d7db xml问题 1 year ago
qiushengjie ba473dd469 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/tool/ImageTool.java
1 year ago
qiushengjie 73d29058a1 搬家相关 1 year ago
cxxxxxxx详 b9294d8e6b 接口cancelCollectTask 1 year ago
wangchaoxu caf70f0f27 抖店消息处理 1 year ago
qiushengjie f155db090c Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie 357b6b91e8 搬家相关 1 year ago
ljl 0a1c8cce2f 修改bug 1 year ago
cxxxxxxx详 61b67795b0 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 44f3b8a0c0 删除失败铺货历史 1 year ago
wangchaoxu ae13cdc75a Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java
1 year ago
wangchaoxu dcc89bb6f4 抖店消息处理 1 year ago
cxxxxxxx详 445df7dcd5 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 4c62e00fb4 删除搬家历史 1 year ago
daixiaogang 546b8fb129 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 37a476125b rsyncOpTimer测试 1 year ago
cxxxxxxx详 12147a2fc5 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 187160773c 铺货配置bug修复 1 year ago
daixiaogang cb5429cba4 修复插入or更新sql 1 year ago
daixiaogang 33aff521fc Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang cd78296b20 opCheckEndOpOrderRsyncQueuesTimer
rsync_category_queue 代码生成
1 year ago
wangchaoxu b9ce484b6c Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java
# Conflicts:
#	README.md
1 year ago
wangchaoxu 03e52a9c6c 抖店消息处理 1 year ago
daixiaogang 6d324ac499 clearRedisRsyncOpOrderCompletedMap 1 year ago
daixiaogang bdf32665cf opUnlockTimeoutQueueTimer 1 year ago
ljl 851e8df188 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
daixiaogang bb5f071b8b 订单列表问题修复 1 year ago
cxxxxxxx详 f12532a785 铺货配置相关修改 1 year ago
cxxxxxxx详 75de958fb1 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 7681d24ad7 搬家配置参数修改 1 year ago
ljl 99396a1c2d Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl 23188d7d85 yh 1 year ago
daixiaogang 6f2aa02a57 moveOpPageBufferTimer 1 year ago
ljl 46738ecf6d Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
wangchaoxu 331c3b8b85 抖店消息处理 1 year ago
wangchaoxu 9d341f66e5 抖店消息处理 1 year ago
wangchaoxu e95122aa4c Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 3b038dade3 抖店消息处理 1 year ago
elf 32c0c70f91 yh 1 year ago
daixiaogang 17f398a383 MoveOpPageBufferTimer 部分 1 year ago
cxxxxxxx详 0f20d14a8d 铺货历史 1 year ago
cxxxxxxx详 92b2aef561 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 7b4b086527 搬家日志 1 year ago
daixiaogang 1ed42e0570 rsyncOpPageTimer 1 year ago
qiushengjie f65a8a7316 搬家任务相关 1 year ago
ljl a7ccfd905a yh 1 year ago
cxxxxxxx详 6d640e132d 获取类目树 1 year ago
qiushengjie 10dfe5d92b 搬家任务相关 1 year ago
wangchaoxu d74a7374f8 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu fe4a522efb 抖店消息处理 1 year ago
daixiaogang d05d05a7a6 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 1efeee747a 订单定时 1 year ago
qiushengjie df1d9ea429 搬家任务相关 1 year ago
qiushengjie d189a722bb 搬家任务相关 1 year ago
qiushengjie dabe474c2b 搬家任务相关 1 year ago
qiushengjie b5d9810964 Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie e24f81eebf 搬家任务相关 1 year ago
ljl cbb185b6b1 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl e4324a4942 yh 1 year ago
qiushengjie 4da93c3e73 Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie 333e6b6b11 搬家任务相关 1 year ago
ljl 743b75a7a7 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl 1469e9f011 修改 1 year ago
daixiaogang cea5061172 purchase_order_custom
purchase_order_ds_encrypt
代码生成
订单定时部分
1 year ago
ljl 735aa5bd9e Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
daixiaogang 20d88496df op_order_delay_outstorage_buffer
op_order_outstorage_history_tag
purchase_order_tag
op_order_delay_outstorage_queue
op_package
op_package_ext
op_package_order
op_package_order_child
代码生成
1 year ago
elf 717ccde9d3 yh 1 year ago
daixiaogang 75a84f67d1 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 77119d9a6c 修改skuid为long型
测试分销订单列表接口
1 year ago
ljl 5e13b7b7f1 解决冲突 1 year ago
daixiaogang 452911d4fb 跨域
对接列表
修改insert 改为insertUpdate
1 year ago
ljl 5b3590e387 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl ce0979e3bf 修改bug 1 year ago
wangchaoxu 62bfca201d 采购配置相关 1 year ago
laolin c64970ad5f 出库历史列表 1 year ago
ljl 73abb3c916 yh 1 year ago
ljl b5f9c1366a 修改bug 1 year ago
wangchaoxu 29334cdef3 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
1 year ago
wangchaoxu 22af68a24f 采购单同步 1 year ago
daixiaogang 0db685e01d 分销订单列表返回体添加参数 1 year ago
daixiaogang a43168f550 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang c4f395a79e 售后订单同步部分 1 year ago
ljl ec1ded0249 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl a03ec54560 yh 1 year ago
daixiaogang c50e2698bd Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 6eecf46320 售后订单同步部分 1 year ago
cxxxxxxx详 3ef05fe5e6 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 f9ffc59221 铺货单字段补充 1 year ago
laolin f6545a6675 物流代码提交-物流公司列表接口 1 year ago
ljl ca244ec7fb Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl bdbb74495f 修改 1 year ago
daixiaogang c5bb70e9f4 售后订单同步部分 1 year ago
daixiaogang 48fee6bf49 售后订单同步相关表生成 1 year ago
daixiaogang 6d023b12b0 检查订单同步是否结束 1 year ago
daixiaogang cc77d4293a 指定时间同步订单数据 1 year ago
cxxxxxxx详 505c7b0edd 铺货单相关修改 1 year ago
daixiaogang c933eb9b29 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 400df9433f 获取分销订单各个tab的订单数量 1 year ago
cxxxxxxx详 ea3f08df99 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 5b7143847a 铺货单相关修改 1 year ago
daixiaogang 48733fe8af Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
#	ms-dal/src/main/java/com/ms/dal/mapper/PurchaseOrderMapper.java
#	ms-dal/src/main/resources/mapper/PurchaseOrderMapper.xml
1 year ago
daixiaogang badb1afbaf 获取分销订单各个tab的订单数量 1 year ago
ljl a8e5c1cd42 解决冲突 1 year ago
ljl 4f0b783a38 yh 1 year ago
laolin fd7b56909d 物流代码提交-代码被覆盖-重提交 1 year ago
laolin f54c90bf3d 物流代码提交 1 year ago
laolin 8fc98ad733 物流代码提交 1 year ago
laixiongwei 81d9d68705 批量取消订单隔离\批量设置订单隔离 1 year ago
laixiongwei 3cf281f243 订单出库(手动出库) 1 year ago
wangchaoxu a7968fef17 采购配置相关 1 year ago
wangchaoxu cf5a1035d3 采购配置相关 1 year ago
wangchaoxu 245743bb36 采购配置相关 1 year ago
cxxxxxxx详 6ea372d64c Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 a2fab03d3a 商品接口修改 1 year ago
wangchaoxu 8539e7e26c Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 68ca78658d 采购配置相关 1 year ago
laixiongwei 6a341a51e6 Merge remote-tracking branch 'origin/master' 1 year ago
laixiongwei 4481b60399 添加表 1 year ago
wangchaoxu 15280d0935 采购配置相关 1 year ago
ljl 8c34fb1c81 解决冲突 1 year ago
ljl d2763957a8 采购 1 year ago
daixiaogang 923d564e2c 合并问题处理 1 year ago
daixiaogang e14280c2f6 合并问题处理 1 year ago
daixiaogang 37842ab598 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java
#	ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
#	ms-dal/src/main/resources/mapper/OpOrderPurchaseOutstorageQueueMapper.xml
1 year ago
daixiaogang 10a5cb2d4d 抖店订单同步、列表查询 1 year ago
laixiongwei 7a4b5cf196 修改xml 1 year ago
wangchaoxu a58826e306 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 1412a69619 采购配置相关 1 year ago
laixiongwei c643a4978e 订单解密地址 1 year ago
wangchaoxu d7c9499713 采购配置相关 1 year ago
wangchaoxu dcb6c27e9b 采购配置相关 1 year ago
cxxxxxxx详 562fc3ffa8 授权相关修改 1 year ago
qiushengjie 263ae32940 Merge remote-tracking branch 'origin/master' 1 year ago