Rosy-zhudan
|
cd8670da4e
|
加日志头
|
2019-07-31 11:42:49 +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 |
|
Rosy-zhudan
|
119c10a8d5
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-30 15:37:30 +08:00 |
|
Rosy-zhudan
|
17ce70be72
|
打印处理时间，修正错误
|
2019-07-30 15:28:40 +08:00 |
|
gazebo
|
e7bad7dc25
|
+ UpdateWaybillTip
|
2019-07-30 14:43:28 +08:00 |
|
Rosy-zhudan
|
df92f78cc4
|
修正错误
|
2019-07-30 14:22:09 +08:00 |
|
gazebo
|
15c6607eb2
|
- GetStores关键字搜索市场与运营人员
|
2019-07-30 14:13:46 +08:00 |
|
gazebo
|
5628f86a10
|
- GetOrders添加可选参数：isDateFinish
- ExportOrders以完成时间来导出
|
2019-07-30 11:56:45 +08:00 |
|
gazebo
|
66d820cb0f
|
- jdapi.getActFromJD中，如果没有取到SKU的活动时间用act的活动时间的话，结束时间加一天减1秒
|
2019-07-30 11:44:18 +08:00 |
|
gazebo
|
3c7ddddcba
|
- 调整dao.GetVendorStoreSnapshot的实现
- updateVendorStoreStatusBySnapshot中更新本地平台门店信息
|
2019-07-30 09:27:14 +08:00 |
|
Rosy-zhudan
|
0fa2d29dca
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-30 08:35:17 +08:00 |
|
gazebo
|
5b10960232
|
- 门店商品自动可售，未启用
|
2019-07-29 18:47:11 +08:00 |
|
Rosy-zhudan
|
72e8e62da5
|
修正自动更新门店数量和营业时间的问题
|
2019-07-29 17:26:43 +08:00 |
|
gazebo
|
d8852a569b
|
- 美团外卖不支持售后全额退款
|
2019-07-29 17:18:26 +08:00 |
|
gazebo
|
1a8bcef392
|
- 获取平台门店信息后，更新本地DeliveryType
|
2019-07-29 17:18:06 +08:00 |
|
gazebo
|
bda7a4edb2
|
- 京东一些门店设置成了接单即拣货完成，这种情况下自动调用拣货完成
|
2019-07-29 16:50:41 +08:00 |
|
gazebo
|
245d5581ff
|
- PartRefundOrder与AdjustOrder针对removedList为所有商品的情况特殊处理
|
2019-07-29 16:44:42 +08:00 |
|
Rosy-zhudan
|
d1bf437044
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-29 16:34:37 +08:00 |
|
gazebo
|
efcfe672b3
|
- fix bug in mtwm.onAfsOrderMsg
|
2019-07-29 16:05:36 +08:00 |
|
gazebo
|
101a92ad64
|
+ StoreSkuFullList2Bare
|
2019-07-29 16:04:03 +08:00 |
|
gazebo
|
367315ad39
|
- 修复美团商家主动发起售后单时，直接就是同意状态的情况
|
2019-07-29 15:29:23 +08:00 |
|
gazebo
|
ee613bfa75
|
+ TmpGetMyStoreList
|
2019-07-29 13:59:08 +08:00 |
|
gazebo
|
40d96f3342
|
- checkActValidation新增活动检查，开始时间必须小于结束时间
|
2019-07-29 11:25:23 +08:00 |
|
gazebo
|
c00990b2e0
|
- mtpsStoreToken
|
2019-07-29 11:12:54 +08:00 |
|
Rosy-zhudan
|
e7f618859d
|
'定时刷新商店库存和营业时间（暂饿百和美团）'
|
2019-07-29 10:58:19 +08:00 |
|
gazebo
|
91530d4e57
|
- 修复addStoreCourierMap中的BUG
|
2019-07-29 10:54:51 +08:00 |
|
gazebo
|
0b4f953800
|
- update jd token
|
2019-07-29 10:40:50 +08:00 |
|
Rosy-zhudan
|
07d72b538c
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-29 08:55:54 +08:00 |
|
Rosy-zhudan
|
545f873da5
|
auto refresh store's open and close time
|
2019-07-29 08:54:15 +08:00 |
|
gazebo
|
6fc89defcd
|
- 修改sku规格时，相应重新计算门店商品价格并设置合适的同步标志
|
2019-07-28 16:02:52 +08:00 |
|
gazebo
|
b0c3fa3ca3
|
- 适应门店商品修复API，添加trackInfo参数
|
2019-07-28 12:39:40 +08:00 |
|
gazebo
|
6892467f4d
|
- 修复putils中几个unselect函数的BUG
- syncStoreSkuNew中忽略更新数据库错误，返回原始的同步错
|
2019-07-27 22:58:56 +08:00 |
|
gazebo
|
991128242a
|
- OrderSku.StoreSubID当成活动ID来使用
|
2019-07-27 16:24:00 +08:00 |
|
gazebo
|
8814628c62
|
- 修复GetEffectiveActStoreSkuInfo中没有获取vendor_id的bug
|
2019-07-27 15:56:59 +08:00 |
|
gazebo
|
e89725bd8c
|
- disable jd financial warning
|
2019-07-27 09:48:57 +08:00 |
|
gazebo
|
1a9beaa4f9
|
- ActStoreSkuParam2Model中当有wrongSkuList时，不覆盖OriginalPrice
|
2019-07-26 17:47:51 +08:00 |
|
gazebo
|
272f5651d8
|
- fk
|
2019-07-26 17:38:21 +08:00 |
|