Commit Graph

80 Commits

Author SHA1 Message Date
gazebo
f77849d08a 京西商城订单随意取消 2020-02-11 17:28:53 +08:00
suyl
9d203c90e7 Merge remote-tracking branch 'origin/mark' into su 2020-02-07 13:49:20 +08:00
苏尹岚
8c602871e8 temporay up 2020-02-07 11:46:35 +08:00
gazebo
a1d6c807c5 后天 2020-02-05 17:13:09 +08:00
gazebo
11f63d6fd4 京西商城配送时间范围添加后天 2020-02-05 17:09:29 +08:00
gazebo
69759189e8 ProfitSharing=Y 2020-02-04 09:25:17 +08:00
gazebo
0c5d62e55f 京西商城订单序号 2020-02-01 12:23:15 +08:00
gazebo
06c97665ed 京西商城100274免配送费 2020-01-31 23:05:44 +08:00
gazebo
88748b4d99 实验StoreSkuAct 2020-01-16 10:47:42 +08:00
gazebo
26ca0bc01d 京西商城订单暂时不支持付款后取消 2020-01-07 14:29:29 +08:00
gazebo
11dd554561 BuyerCancelOrder 2020-01-07 10:29:51 +08:00
gazebo
880d2aedc0 配送相关接口调整 2019-12-25 15:32:58 +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
苏尹岚
8cd09089a8 组合名字函数修改 2019-12-18 10:06:14 +08:00
gazebo
0cc04cc9d2 +OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel 2019-12-17 18:01:24 +08:00
gazebo
b6e8c33012 去除老的sku与category相关多门店平台接口 2019-12-17 16:51:45 +08:00
gazebo
6e3ee7c9c1 京西商城订单取消 2019-12-17 14:05:43 +08:00
gazebo
db85de7454 +FullSyncVendorStuff 2019-12-11 22:30:32 +08:00
gazebo
2156c77dbf UploadImg添加vendorOrgCode参数 2019-12-11 17:42:56 +08:00
gazebo
95a669476e -partner.ReadSku
修改partner.GetSkus原型,添加vendorOrgCode,去除skuName
2019-12-11 15:44:42 +08:00
苏尹岚
55257f839d Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 17:20:54 +08:00
gazebo
8b9e36d59d 京东API几乎全部使用vendorOrgCode(除了GetSkus) 2019-12-10 15:52:09 +08:00
苏尹岚
62569dfe55 导入Excel更新京西价,推荐商品 2019-12-10 11:47:52 +08:00
gazebo
8b33ec5f5a 修复上次提交处理平台vendorOrgCode的bug 2019-12-09 15:45:09 +08:00
gazebo
ecedbe9be4 京东api区分vendorOrgCode 2019-12-09 15:16:21 +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
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
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
gazebo
b25b7ebe41 fk 2019-12-03 16:38:20 +08:00
gazebo
86f37ba367 up 2019-12-03 16:36:20 +08:00
gazebo
c98299cdcb debug 2019-12-03 11:48:16 +08:00
gazebo
5c8af121d6 ExpectedDeliveredTime 2019-12-02 18:14:02 +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
ab493a59fb +GetMyOrders 2019-11-29 10:35:38 +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