Commit Graph

4453 Commits

Author SHA1 Message Date
gazebo
34732dffa1 UnionFindAuthBind在TypeID为空的情况下更新 2020-02-14 10:06:22 +08:00
gazebo
cb163e1ff1 AddEventDetail中处理没有request的情况 2020-02-13 23:45:43 +08:00
苏尹岚
cb50b69471 Accept Merge Request #186: (su -> mark)
Merge Request: 根据调价包刷新京西价bug
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/186
2020-02-13 16:35:01 +08:00
苏尹岚
79ec7ec932 bug 2020-02-13 16:33:48 +08:00
苏尹岚
dd259a16e2 Accept Merge Request #185: (su -> mark)
Merge Request: 分账修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/185
2020-02-13 16:27:12 +08:00
苏尹岚
e46245f7e2 饿鲜达商品库合并修改,每日订单打款增加日志,一些bug 2020-02-13 16:25:54 +08:00
gazebo
d3cf404a41 认证支持同一类型多绑定 2020-02-13 13:45:44 +08:00
gazebo
67d4e461e2 up 2020-02-13 12:30:40 +08:00
gazebo
63f7fc749c 2222-01-01 00:00:00临时下架一些门店的商品 2020-02-13 11:57:18 +08:00
苏尹岚
e46e86396c 每日订单打款测试,2020-02-13 9.30 2020-02-13 09:25:57 +08:00
苏尹岚
c461e3e10e 订单打款修改 2020-02-12 17:25:47 +08:00
苏尹岚
ee9ce5a54f 饿鲜达商品库合并测试,订单分账修改 2020-02-12 17:25:45 +08:00
苏尹岚
4f858f15a5 饿鲜达合并,按美团调价包刷新京西价 2020-02-12 17:25:43 +08:00
苏尹岚
7d2a90ad4c 饿鲜达修改商品优化 2020-02-12 17:25:42 +08:00
苏尹岚
426aef5f91 饿鲜达商品新建分类处理 2020-02-12 17:25:42 +08:00
苏尹岚
958e0831a6 sql错了 2020-02-12 17:25:42 +08:00
苏尹岚
246d938ae0 饿鲜达创建门店商品优化 2020-02-12 17:25:42 +08:00
gazebo
218ddf418f 推送账单时,推送到主店 2020-02-12 16:35:22 +08:00
gazebo
60915b46cd 饿百不同步门店名 2020-02-12 15:28:21 +08:00
gazebo
97a5c2d921 添加Store.OperatorPhone3 2020-02-12 08:40:18 +08:00
gazebo
f77849d08a 京西商城订单随意取消 2020-02-11 17:28:53 +08:00
苏尹岚
3cc6db8f0f Accept Merge Request #184: (su -> mark)
Merge Request: 价格统计优化
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/184
2020-02-11 13:38:50 +08:00
gazebo
43a9e615fa 取消2020-02-10美团要求下架所有猪肉 2020-02-11 13:33:43 +08:00
苏尹岚
7e4993ae55 实验饿百同步饿鲜达商品 2020-02-11 11:35:48 +08:00
苏尹岚
7d24d9a31a 价格统计优化 2020-02-11 11:35:47 +08:00
苏尹岚
b913533177 价格统计优化 2020-02-11 11:35:47 +08:00
苏尹岚
56f56a5f75 价格统计优化 2020-02-11 11:35:47 +08:00
gazebo
527222a095 2020-02-10美团要求下架所有猪肉 2020-02-10 14:57:04 +08:00
苏尹岚
7ba8a762fd Accept Merge Request #183: (su -> mark)
Merge Request: 根据京东建议售价修改京西价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/183
2020-02-09 19:37:49 +08:00
gazebo
f73a97fc6b courierstore status 2020-02-09 12:03:04 +08:00
gazebo
c42bb64998 SendStoreMessage数量少时任务不管理 2020-02-07 20:15:19 +08:00
suyl
7c2b986fa8 根据平台价刷新惊喜价 2020-02-07 15:49:02 +08:00
suyl
73a01664ce Merge remote-tracking branch 'origin/mark' into su 2020-02-07 15:38:27 +08:00
gazebo
464399e145 up 2020-02-07 14:55:47 +08:00
suyl
9afb6adfbb Merge remote-tracking branch 'origin/mark' into su 2020-02-07 14:21:22 +08:00
gazebo
fbdd8849f6 CaculateJxPriceByPricePack 2020-02-07 14:20:24 +08:00
suyl
9d203c90e7 Merge remote-tracking branch 'origin/mark' into su 2020-02-07 13:49:20 +08:00
gazebo
1855af8757 GetStoreOrderSkuList以订单完成时间为准 2020-02-07 13:48:36 +08:00
gazebo
8d0df4128d OnNewFakeJdOrder中调用RefreshOrderSkuRelated 2020-02-07 12:52:16 +08:00
苏尹岚
8c602871e8 temporay up 2020-02-07 11:46:35 +08:00
gazebo
1b8d792a2c 达达配送用新接口 2020-02-07 11:27:03 +08:00
gazebo
a26ce01901 取消StoreCourierMap的VendorStoreID唯一限制 2020-02-07 10:19:58 +08:00
gazebo
70a3f59026 京西商城自动配送调度只使用达达 2020-02-07 10:17:57 +08:00
gazebo
763fae34df 取消StoreCourierMap的VendorStoreID唯一限制 2020-02-07 10:00:48 +08:00
gazebo
811ddc82b3 获取门店信息时,特殊处理江阴这种县级市 2020-02-07 09:38:25 +08:00
苏尹岚
73a76834cd Accept Merge Request #182: (su -> mark)
Merge Request: 修改门店敏感字段权限增加赵
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/182
2020-02-06 17:47:08 +08:00
苏尹岚
96f2734c19 修改门店权限增加赵 2020-02-06 17:45:59 +08:00
gazebo
b864b0983d 打印机调试信息 2020-02-06 17:36:20 +08:00
gazebo
3d2c8f4222 打印依赖LinkStoreID 2020-02-06 17:32:44 +08:00
gazebo
80fc4ce6a9 up 2020-02-06 16:46:40 +08:00