liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,530 Commits 4 Branches 0 Tags
92daec3d931720f43924a7bca9bfb9f5ec24aecd
Commit Graph

852 Commits

Author SHA1 Message Date
gazebo
1d0aa132f9 - GoodsOrder.WaybillTipMoney的含义改为京西主动加的小费 
- partner.IUpdateWaybillTip改为IAddWaybillTip
 2019-08-01 18:09:23 +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
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
a7b9a49982 - 启用门店商品临时不可售，暂时不建AutoSaleAt相关的索引 2019-08-01 10:37:23 +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
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
3f90b2d74e - 新同步逻辑，如果创建商品时已经存在，需要更新 2019-07-31 10:26:23 +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
Rosy-zhudan
ae41c23bf6 打印起始时间 2019-07-30 16:05:35 +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
Rosy-zhudan
df92f78cc4 修正错误 2019-07-30 14:22:09 +08:00
gazebo
15c6607eb2 - GetStores关键字搜索市场与运营人员 2019-07-30 14:13:46 +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
1a8bcef392 - 获取平台门店信息后，更新本地DeliveryType 2019-07-29 17:18:06 +08:00
Rosy-zhudan
d1bf437044 Merge remote-tracking branch 'origin/mark' into don 2019-07-29 16:34:37 +08:00
gazebo
ee613bfa75 + TmpGetMyStoreList 2019-07-29 13:59:08 +08:00
gazebo
40d96f3342 - checkActValidation新增活动检查，开始时间必须小于结束时间 2019-07-29 11:25:23 +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
1a9beaa4f9 - ActStoreSkuParam2Model中当有wrongSkuList时，不覆盖OriginalPrice 2019-07-26 17:47:51 +08:00
gazebo
272f5651d8 - fk 2019-07-26 17:38:21 +08:00
gazebo
08e224a35e - 修复ActStoreSkuParam2Model中没有一次报wrongSkuList错的bug 2019-07-26 17:21:46 +08:00
gazebo
a2abeaeead - syncStoreSkuNew中可能的越界错（GetStoreSkusFullInfo不返回错误并不一定表示有结果） 2019-07-26 16:39:53 +08:00
gazebo
216175c95b - 检查活动价格合法性 2019-07-26 15:53:47 +08:00
gazebo
92fad81a29 - syncStoreSkuNew中没有待同步条目不启动任务 2019-07-26 15:50:46 +08:00
gazebo
4179885cec - 线上环境沙湾店启用新同步逻辑 2019-07-26 15:33:28 +08:00
gazebo
a1d41ca99d - 移除partner.GetStoresSku 2019-07-26 15:24:40 +08:00
gazebo
11dca2ebcc - 整理新同步逻辑 2019-07-26 14:21:30 +08:00
gazebo
339b45eea1 - 新同步逻辑BUG修复 2019-07-26 13:42:31 +08:00
gazebo
ea46025b2d - 去掉一个调试信息 2019-07-26 11:44:18 +08:00