gazebo
|
92daec3d93
|
- 在jd.getStoreSkusBareInfoLimitSize设置Stock
|
2019-08-02 10:25:26 +08:00 |
|
gazebo
|
a5f4f054b2
|
+ purchase/jd/store_sku2_test.go
|
2019-08-01 20:12:33 +08:00 |
|
gazebo
|
8af8c4e0e2
|
- 去掉ebai.market_price
|
2019-08-01 20:11:07 +08:00 |
|
gazebo
|
402e60ab50
|
- 整理tasksch
|
2019-08-01 20:07:39 +08:00 |
|
gazebo
|
76d1817348
|
- 加小费策略调整
|
2019-08-01 19:51:40 +08:00 |
|
gazebo
|
1d0aa132f9
|
- GoodsOrder.WaybillTipMoney的含义改为京西主动加的小费
- partner.IUpdateWaybillTip改为IAddWaybillTip
|
2019-08-01 18:09:23 +08:00 |
|
gazebo
|
45948e4b09
|
- up
|
2019-08-01 17:32:43 +08:00 |
|
gazebo
|
0337cd6c91
|
- 漏了一个文件
|
2019-08-01 17:18:08 +08:00 |
|
gazebo
|
046c8beef9
|
- FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo,FreeBatchCategoryIDOp并行数改为1
- FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo任务handler添加task参数
|
2019-08-01 17:16:01 +08:00 |
|
XJH-Rosy
|
0899c1f266
|
Accept Merge Request #24: (temp -> mark)
Merge Request: 添加是否异步等参数，区分菜市和果园的刷新时间
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/24
|
2019-08-01 16:45:38 +08:00 |
|
Rosy-zhudan
|
018ae0e4f9
|
添加是否异步等参数，区分菜市和果园的刷新时间
|
2019-08-01 16:38:21 +08:00 |
|
gazebo
|
852fff6eff
|
- 重构tasksch
|
2019-08-01 16:29:11 +08:00 |
|
gazebo
|
66fcd42fc6
|
- 所有环境起用AutoSaleStoreSku
|
2019-08-01 15:11:33 +08:00 |
|
gazebo
|
a31ba8f730
|
- 整理tasksch
|
2019-08-01 14:29:22 +08:00 |
|
gazebo
|
43f33799f7
|
- 在updateStoresSkusWithoutSync中清除AutoSaleAt
|
2019-08-01 14:21:08 +08:00 |
|
gazebo
|
6bb793ab10
|
- GetStoreSkus返回autoSaleAt
|
2019-08-01 14:13:55 +08:00 |
|
gazebo
|
ccfebdb7ac
|
- UpdateStore中只有在需要时才调用updateCourierStores
- 修复jd.GetSkus的BUG
|
2019-08-01 13:50:54 +08:00 |
|
gazebo
|
fe5bb1e844
|
- 修复CreateWaybillOnProviders中的BUG
|
2019-08-01 10:58:52 +08:00 |
|
gazebo
|
a7b9a49982
|
- 启用门店商品临时不可售，暂时不建AutoSaleAt相关的索引
|
2019-08-01 10:37:23 +08:00 |
|
gazebo
|
84c0b93ec4
|
+ partner.GetSkus, jd.GetSkus
|
2019-08-01 10:16:26 +08:00 |
|
gazebo
|
57829c5f0e
|
- 添加小费成功后直接更新本地小费信息
|
2019-07-31 20:08:33 +08:00 |
|
gazebo
|
758f44b439
|
- CreateWaybillOnProviders4SavedOrder及CreateWaybillOnProviders添加excludeCourierVendorIDs参数
|
2019-07-31 20:08:20 +08:00 |
|
gazebo
|
a69c591f6c
|
- mtps token更新
|
2019-07-31 19:56:29 +08:00 |
|
gazebo
|
48132e3155
|
- 因应jdapi.QuerySkuInfos和QueryListBySkuIds接口改变
|
2019-07-31 18:14:16 +08:00 |
|
gazebo
|
d58f2879d7
|
- GetTokenInfo特殊处理ErrTokenIsInvalid
|
2019-07-31 17:31:00 +08:00 |
|
gazebo
|
a65bf09ac4
|
- 将加小费的起始计算时间统一为平台创建运单的时间
|
2019-07-31 16:32:37 +08:00 |
|
gazebo
|
4244a7def1
|
- 定时达订单暂时禁用加小费
|
2019-07-31 15:43:57 +08:00 |
|
gazebo
|
adc570ee2e
|
+ GoodsOrder.WaybillTipMoney
|
2019-07-31 15:23:35 +08:00 |
|
gazebo
|
75e5e99273
|
- GetMyStoreList 返回城市名
|
2019-07-31 15:17:13 +08:00 |
|
gazebo
|
e853b45176
|
- 去除UserProvide.CreateUser
|
2019-07-31 15:06:07 +08:00 |
|
gazebo
|
289ca5a6ec
|
- 将加小费从每5分钟加1元改为每10分钟加1元
- 添加isAddWaybillTipDisabled，避免在平台快递接单后（但没有发送订单配送中消息）无谓的尝试加小费
|
2019-07-31 14:17:37 +08:00 |
|
gazebo
|
2487598e87
|
- 修复在收到拣货完成事件时，设置TIMER计算duration的bug
|
2019-07-31 14:01:45 +08:00 |
|
gazebo
|
8ad7f9fa3b
|
- 处理小费时，对于定时达特殊处理
|
2019-07-31 13:49:56 +08:00 |
|
XJH-Rosy
|
7251a2008d
|
Accept Merge Request #23: (don -> mark)
Merge Request: 并发处理
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/23
|
2019-07-31 11:51:39 +08:00 |
|
Rosy-zhudan
|
cd8670da4e
|
加日志头
|
2019-07-31 11:42:49 +08:00 |
|
gazebo
|
907f2b1739
|
- 三方配送检查平台门店的DeliveryCompetition配置
|
2019-07-31 11:22:15 +08:00 |
|
Rosy-zhudan
|
8739d84e66
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-31 11:05:01 +08:00 |
|
Rosy-zhudan
|
c3f6719c6d
|
并发处理
|
2019-07-31 11:03:36 +08:00 |
|
gazebo
|
59b14d0a76
|
! 修改三方运单创建逻辑，添加平台配送小费handleWaybillTip
|
2019-07-31 10:59:47 +08:00 |
|
gazebo
|
3f90b2d74e
|
- 新同步逻辑，如果创建商品时已经存在，需要更新
|
2019-07-31 10:26:23 +08:00 |
|
gazebo
|
5498ea4069
|
- ActStoreSku2中添加VendorPrice
|
2019-07-31 09:44:30 +08:00 |
|
gazebo
|
b225f814ec
|
- 京东回调活动创建等5秒再执行，以免通过API创建时重复创建
- 饿百防重复创建
|
2019-07-31 09:13:09 +08:00 |
|
gazebo
|
5ce287fe09
|
- 切换新同步逻辑测试门店为102652
|
2019-07-30 18:00:04 +08:00 |
|
gazebo
|
3bffb1921f
|
- 平台（针对饿百）运单取消时，设置创建三方运单TIMER（之前是有这个逻辑的，修复BUG，resetTimer时没有传bill进去）
|
2019-07-30 17:59:58 +08:00 |
|
gazebo
|
c7bf2df5a5
|
- rename partner.CreateWaybillPolicy to CreateWaybillPolicyFunc
|
2019-07-30 16:53:13 +08:00 |
|
gazebo
|
2cce24bd72
|
+ handleWaybillTip
|
2019-07-30 16:26:56 +08:00 |
|
XJH-Rosy
|
65994f8824
|
Accept Merge Request #21: (don -> mark)
Merge Request: 定时刷新商店库存和营业时间（暂饿百和美团）
Created By: @Nathan drake
Reviewed By: @XJH-Rosy
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/21
|
2019-07-30 16:11:37 +08:00 |
|
Rosy-zhudan
|
ae41c23bf6
|
打印起始时间
|
2019-07-30 16:05:35 +08:00 |
|
Rosy-zhudan
|
7db71c3c05
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-30 15:42:11 +08:00 |
|
gazebo
|
166fcc8b6b
|
- GetStoreListByMobile去除删除的门店
|
2019-07-30 15:37:41 +08:00 |
|