gazebo
|
2226df4e0a
|
- 转自送失败时写日志
|
2019-04-29 18:27:11 +08:00 |
|
gazebo
|
16d738cca1
|
- 饿百订单的调整单特殊处理，因为必须要确认订单后能才调整
|
2019-04-29 17:35:36 +08:00 |
|
gazebo
|
7de70c63ea
|
- 只有4个异常状态发消息
|
2019-04-29 17:10:11 +08:00 |
|
gazebo
|
0c2751700a
|
- 饿百的用户取消申请处理
|
2019-04-29 16:45:31 +08:00 |
|
gazebo
|
1bb6e38202
|
- 处理京东orderShareRatioData
|
2019-04-29 15:57:09 +08:00 |
|
gazebo
|
5628c23741
|
- CreateWaybillOnProviders添加maxAddFee与maxDiffFee2Mtps参数
|
2019-04-29 15:56:12 +08:00 |
|
gazebo
|
d8f1c33b93
|
- 修复发送订单消息的BUG
|
2019-04-29 14:44:34 +08:00 |
|
gazebo
|
b0e0d2b591
|
- 强发运单只创建一个
|
2019-04-29 14:07:38 +08:00 |
|
gazebo
|
6c1e4b99c7
|
- WaybillStatusName
|
2019-04-29 12:07:30 +08:00 |
|
gazebo
|
0124cf4bcd
|
- 如果不同意用户取消订单成功后，把上解锁订单
|
2019-04-29 11:52:45 +08:00 |
|
gazebo
|
efdc78da59
|
- beta饿百配置为测试门店
|
2019-04-29 10:55:33 +08:00 |
|
gazebo
|
a6ac95c181
|
- only enable EnableEbaiStoreWrite
|
2019-04-29 10:41:28 +08:00 |
|
gazebo
|
c462510b2d
|
- add conf enableJdStoreWrite
- enable enableEbaiStoreWrite on beta
|
2019-04-29 10:35:45 +08:00 |
|
gazebo
|
f403a74bc0
|
- ebai.financial中，获取order_id全用GetOrderIDFromMsg或GetOrderIDFromMap
|
2019-04-28 17:40:49 +08:00 |
|
gazebo
|
7fa0911495
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-04-28 17:28:09 +08:00 |
|
gazebo
|
5ee6bf0b80
|
- make GoodsOrder.LockStatusTime visible
|
2019-04-28 17:27:34 +08:00 |
|
LCW-Rosy
|
dce82ed4a1
|
Accept Merge Request #18: (lcw -> mark)
Merge Request: 优化
Created By: @LCW-Rosy
Accepted By: @LCW-Rosy
URL: https://dev.tencent.com/u/XJH-Rosy/p/jx-callback/git/merge/18
|
2019-04-28 16:37:22 +08:00 |
|
renyutian
|
54854f05b5
|
down_flag
|
2019-04-28 16:35:14 +08:00 |
|
renyutian
|
9000937294
|
降级号处理
|
2019-04-28 16:04:27 +08:00 |
|
renyutian
|
a12d6f04f1
|
Merge remote-tracking branch 'origin/mark' into lcw
|
2019-04-28 15:36:24 +08:00 |
|
gazebo
|
7bdcf5bb95
|
- 在重复LockStatus时报警
|
2019-04-28 14:37:18 +08:00 |
|
gazebo
|
1df08e9360
|
- 平台取消申请审核时限参数
- 一些订单操作标记
- LockStatusTime
|
2019-04-28 12:14:24 +08:00 |
|
gazebo
|
857451feb2
|
- auth.GetWeiXinUserInfo添加调试
|
2019-04-28 10:14:42 +08:00 |
|
gazebo
|
25cd0463fe
|
- up
|
2019-04-27 19:00:17 +08:00 |
|
gazebo
|
554b0351a6
|
- up
|
2019-04-27 18:50:26 +08:00 |
|
gazebo
|
8249f1727f
|
- up
|
2019-04-27 18:39:00 +08:00 |
|
gazebo
|
f48ff514d8
|
- up
|
2019-04-27 18:31:53 +08:00 |
|
gazebo
|
730136bbb0
|
- fk
|
2019-04-27 18:27:04 +08:00 |
|
gazebo
|
5bd457c143
|
- fk
|
2019-04-27 18:08:57 +08:00 |
|
gazebo
|
9bac02f9aa
|
- fk
|
2019-04-27 17:58:36 +08:00 |
|
gazebo
|
94484a92b7
|
- jxgy刷新token
|
2019-04-27 17:41:33 +08:00 |
|
gazebo
|
0f85ed964e
|
- fk
|
2019-04-27 16:17:32 +08:00 |
|
gazebo
|
e73eb78710
|
- fk
|
2019-04-27 16:06:39 +08:00 |
|
gazebo
|
dbd9e3a3d2
|
- 解决wxtoken的刷新问题
|
2019-04-27 15:44:26 +08:00 |
|
gazebo
|
beb6482a1a
|
- WaybillStatusFailed也会重新创建三方运单
- dadaapi.OrderStatusExpired映射为WaybillStatusCanceled（之前为WaybillStatusFailed）
- 达达重新创建运单时，判断之前的运单状态，如果是WaybillStatusFailed，则为新增订单
- 去掉dao. WrapDB
|
2019-04-27 10:58:19 +08:00 |
|
gazebo
|
3b2a5d9b1c
|
- eventhub
- sys/GetWXToken
|
2019-04-26 17:50:25 +08:00 |
|
gazebo
|
d6ec47ed6c
|
- refactor http.Get
|
2019-04-26 17:46:18 +08:00 |
|
gazebo
|
7e0dcbc8ec
|
- AdjustOrder中reason为强制参数
|
2019-04-26 14:41:06 +08:00 |
|
gazebo
|
c8d4045167
|
- 饿百同步门店商品时，检查改价，可售标志
|
2019-04-26 14:36:00 +08:00 |
|
gazebo
|
59cb7706a0
|
- 非生产环境不限制GetMsg的等待时间
|
2019-04-26 11:56:57 +08:00 |
|
gazebo
|
b01968e451
|
- ServerMsgKeyOrderStatusChanged推送整个订单信息
|
2019-04-26 11:32:28 +08:00 |
|
gazebo
|
aa72951154
|
- 修复msghub中的ServerMsgKeyOrderStatusChanged事件错
|
2019-04-26 11:23:39 +08:00 |
|
gazebo
|
973b6c6869
|
- 忽略在jd storeCrud消息时找不到门店的错误
|
2019-04-25 21:35:33 +08:00 |
|
gazebo
|
788ede6ac4
|
- test
|
2019-04-25 17:26:30 +08:00 |
|
gazebo
|
d940b7d12f
|
- 调整一下建表顺序
|
2019-04-25 16:17:37 +08:00 |
|
gazebo
|
c87b104fa4
|
- jxgy小程序key
|
2019-04-25 16:13:57 +08:00 |
|
gazebo
|
efefe0ff52
|
- 无论成功与否，都存储verifyCode
|
2019-04-25 16:04:40 +08:00 |
|
gazebo
|
1c8642e39f
|
- jxgy用正式公众号的KEY
|
2019-04-25 15:45:23 +08:00 |
|
gazebo
|
170bd34a15
|
- enableEbaiStoreWrite = true for jxgy
|
2019-04-25 14:28:23 +08:00 |
|
gazebo
|
05bcae3dd9
|
- fk
|
2019-04-25 14:25:54 +08:00 |
|