Commit Graph

1299 Commits

Author SHA1 Message Date
苏尹岚
5ee6af40d2 Merge remote-tracking branch 'origin/mark' into su 2020-02-21 14:05:06 +08:00
苏尹岚
1088d9c50f Merge remote-tracking branch 'origin/mark' into su 2020-02-21 10:26:21 +08:00
gazebo
95ad575e09 StoreMap添加DeliveryFeeDeductionSill, DeliveryFeeDeductionFee 2020-02-21 10:26:04 +08:00
苏尹岚
dd7e632105 商城取消订单bug 2020-02-21 10:25:55 +08:00
gazebo
aafc7655e5 SkuID为0时,设置为JxSkuID 2020-02-21 09:54:19 +08:00
苏尹岚
511da0f1a4 Accept Merge Request #190: (su -> mark)
Merge Request: 优化饿鲜达
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/190
2020-02-19 14:35:01 +08:00
gazebo
638328a0e6 SkuID超范围 2020-02-19 10:04:35 +08:00
苏尹岚
5770f493c8 每日订单打款测试 2020-02-19 09:49:42 +08:00
苏尹岚
78acdfdf19 订单打款查询验证方式增加微信支付appid参数 2020-02-19 09:01:38 +08:00
苏尹岚
6e4ecfd441 订单打款日期修改,修改商品过滤饿鲜达 2020-02-19 08:43:42 +08:00
苏尹岚
6af337d7ac Accept Merge Request #189: (su -> mark)
Merge Request: 饿先达商品分类完善
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/189
2020-02-18 20:35:14 +08:00
gazebo
b935ef3462 将京西菜市名字(及其它一些硬编码)做成配置项目 2020-02-18 19:11:47 +08:00
苏尹岚
dbd69213be 饿百同步修改测试 2020-02-18 15:19:47 +08:00
苏尹岚
fa28f3b30c 饿鲜达部分商品增加默认价格和分类 2020-02-18 10:57:48 +08:00
苏尹岚
ec37c68448 饿鲜达分类同步修改 2020-02-17 17:20:21 +08:00
苏尹岚
2d5ae8ea01 每日订单打款插入日志表修改 2020-02-17 16:19:46 +08:00
苏尹岚
94bce18432 饿鲜达分类同步优化 2020-02-17 16:08:44 +08:00
苏尹岚
49ede2c9d8 尝试过滤掉饿鲜达不要的分类 2020-02-17 09:17:33 +08:00
苏尹岚
1a0a535d7b 尝试过滤掉饿鲜达不要的分类 2020-02-17 09:12:59 +08:00
苏尹岚
871151201e 饿鲜达商品分类id增加,每日打款修改authid 2020-02-14 11:02:09 +08:00
苏尹岚
ba0b726871 日常bug 2020-02-13 18:21:59 +08:00
苏尹岚
e46245f7e2 饿鲜达商品库合并修改,每日订单打款增加日志,一些bug 2020-02-13 16:25:54 +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
苏尹岚
246d938ae0 饿鲜达创建门店商品优化 2020-02-12 17:25:42 +08:00
gazebo
60915b46cd 饿百不同步门店名 2020-02-12 15:28:21 +08:00
gazebo
f77849d08a 京西商城订单随意取消 2020-02-11 17:28:53 +08:00
苏尹岚
7e4993ae55 实验饿百同步饿鲜达商品 2020-02-11 11:35:48 +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
suyl
9d203c90e7 Merge remote-tracking branch 'origin/mark' into su 2020-02-07 13:49:20 +08:00
苏尹岚
8c602871e8 temporay up 2020-02-07 11:46:35 +08:00
gazebo
1b8d792a2c 达达配送用新接口 2020-02-07 11:27:03 +08:00
gazebo
811ddc82b3 获取门店信息时,特殊处理江阴这种县级市 2020-02-07 09:38:25 +08:00
gazebo
b864b0983d 打印机调试信息 2020-02-06 17:36:20 +08:00
gazebo
a1d6c807c5 后天 2020-02-05 17:13:09 +08:00
gazebo
11f63d6fd4 京西商城配送时间范围添加后天 2020-02-05 17:09:29 +08:00
gazebo
2ea4f30326 打印到家订单 2020-02-05 10:16:34 +08:00
gazebo
f118cd8331 到家商城的订单发通知消息
+Store.LinkStoreID
2020-02-04 16:20:09 +08:00
gazebo
b76404d31d up 2020-02-04 14:26:13 +08:00
gazebo
01aa502c45 SyncQualify 2020-02-04 14:21:08 +08:00
gazebo
69759189e8 ProfitSharing=Y 2020-02-04 09:25:17 +08:00
gazebo
833b7bcbed 京东,饿百不同步配送范围 2020-02-03 20:56:49 +08:00
苏尹岚
a158558609 Accept Merge Request #171: (su -> mark)
Merge Request: 操作日志增加错误相关,通错误返回平台名
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/171
2020-02-03 14:15:55 +08:00
苏尹岚
4439135bbd 操作日志查询增加错误,关键字,同步错误返回显示平台名 2020-02-03 11:49:14 +08:00
gazebo
6f62dcfe30 忽略饿百同步错误201101 2020-02-03 11:31:25 +08:00