gazebo
|
cea72b06de
|
SetJdCookie
|
2019-11-27 14:56:47 +08:00 |
|
gazebo
|
1eff6bfd43
|
QueryPageStores添加radius,lng,lat参数
|
2019-11-27 14:34:30 +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 |
|
gazebo
|
881cf8b515
|
添加京东活动商品时，同时传入infoId与outInfoId参数（京东的bug）
|
2019-11-26 17:59:18 +08:00 |
|
gazebo
|
6145142f58
|
+model.OrderStatusPayed
|
2019-11-26 17:39:13 +08:00 |
|
gazebo
|
498a28bfe9
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-26 17:17:06 +08:00 |
|
gazebo
|
026e73cc21
|
CreateOrder返回的商品列表排序
|
2019-11-26 17:16:43 +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
|
e369341bdf
|
GetAvailableDeliverTime添加“立即送出”
|
2019-11-26 16:50:22 +08:00 |
|
gazebo
|
ca3b8a8907
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-26 16:17:14 +08:00 |
|
gazebo
|
2d1bfa4c1e
|
+GetAvailableDeliverTime
|
2019-11-26 16:16:54 +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 |
|
gazebo
|
d0f59c3f4b
|
fk
|
2019-11-26 12:00:07 +08:00 |
|
gazebo
|
b51389ab4f
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-26 11:47:41 +08:00 |
|
gazebo
|
af7ba61bbc
|
bug fix
|
2019-11-26 11:47:33 +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 |
|
gazebo
|
b8a293c296
|
up
|
2019-11-26 11:00:49 +08:00 |
|
gazebo
|
684c1091f8
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-26 09:47:35 +08:00 |
|
gazebo
|
5697cdbcff
|
防止京东活动重复记录
|
2019-11-26 09:47:02 +08:00 |
|
苏尹岚
|
8eef3288db
|
获取微盟订单信息
|
2019-11-26 09:36:46 +08:00 |
|
gazebo
|
22f60a4546
|
直营店始终按比例结算，不考虑活动与结算表
|
2019-11-26 08:58:49 +08:00 |
|
gazebo
|
01b11e0a55
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-25 18:14:13 +08:00 |
|
gazebo
|
72d6b3c733
|
自配送门店订单的三方配送限价直接为10元
|
2019-11-25 18:13:42 +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
|
63ee62eecc
|
后来又发现有订单（81710104014426376）在完成后，直接再被取消的情况，不能生成售后单，还是再允许完成后取消。。。
|
2019-11-25 16:09:40 +08:00 |
|
gazebo
|
622bfc89df
|
!!!重新实现订单调度timer，可以允许多个timer.
|
2019-11-25 15:49:38 +08:00 |
|
gazebo
|
f1b3547645
|
up
|
2019-11-25 15:22:47 +08:00 |
|
gazebo
|
7a206dd9b9
|
UpdateUserByMiniInfo中jsCode可选
|
2019-11-25 15:18:31 +08:00 |
|
gazebo
|
d7c77068cc
|
DecryptData中更新sessionKey
|
2019-11-25 14:46:40 +08:00 |
|
gazebo
|
a9d8df2f8c
|
JdStoreInfo1125
|
2019-11-25 13:48:20 +08:00 |
|
gazebo
|
fbfe4037bc
|
up
|
2019-11-25 11:04:57 +08:00 |
|
gazebo
|
ab445a8edf
|
addOrderStatusk,美团在订单完成后，还可能收到订单取消（应该当成售后单处理才合适），强制忽略这种情况，比如订单：80662201436073600
|
2019-11-25 10:55:50 +08:00 |
|
gazebo
|
aadbb087d2
|
美团外卖全额售后单创建时，不再依赖于OrderFinancialDetail2Refund
|
2019-11-25 10:30:53 +08:00 |
|
gazebo
|
143db222e1
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-24 08:33:50 +08:00 |
|
gazebo
|
bb602a14d4
|
美团商品强制设置5张图
|
2019-11-24 08:32:45 +08:00 |
|
gazebo
|
42e348e59a
|
准备重构订单调度定时器
|
2019-11-23 15:36:17 +08:00 |
|
苏尹岚
|
c033fd3988
|
Accept Merge Request #35: (yonghui -> mark)
Merge Request: excel
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/35
|
2019-11-22 19:11:00 +08:00 |
|
苏尹岚
|
228071d00e
|
excel
|
2019-11-22 19:10:36 +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 |
|