Commit Graph

1330 Commits

Author SHA1 Message Date
gazebo
5504b43d4f ebai.CreateStoreSkus中,饿百平台有BUG,会导致新建一个之前删除的商品时,信息不会及时更新,强制刷新一下 2019-12-24 17:47:22 +08:00
gazebo
85d909234d 饿百在配送中状态时,尝试刷新TotalShopMoney 2019-12-24 12:12:34 +08:00
gazebo
23136cc467 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-23 15:44:42 +08:00
gazebo
fb599e610c fix ebai BaseFreightMoney 2019-12-23 15:44:25 +08:00
苏尹岚
943c4a723d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-23 15:38:01 +08:00
gazebo
c28247e6b7 +GoodsOrder.BaseFreightMoney 2019-12-23 15:35:34 +08:00
苏尹岚
166f5320d3 投诉骑手 2019-12-23 15:27:06 +08:00
苏尹岚
7766c9428d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-20 14:41:53 +08:00
苏尹岚
0a8a0faec4 exprefix索引,order修改 2019-12-20 14:32:14 +08:00
苏尹岚
b8f7ffea18 获取门店商品价格 2019-12-20 11:40:04 +08:00
gazebo
015e098a6c 订单打印去掉ActualPayPrice 2019-12-20 11:28:35 +08:00
苏尹岚
d6d4ab23bb Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-20 11:23:16 +08:00
gazebo
163b27ca6e wxpay partner 2019-12-20 11:19:47 +08:00
苏尹岚
58e3066d19 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 18:40:58 +08:00
gazebo
4c698967d0 wxpay to wxpayapi 2019-12-19 16:29:15 +08:00
gazebo
850c35c9d9 调整京西商城支付 2019-12-19 16:20:10 +08:00
苏尹岚
a3c236d281 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 15:24:31 +08:00
gazebo
9498542e59 修复订单调度定时器的BUG
PickupGoods失败后判断订单状态如果是已经大于拣货完成,则忽略错误
2019-12-19 12:07:15 +08:00
苏尹岚
480bfb4ed8 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-19 10:55:59 +08:00
gazebo
5f1c793a37 mtwm的partner.FuncUpdateStoreSkus改为1 2019-12-19 08:28:44 +08:00
苏尹岚
7fdb107e6f Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-18 15:19:39 +08:00
苏尹岚
990f3a2da2 pr修改 2019-12-18 15:19:22 +08:00
gazebo
d1cb4a8c8b 饿百输出回调消息 2019-12-18 10:50:14 +08:00
gazebo
9a68b63b5e ebai.onOrderMsg 2019-12-18 10:41:04 +08:00
苏尹岚
8cd09089a8 组合名字函数修改 2019-12-18 10:06:14 +08:00
苏尹岚
404a7b9040 jdsku冲突解决 2019-12-18 09:17:43 +08:00
gazebo
0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel 2019-12-17 18:01:24 +08:00
苏尹岚
3feff96127 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-17 17:35:12 +08:00
苏尹岚
9fdae12a66 增加商品额外前缀 2019-12-17 17:34:51 +08:00
gazebo
2c69e934f8 限制饿百平台的商家分类名长度 2019-12-17 17:23:46 +08:00
gazebo
b6e8c33012 去除老的sku与category相关多门店平台接口 2019-12-17 16:51:45 +08:00
gazebo
64c7aec3c3 +jd.VenderAuditApplyCancelOrder 2019-12-17 15:55:46 +08:00
苏尹岚
b2994f13cd Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-17 14:10:59 +08:00
苏尹岚
a02dbdeacc 更改平台门店名称 2019-12-17 14:10:44 +08:00
gazebo
6e3ee7c9c1 京西商城订单取消 2019-12-17 14:05:43 +08:00
苏尹岚
57fb6ac078 更新门店公告 2019-12-17 10:42:48 +08:00
苏尹岚
6afbfb156a 刷新京东等级 2019-12-16 18:32:32 +08:00
苏尹岚
245e793ce3 根据名字查询upc码,获取京东等级修改 2019-12-16 16:12:56 +08:00
gazebo
eb78052a13 删除没有商家ID的京东SKU时,先设置商家ID后再删除 2019-12-16 11:56:35 +08:00
gazebo
ff6cd228a6 jd.postFakeMsg中正确设置AppKey 2019-12-16 10:19:54 +08:00
gazebo
cd267503f8 fk 2019-12-16 09:35:05 +08:00
gazebo
f1a7440e3e debug AppKey2OrgCode 2019-12-16 09:21:25 +08:00
gazebo
a576389993 up 2019-12-13 17:34:15 +08:00
gazebo
f941ea1807 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-13 17:28:23 +08:00
gazebo
7aad8398cf jd.isSkuMustHaveUpc 2019-12-13 17:28:04 +08:00
苏尹岚
3412f95380 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-13 16:55:10 +08:00
gazebo
032bb05157 京东平台,不为份的SKU,如果没有设置upc,自动生成一个假的 2019-12-13 16:41:16 +08:00
苏尹岚
27acc3b814 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-13 16:38:35 +08:00
苏尹岚
334c012818 获取京东门店等级 2019-12-13 16:38:18 +08:00
gazebo
5a37a9cf28 up 2019-12-13 16:22:22 +08:00