苏尹岚
|
7f8615abfb
|
同步错误返回
|
2019-12-04 09:17:06 +08:00 |
|
苏尹岚
|
2b979a4f68
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-12-03 11:30:40 +08:00 |
|
gazebo
|
0a6136731e
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-12-03 10:17:29 +08:00 |
|
gazebo
|
30b5ff0c70
|
尽量去掉对于UpdateEntityLogicallyAndUpdateSyncStatus的使用
|
2019-12-03 10:17:12 +08:00 |
|
苏尹岚
|
8c196ab87f
|
推荐商品
|
2019-12-03 10:09:55 +08:00 |
|
苏尹岚
|
9b382088c4
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-03 09:18:48 +08:00 |
|
苏尹岚
|
0c55b76bf1
|
推荐商品
|
2019-12-03 09:18:31 +08:00 |
|
gazebo
|
30e918c5e2
|
删除历史无用的代码
|
2019-12-03 09:15:58 +08:00 |
|
苏尹岚
|
33fbbf7192
|
禁用京东用户
|
2019-12-02 19:02:14 +08:00 |
|
苏尹岚
|
ef7d9814fb
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-02 18:23:58 +08:00 |
|
苏尹岚
|
4e17b43a22
|
京东用户处理
|
2019-12-02 18:23:39 +08:00 |
|
gazebo
|
b6659baf72
|
分类重新排序时没有正确更新JdSyncStatus修复
|
2019-12-02 16:21:59 +08:00 |
|
苏尹岚
|
1f3ee86edd
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-02 16:15:14 +08:00 |
|
苏尹岚
|
73f8bfd28f
|
禁用京东用户
|
2019-12-02 16:14:56 +08:00 |
|
苏尹岚
|
7ec9a99cfb
|
同步错误返回
|
2019-12-02 15:42:01 +08:00 |
|
徐建华
|
34a1f1d954
|
Accept Merge Request #48: (yonghui -> mark)
Merge Request: 门店订单归属补漏
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48
|
2019-12-02 14:37:09 +08:00 |
|
苏尹岚
|
410f671a36
|
冲突修改
|
2019-12-02 11:14:20 +08:00 |
|
苏尹岚
|
3c5afc31b6
|
接口位置移动，门店归属补漏修改，获取京东用户修改
|
2019-12-02 11:12:09 +08:00 |
|
gazebo
|
71bc871bdb
|
StoreSkuNameExt.Skus2改为Skus
|
2019-12-02 11:08:57 +08:00 |
|
苏尹岚
|
2836da8c94
|
同步错误返回
|
2019-12-02 08:20:05 +08:00 |
|
gazebo
|
36d964ef93
|
AutoSaleAtStr改为22:00:00
|
2019-12-01 17:03:44 +08:00 |
|
gazebo
|
0b4886c246
|
限制美团活动最小折扣为3折
活动至少要有98折
|
2019-11-30 14:11:46 +08:00 |
|
gazebo
|
5f2da8a4dc
|
取消活动时，也要将act_store_sku_map中条目相应置删除标志
|
2019-11-29 20:27:07 +08:00 |
|
苏尹岚
|
16dfd05943
|
Merge branch 'yonghui' of e.coding.net:rosydev/jx-callback into su
|
2019-11-29 17:55:09 +08:00 |
|
苏尹岚
|
c0b394f43d
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-29 17:52:28 +08:00 |
|
苏尹岚
|
6c0c837fae
|
门店归属订单不漏
|
2019-11-29 17:48:29 +08:00 |
|
gazebo
|
09944d68cd
|
每晚自动补全前一天与当天订单
|
2019-11-29 17:15:01 +08:00 |
|
gazebo
|
9f3eb98db0
|
启用ChangeStoreSkuSaleStatus日常任务
|
2019-11-29 16:49:09 +08:00 |
|
苏尹岚
|
d44e70074c
|
Accept Merge Request #47: (yonghui -> mark)
Merge Request: 获取京东用户列表
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/47
|
2019-11-29 16:17:17 +08:00 |
|
苏尹岚
|
648357c423
|
获取京东用户列表
|
2019-11-29 16:15:06 +08:00 |
|
gazebo
|
774f324b7b
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-29 15:06:38 +08:00 |
|
gazebo
|
ebb846dca8
|
GetStoresSkusNew中正确处理actVendorID
|
2019-11-29 15:06:14 +08:00 |
|
苏尹岚
|
6887fbc18a
|
读取永辉excel
|
2019-11-29 15:03:59 +08:00 |
|
苏尹岚
|
595572ef14
|
获取京东用户列表
|
2019-11-29 14:33:38 +08:00 |
|
苏尹岚
|
2e4c408170
|
读取永辉excel
|
2019-11-29 11:56:47 +08:00 |
|
苏尹岚
|
519c4eadec
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-29 11:09:48 +08:00 |
|
苏尹岚
|
34ee046ce2
|
获取京东用户修改，刷新订单结算价修改
|
2019-11-29 11:09:07 +08:00 |
|
gazebo
|
ab493a59fb
|
+GetMyOrders
|
2019-11-29 10:35:38 +08:00 |
|
gazebo
|
3756ac67b2
|
调整依赖结构，jxutils不依赖于dao，dao依赖于jxutils
|
2019-11-29 08:43:36 +08:00 |
|
苏尹岚
|
d85f595fee
|
读取永辉excel
|
2019-11-28 17:58:08 +08:00 |
|
苏尹岚
|
fac0e95546
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-28 17:52:34 +08:00 |
|
gazebo
|
406b522d05
|
ForceUpdateVendorPrice找不到门店商品时，给出具体信息
|
2019-11-28 15:52:36 +08:00 |
|
苏尹岚
|
c0d9b2e6b8
|
读取永辉excel
|
2019-11-28 15:25:57 +08:00 |
|
苏尹岚
|
ef8acccb3b
|
读取永辉excel
|
2019-11-28 15:07:11 +08:00 |
|
苏尹岚
|
6fb1142e67
|
读取永辉excel
|
2019-11-28 14:54:23 +08:00 |
|
苏尹岚
|
4c61474de7
|
读取永辉excel
|
2019-11-28 14:53:14 +08:00 |
|
苏尹岚
|
e30808a752
|
Accept Merge Request #42: (yonghui -> mark)
Merge Request: 查找京东用户
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/42
|
2019-11-28 14:26:10 +08:00 |
|
苏尹岚
|
fa843d3d1e
|
同步错误返回
|
2019-11-28 14:24:41 +08:00 |
|
gazebo
|
45827aceb5
|
+CanSwitch2SelfDeliver，美团预定单是不能转自送的
减小转自送失败尝试时间间隙至3秒（以免出现不能取消三方运单的情况）
|
2019-11-28 14:18:52 +08:00 |
|
苏尹岚
|
363b44a21c
|
同步错误返回
|
2019-11-28 14:15:57 +08:00 |
|