苏尹岚
|
2e4c408170
|
读取永辉excel
|
2019-11-29 11:56:47 +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 |
|
苏尹岚
|
d85f595fee
|
读取永辉excel
|
2019-11-28 17:58:08 +08:00 |
|
苏尹岚
|
fac0e95546
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-28 17:52:34 +08:00 |
|
gazebo
|
406b522d05
|
ForceUpdateVendorPrice找不到门店商品时，给出具体信息
|
2019-11-28 15:52:36 +08:00 |
|
苏尹岚
|
c0d9b2e6b8
|
读取永辉excel
|
2019-11-28 15:25:57 +08:00 |
|
苏尹岚
|
ef8acccb3b
|
读取永辉excel
|
2019-11-28 15:07:11 +08:00 |
|
苏尹岚
|
6fb1142e67
|
读取永辉excel
|
2019-11-28 14:54:23 +08:00 |
|
苏尹岚
|
4c61474de7
|
读取永辉excel
|
2019-11-28 14:53:14 +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
|
45827aceb5
|
+CanSwitch2SelfDeliver，美团预定单是不能转自送的
减小转自送失败尝试时间间隙至3秒（以免出现不能取消三方运单的情况）
|
2019-11-28 14:18:52 +08:00 |
|
gazebo
|
2c21ea4385
|
up
|
2019-11-28 14:08:18 +08:00 |
|
gazebo
|
57cc23f36b
|
ForceUpdateVendorPrice中由ActPrice替换ActualActPrice
|
2019-11-28 13:51:17 +08:00 |
|
gazebo
|
1a64005d81
|
up
|
2019-11-28 13:43:05 +08:00 |
|
gazebo
|
412fe44d32
|
按活动要求强制刷新商品平台价
|
2019-11-28 08:59:56 +08:00 |
|
苏尹岚
|
bbc9be5503
|
查找京东商城用户关联的活跃门店
|
2019-11-28 08:49:53 +08:00 |
|
苏尹岚
|
7c913c0d5b
|
根据微盟更新京西价修改
|
2019-11-27 11:04:03 +08:00 |
|
苏尹岚
|
491fddf6ed
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-27 10:06:12 +08:00 |
|
苏尹岚
|
3ffb353901
|
老格拓店恢复
|
2019-11-27 10:05:57 +08:00 |
|
gazebo
|
7410da75fd
|
+GetOrderPay
GetOrders添加参数isPurchase
|
2019-11-27 10:05:26 +08:00 |
|
苏尹岚
|
7913fc96b9
|
导出微盟订单修改
|
2019-11-27 08:23:34 +08:00 |
|
苏尹岚
|
852f3510da
|
Merge remote-tracking branch 'origin/mark' into yonghui
|
2019-11-26 18:31:19 +08:00 |
|
苏尹岚
|
f8283bb159
|
导出微盟订单修改
|
2019-11-26 18:31:04 +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 |
|
苏尹岚
|
2c4fce2956
|
Accept Merge Request #40: (yonghui -> mark)
Merge Request: 读取微盟订单bug修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/40
|
2019-11-26 12:02:10 +08:00 |
|
苏尹岚
|
fd8b6c957f
|
读取微盟订单商品bug修改
|
2019-11-26 12:01:29 +08:00 |
|
苏尹岚
|
d16bab2e77
|
Accept Merge Request #39: (yonghui -> mark)
Merge Request: 获取微盟订单信息bug修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/39
|
2019-11-26 11:43:38 +08:00 |
|
苏尹岚
|
a9df406011
|
获取微盟订单商品信息bug修改
|
2019-11-26 11:42:20 +08:00 |
|
gazebo
|
ed0f172865
|
京西活动不设置同步标志
|
2019-11-26 11:15:14 +08:00 |
|
gazebo
|
4e9d09657c
|
up
|
2019-11-26 11:05:26 +08:00 |
|
苏尹岚
|
8eef3288db
|
获取微盟订单信息
|
2019-11-26 09:36:46 +08:00 |
|
gazebo
|
a9d8df2f8c
|
JdStoreInfo1125
|
2019-11-25 13:48:20 +08:00 |
|
苏尹岚
|
88b84ef014
|
Accept Merge Request #34: (yonghui -> mark)
Merge Request: 永辉excel
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/34
|
2019-11-22 19:09:36 +08:00 |
|
苏尹岚
|
ae6ad69d8c
|
yonghuiexcel
|
2019-11-22 19:08:48 +08:00 |
|
gazebo
|
5d2e9be549
|
创建活动时，OriginalPrice返回京西价
|
2019-11-22 18:32:31 +08:00 |
|
苏尹岚
|
70bf3a70a9
|
永辉Excel接口修改
|
2019-11-22 18:03:12 +08:00 |
|
苏尹岚
|
92b9f96889
|
读取永辉Excel接口修改
|
2019-11-22 17:59:48 +08:00 |
|
苏尹岚
|
ab3741ae2b
|
Accept Merge Request #32: (yonghui -> mark)
Merge Request: 读取永辉Excel修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/32
|
2019-11-22 17:00:06 +08:00 |
|
gazebo
|
aa5a8bacc0
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-22 17:00:10 +08:00 |
|
苏尹岚
|
34759f564b
|
读取永辉Excel修改
|
2019-11-22 16:59:31 +08:00 |
|
苏尹岚
|
3540f359b0
|
Accept Merge Request #31: (yonghui -> mark)
Merge Request: 读取永辉excel修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/31
|
2019-11-22 16:50:45 +08:00 |
|
苏尹岚
|
edd32038eb
|
读取永辉excel
|
2019-11-22 16:49:52 +08:00 |
|
gazebo
|
f7144ecde1
|
GetStoresSkus返回商品可售时段
|
2019-11-22 16:39:29 +08:00 |
|
苏尹岚
|
01f872a36d
|
Accept Merge Request #30: (yonghui -> mark)
Merge Request: 永辉excel新需求完善
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/30
|
2019-11-22 16:15:33 +08:00 |
|
苏尹岚
|
15757c6f30
|
读取永辉Excel新需求完善
|
2019-11-22 16:06:13 +08:00 |
|
gazebo
|
36403a3797
|
fk
|
2019-11-22 10:52:42 +08:00 |
|