苏尹岚
|
6887fbc18a
|
读取永辉excel
|
2019-11-29 15:03:59 +08:00 |
|
苏尹岚
|
b4db130c5e
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-29 14:35:36 +08:00 |
|
苏尹岚
|
595572ef14
|
获取京东用户列表
|
2019-11-29 14:33:38 +08:00 |
|
gazebo
|
a4cdd45487
|
up
|
2019-11-29 12:07:33 +08:00 |
|
苏尹岚
|
2e4c408170
|
读取永辉excel
|
2019-11-29 11:56:47 +08:00 |
|
gazebo
|
2d653c2e19
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-29 11:13:56 +08:00 |
|
gazebo
|
4c948798f1
|
up
|
2019-11-29 11:13:46 +08:00 |
|
苏尹岚
|
519c4eadec
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-29 11:09:48 +08:00 |
|
苏尹岚
|
34ee046ce2
|
获取京东用户修改，刷新订单结算价修改
|
2019-11-29 11:09:07 +08:00 |
|
gazebo
|
ab493a59fb
|
+GetMyOrders
|
2019-11-29 10:35:38 +08:00 |
|
gazebo
|
3756ac67b2
|
调整依赖结构，jxutils不依赖于dao，dao依赖于jxutils
|
2019-11-29 08:43:36 +08:00 |
|
gazebo
|
211ff82517
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-28 18:55:24 +08:00 |
|
gazebo
|
1bda4d6058
|
+OrderManager.CreateAfsOrderFromOrder
|
2019-11-28 18:54:52 +08:00 |
|
苏尹岚
|
d85f595fee
|
读取永辉excel
|
2019-11-28 17:58:08 +08:00 |
|
苏尹岚
|
fac0e95546
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-28 17:52:34 +08:00 |
|
gazebo
|
b998b2b91c
|
conf 4 jd
|
2019-11-28 17:26:35 +08:00 |
|
gazebo
|
406b522d05
|
ForceUpdateVendorPrice找不到门店商品时，给出具体信息
|
2019-11-28 15:52:36 +08:00 |
|
苏尹岚
|
c0d9b2e6b8
|
读取永辉excel
|
2019-11-28 15:25:57 +08:00 |
|
苏尹岚
|
ef8acccb3b
|
读取永辉excel
|
2019-11-28 15:07:11 +08:00 |
|
gazebo
|
9c37dd84fc
|
remove SkuCategory.ElmCategoryID and WscCategoryID
|
2019-11-28 15:01:44 +08:00 |
|
苏尹岚
|
6fb1142e67
|
读取永辉excel
|
2019-11-28 14:54:23 +08:00 |
|
苏尹岚
|
4c61474de7
|
读取永辉excel
|
2019-11-28 14:53:14 +08:00 |
|
gazebo
|
0145442512
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-28 14:29:55 +08:00 |
|
gazebo
|
ae0fb69866
|
订单列表返回城市与区名
|
2019-11-28 14:29:42 +08:00 |
|
苏尹岚
|
e30808a752
|
Accept Merge Request #42: (yonghui -> mark)
Merge Request: 查找京东用户
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/42
|
2019-11-28 14:26:10 +08:00 |
|
gazebo
|
45827aceb5
|
+CanSwitch2SelfDeliver，美团预定单是不能转自送的
减小转自送失败尝试时间间隙至3秒（以免出现不能取消三方运单的情况）
|
2019-11-28 14:18:52 +08:00 |
|
gazebo
|
2c21ea4385
|
up
|
2019-11-28 14:08:18 +08:00 |
|
gazebo
|
57cc23f36b
|
ForceUpdateVendorPrice中由ActPrice替换ActualActPrice
|
2019-11-28 13:51:17 +08:00 |
|
gazebo
|
1a64005d81
|
up
|
2019-11-28 13:43:05 +08:00 |
|
gazebo
|
fb758e1211
|
up
|
2019-11-28 13:35:20 +08:00 |
|
gazebo
|
4ca1f56cb6
|
不需要token的API添加可选参数token(以便转入时能输出token信息）
|
2019-11-28 10:32:54 +08:00 |
|
gazebo
|
412fe44d32
|
按活动要求强制刷新商品平台价
|
2019-11-28 08:59:56 +08:00 |
|
苏尹岚
|
bbc9be5503
|
查找京东商城用户关联的活跃门店
|
2019-11-28 08:49:53 +08:00 |
|
苏尹岚
|
5cf58c44b0
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-28 08:37:22 +08:00 |
|
gazebo
|
b91163cb18
|
addOrderStatus中，修改订单状态更新逻辑：
1，只有终止状态，或解锁事件才会解锁
|
2019-11-27 21:15:09 +08:00 |
|
gazebo
|
d836376ac3
|
fk
|
2019-11-27 18:02:47 +08:00 |
|
gazebo
|
d6205e955d
|
fk
|
2019-11-27 17:59:28 +08:00 |
|
gazebo
|
d6e172f6f9
|
fk
|
2019-11-27 17:32:38 +08:00 |
|
gazebo
|
47803c64e4
|
up
|
2019-11-27 17:24:21 +08:00 |
|
苏尹岚
|
814795b1f8
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-27 15:02:37 +08:00 |
|
gazebo
|
cea72b06de
|
SetJdCookie
|
2019-11-27 14:56:47 +08:00 |
|
gazebo
|
1eff6bfd43
|
QueryPageStores添加radius,lng,lat参数
|
2019-11-27 14:34:30 +08:00 |
|
苏尹岚
|
7c913c0d5b
|
根据微盟更新京西价修改
|
2019-11-27 11:04:03 +08:00 |
|
苏尹岚
|
38b81a320e
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-27 10:08:12 +08:00 |
|
gazebo
|
53efea0eb4
|
配送费设置为0调试
|
2019-11-27 10:06:58 +08:00 |
|
苏尹岚
|
491fddf6ed
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-27 10:06:12 +08:00 |
|
苏尹岚
|
3ffb353901
|
老格拓店恢复
|
2019-11-27 10:05:57 +08:00 |
|
gazebo
|
7410da75fd
|
+GetOrderPay
GetOrders添加参数isPurchase
|
2019-11-27 10:05:26 +08:00 |
|
gazebo
|
4b1b011459
|
微信支付时，body必须填
|
2019-11-27 08:44:49 +08:00 |
|
苏尹岚
|
7913fc96b9
|
导出微盟订单修改
|
2019-11-27 08:23:34 +08:00 |
|