苏尹岚
|
0380394030
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-09 10:49:18 +08:00 |
|
苏尹岚
|
cbd050d02d
|
导出各平台未营业门店
|
2019-12-09 10:49:02 +08:00 |
|
gazebo
|
992711c5c2
|
restore
|
2019-12-09 10:38:50 +08:00 |
|
gazebo
|
0587e883e0
|
京东回调api切换至新接口
|
2019-12-09 09:38:53 +08:00 |
|
gazebo
|
441fa5e3d8
|
fk
|
2019-12-08 18:47:15 +08:00 |
|
gazebo
|
039f87c8dc
|
!!!门店相关的API全部添加vendorOrgCode依赖
|
2019-12-06 17:20:55 +08:00 |
|
gazebo
|
92ecba727d
|
新SyncSkus基本能工作
|
2019-12-06 14:55:16 +08:00 |
|
gazebo
|
9c2c65d266
|
去掉SkuCategoryWithVendor
|
2019-12-06 09:41:11 +08:00 |
|
gazebo
|
d6d59e4ef5
|
!!!调整SkuStoreCatInfo与StoreSkuSyncInfo中SyncStatus的字段名
|
2019-12-05 18:22:12 +08:00 |
|
苏尹岚
|
496ff86ff4
|
Accept Merge Request #52: (yonghui -> mark)
Merge Request: 获取各平台未营业门店
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/52
|
2019-12-05 17:22:37 +08:00 |
|
gazebo
|
f2b686a60c
|
京西商城订单状态改改用异步
|
2019-12-05 16:28:39 +08:00 |
|
gazebo
|
d40a8cf035
|
generateOrder允许空商品列表
|
2019-12-05 15:45:33 +08:00 |
|
gazebo
|
6066e49014
|
sync2.SyncCategories, SyncReorderCategories
|
2019-12-05 15:30:05 +08:00 |
|
苏尹岚
|
8b29246088
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-12-05 14:47:08 +08:00 |
|
苏尹岚
|
9dd4c76074
|
获取各平台未营业门店
|
2019-12-05 14:46:52 +08:00 |
|
gazebo
|
64ffeb1279
|
fk
|
2019-12-05 12:30:45 +08:00 |
|
gazebo
|
e09dc5a4da
|
fk
|
2019-12-05 12:21:04 +08:00 |
|
gazebo
|
7c7457db40
|
微信退款bug
|
2019-12-05 12:14:31 +08:00 |
|
苏尹岚
|
6d677bab43
|
同步错误返回
|
2019-12-04 17:34:45 +08:00 |
|
苏尹岚
|
16a14e8b4d
|
同步错误返回
|
2019-12-04 11:56:02 +08:00 |
|
苏尹岚
|
4c4ed40c24
|
同步错误返回
|
2019-12-04 10:32:43 +08:00 |
|
苏尹岚
|
aade004105
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-12-04 09:17:27 +08:00 |
|
gazebo
|
55fdde9be2
|
LoopMultiStoresVendors引入OrgCode
|
2019-12-03 18:27:53 +08:00 |
|
gazebo
|
b25b7ebe41
|
fk
|
2019-12-03 16:38:20 +08:00 |
|
gazebo
|
86f37ba367
|
up
|
2019-12-03 16:36:20 +08:00 |
|
gazebo
|
c75769495a
|
remove some comment
|
2019-12-03 15:54:33 +08:00 |
|
gazebo
|
84dac23be8
|
京东回调消息根据token动态选择不同的配置
|
2019-12-03 15:07:50 +08:00 |
|
gazebo
|
c98299cdcb
|
debug
|
2019-12-03 11:48:16 +08:00 |
|
苏尹岚
|
2b979a4f68
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-12-03 11:30:40 +08:00 |
|
gazebo
|
30e918c5e2
|
删除历史无用的代码
|
2019-12-03 09:15:58 +08:00 |
|
gazebo
|
5c8af121d6
|
ExpectedDeliveredTime
|
2019-12-02 18:14:02 +08:00 |
|
gazebo
|
244c653398
|
mtwm.AcceptOrRefuseOrder中容错
|
2019-12-02 15:07:16 +08:00 |
|
gazebo
|
351551bfe1
|
up
|
2019-12-02 14:24:23 +08:00 |
|
gazebo
|
dc881a2acc
|
fk
|
2019-12-02 12:16:50 +08:00 |
|
gazebo
|
ab4251e5b9
|
OrderPrice的bug
|
2019-12-02 12:07:39 +08:00 |
|
gazebo
|
1454d08119
|
generateOrder中处理活动的情况
|
2019-12-02 11:32:28 +08:00 |
|
gazebo
|
0a42beac8a
|
+GetMyOrderCountInfo
|
2019-12-02 11:00:57 +08:00 |
|
gazebo
|
67976664e6
|
fk
|
2019-12-02 08:55:51 +08:00 |
|
gazebo
|
5f2da8a4dc
|
取消活动时，也要将act_store_sku_map中条目相应置删除标志
|
2019-11-29 20:27:07 +08:00 |
|
苏尹岚
|
c0b394f43d
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-29 17:52:28 +08:00 |
|
gazebo
|
d93356ad01
|
饿百在发送运单取消事件后，如果订单没有及时（具体时间未知）转出自送，则订单会被取消，且不会发送订单取消事件
|
2019-11-29 16:28:21 +08:00 |
|
gazebo
|
ab493a59fb
|
+GetMyOrders
|
2019-11-29 10:35:38 +08:00 |
|
gazebo
|
1bda4d6058
|
+OrderManager.CreateAfsOrderFromOrder
|
2019-11-28 18:54:52 +08:00 |
|
gazebo
|
45827aceb5
|
+CanSwitch2SelfDeliver，美团预定单是不能转自送的
减小转自送失败尝试时间间隙至3秒（以免出现不能取消三方运单的情况）
|
2019-11-28 14:18:52 +08:00 |
|
苏尹岚
|
363b44a21c
|
同步错误返回
|
2019-11-28 14:15:57 +08:00 |
|
苏尹岚
|
2a486ea2ba
|
同步错误返回
|
2019-11-28 11:47:19 +08:00 |
|
苏尹岚
|
a041906c86
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-28 09:49:47 +08:00 |
|
gazebo
|
53efea0eb4
|
配送费设置为0调试
|
2019-11-27 10:06:58 +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 |
|