Commit Graph

5143 Commits

Author SHA1 Message Date
苏尹岚
86531c614f 禁用用户 2020-02-21 16:52:39 +08:00
苏尹岚
cb70240c67 用户禁用测试2 2020-02-21 16:47:24 +08:00
苏尹岚
ddc0994456 禁用用户测试 2020-02-21 16:44:14 +08:00
苏尹岚
f054243c77 查询未拣货订单商品统计 2020-02-21 16:14:16 +08:00
苏尹岚
05eb9b6a8e 饿鲜达商品分类修改 2020-02-21 14:39:57 +08:00
苏尹岚
aa8f84b94e 刷新饿鲜达商品分类优化 2020-02-21 14:31:43 +08:00
苏尹岚
4b5a6aeaa7 刷新饿鲜达商品分类分离 2020-02-21 14:26:42 +08:00
苏尹岚
ed1bc0d0d5 饿百cookie2过期了 2020-02-21 14:08:50 +08:00
苏尹岚
5ee6af40d2 Merge remote-tracking branch 'origin/mark' into su 2020-02-21 14:05:06 +08:00
苏尹岚
fcb37966e9 新增ebai2API 2020-02-21 14:01:51 +08:00
苏尹岚
dbff805874 合并饿鲜达商品库并刷新分类 2020-02-21 13:43:54 +08:00
苏尹岚
f98dae15f9 合并饿鲜达商品库并刷新分类 2020-02-21 13:30:34 +08:00
gazebo
fb8bce878f dada notify msg 2020-02-21 11:32:43 +08:00
gazebo
79a14a2235 del 2020-02-21 11:18:04 +08:00
gazebo
6db018debb 取消GetStores,GetStoreVendorMaps的token要求 2020-02-21 11:13:24 +08:00
gazebo
a8382e99a6 up 2020-02-21 11:05:12 +08:00
gazebo
98c608b649 dadadelivery Notify 2020-02-21 10:59:38 +08:00
gazebo
5a99e52796 up 2020-02-21 10:57:05 +08:00
gazebo
61744b8dde 达达配送KEY 2020-02-21 10:50:24 +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
苏尹岚
d1c00db614 Accept Merge Request #193: (su -> mark)
Merge Request: 饿鲜达订单缺少skuId
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/193
2020-02-21 10:05:55 +08:00
gazebo
aafc7655e5 SkuID为0时,设置为JxSkuID 2020-02-21 09:54:19 +08:00
苏尹岚
ffc5416186 饿鲜达cookie过期 2020-02-20 17:54:34 +08:00
苏尹岚
74cb4fbe1a Merge remote-tracking branch 'origin/mark' into su 2020-02-20 17:46:55 +08:00
苏尹岚
218ee04cb8 接口提交 2020-02-20 17:40:26 +08:00
苏尹岚
ab744bc6fb 饿鲜达商品库合并 2020-02-20 17:36:39 +08:00
苏尹岚
ae862fd7a6 美团力荐最终修改 2020-02-20 15:14:23 +08:00
苏尹岚
3b930b839f 美团力荐 2020-02-20 15:08:27 +08:00
苏尹岚
ca9b1eb260 美团力荐修改测试 2020-02-20 15:04:58 +08:00
苏尹岚
c659b39d46 美团力荐修改测试 2020-02-20 15:00:24 +08:00
苏尹岚
721eef997b 美团力荐修改测试 2020-02-20 14:56:20 +08:00
苏尹岚
37e61e2780 美团力荐修改 2020-02-20 14:49:47 +08:00
gazebo
da1dde3c1a 对于SkuID超范围的,改为设置成JxSkuID 2020-02-20 14:37:50 +08:00
gazebo
4159a6198e 对于SkuID超范围的,改为设置成JxSkuID 2020-02-20 14:36:17 +08:00
苏尹岚
d0a0e25912 修改美团力荐功能 2020-02-20 14:11:32 +08:00
苏尹岚
9b48d6d1a4 Accept Merge Request #192: (su -> mark)
Merge Request: 啊
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/192
2020-02-20 12:51:31 +08:00
gazebo
5af6ecf0c5 up 2020-02-20 12:50:52 +08:00
gazebo
313cd9a226 up 2020-02-20 12:46:36 +08:00
gazebo
db1ac781c7 updateSingleOrderEarningPrice中直接使用v.SkuID的问题 2020-02-20 12:21:51 +08:00
gazebo
4ea2b7d044 weimob order nameIDs 2020-02-20 12:21:51 +08:00
gazebo
692b1a6f01 updateSingleOrderEarningPrice中直接使用v.SkuID的问题 2020-02-20 12:10:08 +08:00
苏尹岚
c7daa3c479 美团力荐修改 2020-02-20 11:06:47 +08:00
苏尹岚
a1e318aee7 新增饿鲜达商品导入,bug修复 2020-02-20 10:34:22 +08:00
gazebo
899184e1ad weimob order nameIDs 2020-02-20 09:24:16 +08:00
苏尹岚
a15102c12b 根据用户有无手机号返回tokentype退回 2020-02-19 18:34:29 +08:00
苏尹岚
6719daaf05 根据用户有无手机号返回tokentype 2020-02-19 18:25:25 +08:00
苏尹岚
9919f66072 根据用户有无手机号返回tokentype 2020-02-19 18:20:51 +08:00
苏尹岚
c06f4fb9f0 alpha端口修改 2020-02-19 17:10:18 +08:00