徐建华
|
29e6559e17
|
Accept Merge Request #22: (su -> mark)
Merge Request: 刷新历史订单结算价
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/22
|
2019-11-08 15:35:41 +08:00 |
|
苏尹岚
|
68afef6a79
|
刷新历史订单结算价
|
2019-11-08 15:28:26 +08:00 |
|
gazebo
|
7d230ecf1e
|
修复删除饿百活动商品失败的bug
在删除门店商品失败时，尝试设置不可售
|
2019-11-08 15:24:51 +08:00 |
|
苏尹岚
|
29c92a0f12
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-08 15:23:28 +08:00 |
|
苏尹岚
|
b44f41d9d0
|
刷新历史订单结算价
|
2019-11-08 15:23:18 +08:00 |
|
gazebo
|
c5a01f1e9b
|
重构CalculateOrderDeliveryFee与QueryUserDeliveryAddress
|
2019-11-08 14:28:34 +08:00 |
|
苏尹岚
|
622d53cb4e
|
修改
|
2019-11-08 12:02:11 +08:00 |
|
苏尹岚
|
b417b731ff
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-08 11:54:21 +08:00 |
|
苏尹岚
|
0854c131cb
|
刷新历史订单结算价修改
|
2019-11-08 11:54:06 +08:00 |
|
gazebo
|
ae8b6a32c1
|
京东到家活动消息回调时，避免创建重复的活动
|
2019-11-08 09:39:43 +08:00 |
|
gazebo
|
f85c182f44
|
禁用与不同步的门店创建活动时排除
|
2019-11-08 09:01:59 +08:00 |
|
gazebo
|
025ead8c05
|
活动平台价直接使用当前存的，不重新计算
不同步的门店或禁用的门店不创建活动
|
2019-11-07 23:00:48 +08:00 |
|
gazebo
|
7ab34ae366
|
OnWaybillStatusChanged中收到运单接单事件，强制设置订单状态时，要判断订单是否已经结束了
|
2019-11-07 18:37:49 +08:00 |
|
苏尹岚
|
406c3e56e4
|
刷新历史订单结算价
|
2019-11-07 18:03:13 +08:00 |
|
苏尹岚
|
2339761b98
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-07 16:55:06 +08:00 |
|
苏尹岚
|
c5e4684492
|
刷新历史订单结算价
|
2019-11-07 16:54:51 +08:00 |
|
gazebo
|
3c7bb05649
|
一些API不需要token
|
2019-11-07 16:48:09 +08:00 |
|
gazebo
|
5d6e531058
|
修复计算活动比例的舍入误差
|
2019-11-07 15:45:10 +08:00 |
|
苏尹岚
|
241878c79a
|
刷新历史订单结算价修改
|
2019-11-07 11:26:20 +08:00 |
|
苏尹岚
|
98c1279ffe
|
刷新历史订单结算价
|
2019-11-07 11:17:01 +08:00 |
|
苏尹岚
|
9c5c282735
|
刷新历史订单修改
|
2019-11-07 10:55:26 +08:00 |
|
苏尹岚
|
ba2d403c73
|
对比程序修改
|
2019-11-07 09:14:56 +08:00 |
|
苏尹岚
|
8634f34ac5
|
对比差异程序修改
|
2019-11-07 08:55:37 +08:00 |
|
苏尹岚
|
5af2a702ed
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-07 08:55:09 +08:00 |
|
gazebo
|
0ca50bec4c
|
GetStores精简模式下清除图片相关的信息
|
2019-11-07 08:52:00 +08:00 |
|
苏尹岚
|
c0f51a08aa
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-07 08:50:53 +08:00 |
|
苏尹岚
|
1edba57a60
|
对比差异测试
|
2019-11-07 08:14:36 +08:00 |
|
gazebo
|
aa4a24f1b6
|
修复getStoresSql中错用storeIDs的bug
|
2019-11-06 18:48:00 +08:00 |
|
gazebo
|
d7360648ec
|
GetStores添加可选参数：briefLevel
|
2019-11-06 18:32:37 +08:00 |
|
gazebo
|
d01da6020a
|
整理京西自有PHP商城相关的代码
|
2019-11-06 18:20:34 +08:00 |
|
苏尹岚
|
9fb7c86594
|
Accept Merge Request #21: (su -> mark)
Merge Request: 刷新历史订单结算价
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/21
|
2019-11-06 17:21:15 +08:00 |
|
苏尹岚
|
29b3dc637e
|
刷新历史订单结算价
|
2019-11-06 17:19:20 +08:00 |
|
gazebo
|
5cc9787403
|
QueryFoodRecipes添加skuIDs参数
|
2019-11-06 17:16:35 +08:00 |
|
苏尹岚
|
87a8697242
|
刷新历史订单结算价
|
2019-11-06 17:11:19 +08:00 |
|
gazebo
|
5015620015
|
+IsVendorRemote
|
2019-11-06 16:57:22 +08:00 |
|
苏尹岚
|
8018cc7709
|
刷新历史订单结算价
|
2019-11-06 16:52:41 +08:00 |
|
gazebo
|
86c4ba802d
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-06 16:28:56 +08:00 |
|
gazebo
|
34c2b2c866
|
up
|
2019-11-06 16:26:01 +08:00 |
|
苏尹岚
|
3bf3f7ab5d
|
刷新历史订单结算价
|
2019-11-06 15:29:42 +08:00 |
|
苏尹岚
|
365cad0bfb
|
刷新历史订单结算价
|
2019-11-06 15:16:41 +08:00 |
|
苏尹岚
|
a1aaacc312
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-06 14:36:08 +08:00 |
|
gazebo
|
f5e2b711fb
|
SendMsg2Somebody不强制要求手机号
|
2019-11-06 14:32:44 +08:00 |
|
苏尹岚
|
89a5c2ac9f
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-06 14:32:40 +08:00 |
|
苏尹岚
|
186f19e81b
|
刷新历史订单结算价
|
2019-11-06 14:32:18 +08:00 |
|
gazebo
|
208e836f40
|
整理订单调整中对于DeliveryType相关的流程
|
2019-11-06 14:29:13 +08:00 |
|
苏尹岚
|
bec26311fb
|
刷新历史订单结算价
|
2019-11-06 10:20:17 +08:00 |
|
苏尹岚
|
89740b5451
|
刷新历史订单
|
2019-11-06 10:12:34 +08:00 |
|
gazebo
|
dc7d712ff6
|
up
|
2019-11-06 10:10:37 +08:00 |
|
gazebo
|
49a4b7b069
|
添加user2/GetSelfInfo
|
2019-11-06 10:00:36 +08:00 |
|
苏尹岚
|
0a9ec20006
|
刷新历史订单结算价修改
|
2019-11-06 09:40:19 +08:00 |
|