Commit Graph

506 Commits (912e1010d32f0c29df31d0988c0450217073d9e1)

Author SHA1 Message Date
daixiaogang c026e5f562 Merge remote-tracking branch 'origin/master' 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
cxxxxxxx详 8d0288d4ed Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 4d814c88e7 蓝海商机接口 1 year ago
wangchaoxu de67bcce8e Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu dbe6eee946 采购配置相关 1 year ago
laolin 1c5e40dd7d Merge remote-tracking branch 'origin/master' 1 year ago
laolin c64970ad5f 出库历史列表 1 year ago
wangchaoxu 1ac5daa55e 优化 1 year ago
cxxxxxxx详 5fcada57e5 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 fc84a65ba8 sdk更新 1 year ago
wangchaoxu ca3d67726c 采购配置相关 1 year ago
wangchaoxu d26c94de3a Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu ea35c1984a 采购单同步 1 year ago
ljl 73abb3c916 yh 1 year ago
ljl b5f9c1366a 修改bug 1 year ago
daixiaogang c516ecee4c Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang c043313d3b 分销订单列表返回体添加参数 1 year ago
cxxxxxxx详 2273150252 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 ee2d0377f9 测试接口 1 year ago
wangchaoxu bd3304e628 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 891ddeb34c 采购单同步 1 year ago
daixiaogang e5c0df0b2f Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang a49b88c354 全局异常处理 1 year ago
cxxxxxxx详 7f1a4e7c21 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 022909f017 测试spi 1 year ago
wangchaoxu 393201cf57 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 07694596fc 采购单同步 1 year ago
cxxxxxxx详 c6381a20c8 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 fcd90bee84 商品相关修改 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
wangchaoxu 78e33de73f 采购单同步 1 year ago
wangchaoxu cee6d4f49a Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java
# Conflicts:
#	ms-biz/src/main/java/com/ms/api/service/PurchaseOrderService.java
1 year ago
wangchaoxu fd1201133f 采购单同步 1 year ago
daixiaogang 0f7c506bfc 去除rute 1 year ago
daixiaogang 8aca577369 去除rute 1 year ago
daixiaogang 26f5d47f31 售后订单同步部分 1 year ago
cxxxxxxx详 f94b9b2d91 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 7647781578 商品详情新增接口 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
qiushengjie 92441699b3 搬家任务相关 1 year ago
elf 5c29887500 采购相关接口 1 year ago
qiushengjie e2085c33c9 Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie dbf8fb882e 搬家后台任务相关 1 year ago
wangchaoxu fe7a3963f6 采购单同步 1 year ago
qiushengjie e436ea672f 搬家后台任务相关 1 year ago
laolin f6545a6675 物流代码提交-物流公司列表接口 1 year ago
wangchaoxu 05de344c60 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 4041d27f31 采购单同步 1 year ago
ljl a60c306710 修改 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
cxxxxxxx详 76e343579c Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 cc1674b1ff 测试接口 1 year ago
qiushengjie 44910a2f83 搬家后台任务相关 1 year ago
daixiaogang 48fee6bf49 售后订单同步相关表生成 1 year ago
daixiaogang aba85eaf7f Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 6d023b12b0 检查订单同步是否结束 1 year ago
wangchaoxu e622969430 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 0f40773dc3 触发分销订单时间轴同步接口 1 year ago
daixiaogang cc77d4293a 指定时间同步订单数据 1 year ago
wangchaoxu 6a38aa8a73 开发中 1 year ago
wangchaoxu 9b12f35849 开发中 1 year ago
cxxxxxxx详 505c7b0edd 铺货单相关修改 1 year ago
cxxxxxxx详 097ade4171 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 a5956565c2 铺货单相关修改 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
wangchaoxu 688aabcc64 配置返回测试数据 1 year ago
wangchaoxu 181975a3f2 配置返回测试数据 1 year ago
daixiaogang 074db939f3 循环引用问题 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
wangchaoxu 5e92b97fd0 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 36a75f7193 采购配置相关 1 year ago
ljl e7b4da875f Merge branch 'ljl-dsPurchaseOrder' 1 year ago
ljl a8e5c1cd42 解决冲突 1 year ago
wangchaoxu 3a5907c776 统一修改返回类型 1 year ago
ljl 4f0b783a38 yh 1 year ago
wangchaoxu fdfe85aeed 统一修改返回类型 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
qiushengjie feade0ede3 Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie dec768f1f7 搬家后台任务相关 1 year ago
ljl 84e2fb68c5 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl bc24100d2a yh 1 year ago
wangchaoxu 45bf4e3b74 采购配置相关 1 year ago
wangchaoxu 3934cc76e8 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 15c72266d8 采购配置相关 1 year ago
qiushengjie e9001f0b58 新增商品搬家的后台任务 1 year ago
wangchaoxu f1eae3ddb9 采购配置相关 1 year ago
wangchaoxu f365c5825a 采购配置相关 1 year ago
cxxxxxxx详 49baaf30a8 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 b45e4d83eb 商品相关修改 1 year ago
wangchaoxu 6b8ac92957 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu a7968fef17 采购配置相关 1 year ago
cxxxxxxx详 4e6817982a 获取规则树调试 1 year ago
cxxxxxxx详 139c1f131b 商品相关接口修改 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
qiushengjie 23bf419071 测试读取本地工程文件 1 year ago
laixiongwei 6a341a51e6 Merge remote-tracking branch 'origin/master' 1 year ago
laixiongwei 4481b60399 添加表 1 year ago
qiushengjie 8f5ac0c6e9 Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie 9911ab4dbf 线上测试自动任务 1 year ago
wangchaoxu 897a9563b1 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 15280d0935 采购配置相关 1 year ago
qiushengjie b8a50a7c43 定时任务处理 1 year ago
qiushengjie b41adc0cab 定时任务处理 1 year ago
qiushengjie 2bd4bdf9fc 定时任务处理 1 year ago
qiushengjie 506e731d93 定时任务处理 1 year ago
qiushengjie f478005148 添加定时任务处理 1 year ago
wangchaoxu f839f77e64 采购配置相关 1 year ago
wangchaoxu 1ac29772fe 采购配置相关 1 year ago
qiushengjie 0ee7d5b087 添加定时任务处理 1 year ago
wangchaoxu 02427fbc03 采购配置相关 1 year ago
ljl cebcab0be4 yh 1 year ago
daixiaogang f7951533b9 Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 55fef1818d 合并问题处理 1 year ago
ljl 8c34fb1c81 解决冲突 1 year ago
ljl d2763957a8 采购 1 year ago
daixiaogang a6d19c0eb5 合并问题处理 1 year ago
daixiaogang b7145d600c 合并问题处理 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
wangchaoxu 6240ab4484 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 6f6bf8d9da 采购配置相关 1 year ago
laixiongwei 9200a6b8e6 Merge remote-tracking branch 'origin/master' 1 year ago
laixiongwei 27bb25a2c1 手动出库 1 year ago
wangchaoxu b177840552 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu a3d201f7af 采购配置相关 1 year ago
cxxxxxxx详 2b2b1782d6 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 7b70b54f1d 获取商品详情接口修改 1 year ago
wangchaoxu a58826e306 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 3788ed7c90 采购配置相关 1 year ago
laixiongwei c643a4978e 订单解密地址 1 year ago
cxxxxxxx详 fec102419e Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 38c84da1cb 获取商品接口修改 1 year ago
wangchaoxu 60fbfdacf6 采购配置相关 1 year ago
wangchaoxu bfffbb621e 采购配置相关 1 year ago
wangchaoxu 7327a10f67 采购配置相关 1 year ago
wangchaoxu 9f318692f5 采购配置相关 1 year ago
wangchaoxu bd9a17e2b3 采购配置相关 1 year ago
wangchaoxu d7c9499713 采购配置相关 1 year ago
wangchaoxu ecddc18d98 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 2cac8b256d 采购配置相关 1 year ago
qiushengjie 62e68a98e4 搬家相关 1 year ago
wangchaoxu dcb6c27e9b 采购配置相关 1 year ago
wangchaoxu 8514490790 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu d9275712fb 采购配置相关 1 year ago
cxxxxxxx详 875672b38b 查询相同类型的商品接口参数修改 1 year ago
cxxxxxxx详 fb7ba76123 商品相关接口修改 1 year ago
cxxxxxxx详 562fc3ffa8 授权相关修改 1 year ago
ljl 42b4dbf580 yh 1 year ago
qiushengjie 263ae32940 Merge remote-tracking branch 'origin/master' 1 year ago
qiushengjie 700e941adc 搬家相关 1 year ago
cxxxxxxx详 0d7fdb72b8 授权相关修改 1 year ago
ljl 88368aab34 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder 1 year ago
ljl 28a829a7b9 yh 1 year ago
daixiaogang 3dd498db5e Merge remote-tracking branch 'origin/master' 1 year ago
daixiaogang 1ffb06800f 抖店订单同步 1 year ago
cxxxxxxx详 eeb351357f 授权回调相关修改 1 year ago
cxxxxxxx详 8e62d7815d 授权相关修改 1 year ago
wangchaoxu 85bea92779 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu b1000e6f11 采购配置相关 1 year ago
cxxxxxxx详 5323dd88d8 授权相关修改 1 year ago
cxxxxxxx详 3899c58c6b 授权相关修改 1 year ago
cxxxxxxx详 3a5fa91ffc Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 bbd274d682 请求签名相关修改 1 year ago
laixiongwei 5f392587ed Merge remote-tracking branch 'origin/master' 1 year ago
wangchaoxu e1190b79da Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu ade0af941b 采购配置相关 1 year ago
laixiongwei 06b5708b61 批量修改商家备注 1 year ago
laixiongwei 1af018e397 修改商家备注 1 year ago
cxxxxxxx详 ce5b86fa06 Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
cxxxxxxx详 85da9c9735 接口参数修改 1 year ago
wangchaoxu 8d67827bc2 采购配置相关 1 year ago
wangchaoxu cdd8e45057 Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java 1 year ago
wangchaoxu 6d59141ff1 采购配置相关 1 year ago
qiushengjie 7935865000 请求格式加utf-8 1 year ago