Commit Graph

789 Commits

Author SHA1 Message Date
gazebo
412fe44d32 按活动要求强制刷新商品平台价 2019-11-28 08:59:56 +08:00
gazebo
1eff6bfd43 QueryPageStores添加radius,lng,lat参数 2019-11-27 14:34:30 +08:00
gazebo
7410da75fd +GetOrderPay
GetOrders添加参数isPurchase
2019-11-27 10:05:26 +08:00
gazebo
6145142f58 +model.OrderStatusPayed 2019-11-26 17:39:13 +08:00
苏尹岚
20cb7b4414 Accept Merge Request #41: (yonghui -> mark)
Merge Request: 根据微盟价更新京西价修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/41
2019-11-26 17:12:50 +08:00
苏尹岚
80c5560faf 根据微盟更新京西价 2019-11-26 17:07:52 +08:00
gazebo
d0f59c3f4b fk 2019-11-26 12:00:07 +08:00
gazebo
af7ba61bbc bug fix 2019-11-26 11:47:33 +08:00
gazebo
b8a293c296 up 2019-11-26 11:00:49 +08:00
苏尹岚
3c36f76b58 Accept Merge Request #37: (yonghui -> mark)
Merge Request: 统计订单查询bug修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/37
2019-11-25 17:40:58 +08:00
苏尹岚
aae1689fc3 订单统计查询bug修改 2019-11-25 17:40:05 +08:00
苏尹岚
d49446a155 Accept Merge Request #36: (yonghui -> mark)
Merge Request: 统计订单查询bug修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/36
2019-11-25 17:04:42 +08:00
苏尹岚
0f582721f2 统计订单查询bug修改 2019-11-25 17:02:35 +08:00
gazebo
3a032c18cd 直营店始终按比例结算 2019-11-21 18:14:55 +08:00
gazebo
db9e80212f 微信支付退款 2019-11-21 09:20:56 +08:00
gazebo
358e3eea1e Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-11-20 16:04:29 +08:00
gazebo
1195e194a1 +Pay4Order 2019-11-20 15:55:09 +08:00
苏尹岚
ebe4319ab0 Merge remote-tracking branch 'origin/mark' into su 2019-11-18 14:42:07 +08:00
苏尹岚
a1e834a0bc 时间校验修改 2019-11-18 14:41:56 +08:00
gazebo
8db8cfa6bc comment 2019-11-18 11:19:05 +08:00
苏尹岚
b31adda4d5 商品可售时间设置校验 2019-11-18 09:37:52 +08:00
苏尹岚
a8b954cd89 刷新商品可售状态 2019-11-15 13:52:56 +08:00
苏尹岚
4d013ad28b 定时刷新商品可售状态 2019-11-15 11:58:53 +08:00
苏尹岚
744d28d36f Merge remote-tracking branch 'origin/mark' into su 2019-11-15 10:07:56 +08:00
苏尹岚
7305f1a6af 定时更改商品可售状态 2019-11-15 09:47:10 +08:00
苏尹岚
bcc534289a 定时刷新商品可售状态 2019-11-14 18:03:34 +08:00
gazebo
9a67c62892 商家分类重排序后,没有正确处理单门店平台的同步逻辑修复 2019-11-14 16:14:56 +08:00
苏尹岚
3da95b29f8 Merge remote-tracking branch 'origin/mark' into su 2019-11-14 11:45:32 +08:00
苏尹岚
e15e7ed9e2 定时修改商品可售状态 2019-11-14 11:45:16 +08:00
gazebo
5935c94aca 避免价格包因为有小数导致的问题 2019-11-13 17:30:54 +08:00
gazebo
7f231d1f6a StoreSkuBind添加JxPrice 2019-11-13 15:16:11 +08:00
gazebo
ca3404dd77 up 2019-11-12 14:02:42 +08:00
gazebo
18ff115fc6 SkuNamePrefixNames中去除“鱼腥草” 2019-11-12 11:30:26 +08:00
gazebo
88b0241955 up 2019-11-11 14:36:14 +08:00
gazebo
71b01c44f9 美团评价自动回复 2019-11-11 11:59:27 +08:00
gazebo
f710444cbf Store.ChangePriceType新增StoreChangePriceTypeManagedStore 2019-11-11 10:11:43 +08:00
gazebo
83f9493352 价格包参数添加priceAdd 2019-11-11 09:20:14 +08:00
gazebo
a7164bb511 添加User.Avatar 2019-11-08 17:32:46 +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
苏尹岚
0854c131cb 刷新历史订单结算价修改 2019-11-08 11:54:06 +08:00
苏尹岚
406c3e56e4 刷新历史订单结算价 2019-11-07 18:03:13 +08:00
苏尹岚
c5e4684492 刷新历史订单结算价 2019-11-07 16:54:51 +08:00
苏尹岚
98c1279ffe 刷新历史订单结算价 2019-11-07 11:17:01 +08:00
苏尹岚
9c5c282735 刷新历史订单修改 2019-11-07 10:55:26 +08:00
gazebo
d01da6020a 整理京西自有PHP商城相关的代码 2019-11-06 18:20:34 +08:00
gazebo
5cc9787403 QueryFoodRecipes添加skuIDs参数 2019-11-06 17:16:35 +08:00
gazebo
5015620015 +IsVendorRemote 2019-11-06 16:57:22 +08:00
苏尹岚
3bf3f7ab5d 刷新历史订单结算价 2019-11-06 15:29:42 +08:00