liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,275 Commits 4 Branches 0 Tags
22959ce4ade80205c53c8ddb32aee4ef0fbe4366
Commit Graph

1173 Commits

Author SHA1 Message Date
gazebo
8c5c0bb83b 限制京东门名长度 2020-01-02 10:55:20 +08:00
gazebo
174727bafc comment 2019-12-31 09:42:55 +08:00
gazebo
d01efb378c 处理饿百订单有时取不到一些字段的情况 2019-12-31 09:42:06 +08:00
gazebo
3ee2e72a5e 美团饿百打包费改为统一系统参数 2019-12-30 18:07:26 +08:00
gazebo
f1d025eb15 +StoreMap.BoxFee 
美团外卖支持打包袋费，美团商品统一添加1角打包费
 2019-12-30 16:50:32 +08:00
gazebo
384daa4819 fk 2019-12-28 20:34:36 +08:00
gazebo
9bd240a22f 处理美团AppFood中可能没有sku的情况 2019-12-27 23:02:36 +08:00
gazebo
1ea84798f3 up 2019-12-27 18:02:05 +08:00
gazebo
3547ee4f5e 美团活动支持秒杀 2019-12-27 17:47:06 +08:00
gazebo
1093ae8829 up 2019-12-27 11:31:55 +08:00
苏尹岚
edbe3a92f7 Accept Merge Request #116: (yonghui -> mark) 
Merge Request: 根据skuid 批量关注可售
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/116
 2019-12-26 16:24:13 +08:00
gazebo
381d1b2f21 调整加订单配送小费逻辑，添加美团外卖平台支持 2019-12-26 16:19:04 +08:00
gazebo
deadc8f563 UpdateOrderWaybillTip 2019-12-26 14:18:16 +08:00
苏尹岚
9a05638ad2 投诉骑手增加测试判断 2019-12-26 09:43:24 +08:00
gazebo
6c13f113e8 jdapi.AdjustOrder处理重复 2019-12-25 21:54:16 +08:00
gazebo
6022d24634 GetOrderWaybillInfo可选参数：isGetPos支持获取运单骑手实时信息 2019-12-25 20:14:53 +08:00
gazebo
1f03a84fa6 修复onAfsOrderMsg中afsOrder没有正确赋值的bug 2019-12-25 16:39:01 +08:00
gazebo
880d2aedc0 配送相关接口调整 2019-12-25 15:32:58 +08:00
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