Rosy-zhudan
|
58b33c8e77
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-05 16:32:51 +08:00 |
|
Rosy-zhudan
|
9afb12ced7
|
修正比较数据的BUG，添加SkuID字段到DiffData结构体
|
2019-08-05 16:32:20 +08:00 |
|
gazebo
|
4b6ed5200f
|
- fk
|
2019-08-05 16:28:53 +08:00 |
|
gazebo
|
044f5860b1
|
- 修复DeleteConfig中删除银行的BUG
|
2019-08-05 15:22:17 +08:00 |
|
Rosy-zhudan
|
dd76433a5d
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-05 15:13:44 +08:00 |
|
gazebo
|
a6ef8e4427
|
- ren StoreSkuExt.BindStatus to StoreSkuExt.StoreSkuStatus
|
2019-08-05 15:10:13 +08:00 |
|
gazebo
|
e820abf686
|
- checkConfig添加参数key
|
2019-08-05 14:55:34 +08:00 |
|
gazebo
|
b0b4e67e21
|
- up
|
2019-08-05 12:52:23 +08:00 |
|
gazebo
|
f9b578f0ae
|
- 门店商品可售时更新库存
|
2019-08-05 12:25:29 +08:00 |
|
gazebo
|
73169746c9
|
+ user2/GetUsers
|
2019-08-05 09:38:48 +08:00 |
|
Rosy-zhudan
|
9f1fd17d96
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-05 08:43:33 +08:00 |
|
gazebo
|
be9f2408f4
|
- LoopMultiStoresVendors添加参数isManagedIt
|
2019-08-04 16:04:43 +08:00 |
|
gazebo
|
48b1d61194
|
- GetStoresVendorSnapshot排除微商城
|
2019-08-04 11:52:52 +08:00 |
|
gazebo
|
582f11521c
|
- 处理设置假营业时间的逻辑BUG（之前逻辑在10点以后重启后，可能导致库存不能恢复）
|
2019-08-04 09:57:18 +08:00 |
|
Rosy-zhudan
|
c9ce8a5b26
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-04 09:28:46 +08:00 |
|
gazebo
|
972636e434
|
- AutoSaleStoreSku添加参数isNeedSync控制是否主动同步，定时任务不需要，因为马上就是每晚的定时同步
|
2019-08-03 22:26:03 +08:00 |
|
gazebo
|
7a3bd58e63
|
- updateActPrice4StoreSkuNameNew中skuIDs为空直接返回
|
2019-08-03 16:04:27 +08:00 |
|
gazebo
|
71d91bb102
|
- 启用新同步逻辑
|
2019-08-03 08:40:41 +08:00 |
|
gazebo
|
b85e88bef1
|
- doDailyWork.SyncStoresSkus改为同步
|
2019-08-02 21:11:36 +08:00 |
|
Rosy-zhudan
|
876af999c3
|
京西平台和其他平台商品的对比
|
2019-08-02 17:38:07 +08:00 |
|
gazebo
|
1d036d919b
|
- 调价包改为按SKU的价格来使用（GetPricePercentage）
|
2019-08-02 17:21:13 +08:00 |
|
gazebo
|
87d78777af
|
- 设置门店假营业时间放在每晚例行同步任务之后
|
2019-08-02 16:23:36 +08:00 |
|
Rosy-zhudan
|
e3e57204f6
|
关闭本地写文件开关
|
2019-08-02 15:39:56 +08:00 |
|
Rosy-zhudan
|
6a8b2023dc
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-02 15:36:57 +08:00 |
|
Rosy-zhudan
|
06d564331e
|
京西和平台商品差异
|
2019-08-02 15:33:28 +08:00 |
|
gazebo
|
7f40ee9963
|
- autoSaleAt set to 20:45:00
|
2019-08-02 14:46:52 +08:00 |
|
gazebo
|
37b894e112
|
+ 添加cms.autoSaleAt
|
2019-08-02 14:40:58 +08:00 |
|
gazebo
|
00e0106e9b
|
+ cms.printerStatusName
|
2019-08-02 14:29:48 +08:00 |
|
Rosy-zhudan
|
e2ea3f5d63
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-02 08:47:16 +08:00 |
|
gazebo
|
1d0aa132f9
|
- GoodsOrder.WaybillTipMoney的含义改为京西主动加的小费
- partner.IUpdateWaybillTip改为IAddWaybillTip
|
2019-08-01 18:09:23 +08:00 |
|
Rosy-zhudan
|
016bd553e3
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-01 17:17:36 +08:00 |
|
gazebo
|
046c8beef9
|
- FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo,FreeBatchCategoryIDOp并行数改为1
- FreeBatchStoreSkuInfo及FreeBatchStoreSkuSyncInfo任务handler添加task参数
|
2019-08-01 17:16:01 +08:00 |
|
Rosy-zhudan
|
66c3b86762
|
同步修改
|
2019-08-01 17:05:09 +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 |
|
Rosy-zhudan
|
6f105a7598
|
对比京西和平台商品差异
|
2019-08-01 16:00:43 +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 |
|