徐建华
|
34a1f1d954
|
Accept Merge Request #48: (yonghui -> mark)
Merge Request: 门店订单归属补漏
Created By: @苏尹岚
Accepted By: @徐建华
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/48
|
2019-12-02 14:37:09 +08:00 |
|
gazebo
|
351551bfe1
|
up
|
2019-12-02 14:24:23 +08:00 |
|
苏尹岚
|
d4edd5d06d
|
订单门钉归属修改
|
2019-12-02 11:30:36 +08:00 |
|
苏尹岚
|
410f671a36
|
冲突修改
|
2019-12-02 11:14:20 +08:00 |
|
苏尹岚
|
3c5afc31b6
|
接口位置移动，门店归属补漏修改，获取京东用户修改
|
2019-12-02 11:12:09 +08:00 |
|
gazebo
|
0a42beac8a
|
+GetMyOrderCountInfo
|
2019-12-02 11:00:57 +08:00 |
|
苏尹岚
|
6c0c837fae
|
门店归属订单不漏
|
2019-11-29 17:48:29 +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 |
|
苏尹岚
|
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
|
412fe44d32
|
按活动要求强制刷新商品平台价
|
2019-11-28 08:59:56 +08:00 |
|
苏尹岚
|
bbc9be5503
|
查找京东商城用户关联的活跃门店
|
2019-11-28 08:49:53 +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 |
|
苏尹岚
|
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 |
|
苏尹岚
|
aae1689fc3
|
订单统计查询bug修改
|
2019-11-25 17:40:05 +08:00 |
|
苏尹岚
|
0f582721f2
|
统计订单查询bug修改
|
2019-11-25 17:02:35 +08:00 |
|
苏尹岚
|
a1e834a0bc
|
时间校验修改
|
2019-11-18 14:41:56 +08:00 |
|
苏尹岚
|
a8b954cd89
|
刷新商品可售状态
|
2019-11-15 13:52:56 +08:00 |
|
苏尹岚
|
4d013ad28b
|
定时刷新商品可售状态
|
2019-11-15 11:58:53 +08:00 |
|
苏尹岚
|
7305f1a6af
|
定时更改商品可售状态
|
2019-11-15 09:47:10 +08:00 |
|
苏尹岚
|
bcc534289a
|
定时刷新商品可售状态
|
2019-11-14 18:03:34 +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
|
71b01c44f9
|
美团评价自动回复
|
2019-11-11 11:59:27 +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
|
5cc9787403
|
QueryFoodRecipes添加skuIDs参数
|
2019-11-06 17:16:35 +08:00 |
|
苏尹岚
|
3bf3f7ab5d
|
刷新历史订单结算价
|
2019-11-06 15:29:42 +08:00 |
|
苏尹岚
|
365cad0bfb
|
刷新历史订单结算价
|
2019-11-06 15:16:41 +08:00 |
|
gazebo
|
208e836f40
|
整理订单调整中对于DeliveryType相关的流程
|
2019-11-06 14:29:13 +08:00 |
|
gazebo
|
444e3dadd9
|
尽量去除VendorIDWSC与VendorIDJX相关的无用代码
|
2019-11-05 17:21:21 +08:00 |
|
gazebo
|
99868cd068
|
优化修改价格包时，更新门店商品同步状态的速度
|
2019-11-04 17:06:31 +08:00 |
|
苏尹岚
|
e1b7f82be3
|
对比差异文件修改
|
2019-11-04 15:21:05 +08:00 |
|
gazebo
|
7a1972680b
|
改价格包时，不用事务
|
2019-11-01 21:02:00 +08:00 |
|
苏尹岚
|
5faa752554
|
对比差异程序修改
|
2019-11-01 16:11:19 +08:00 |
|