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 |
|
gazebo
|
536de94730
|
- 京西果园正式KEY
|
2019-04-25 12:59:56 +08:00 |
|
gazebo
|
e193e7f7fd
|
- fk
|
2019-04-25 12:56:03 +08:00 |
|
gazebo
|
ed17aac89f
|
- fk
|
2019-04-25 12:44:54 +08:00 |
|
gazebo
|
38a95330f5
|
- up
|
2019-04-25 12:33:47 +08:00 |
|
gazebo
|
4e0a6a3690
|
- 修复果园回调地址
|
2019-04-25 12:18:21 +08:00 |
|
gazebo
|
1ef854a0c6
|
- 将URL信息放到配置文件中
|
2019-04-25 12:13:01 +08:00 |
|
gazebo
|
d9276e5833
|
- ForceSyncSkuNames to SyncSkuNames
|
2019-04-25 08:54:40 +08:00 |
|
gazebo
|
207d8e2bf2
|
- 创建京东商品时忽略已经存在错误
|
2019-04-25 08:42:35 +08:00 |
|
gazebo
|
7951e949c1
|
+ ForceSyncSkuNames
- refactor sync.SyncSku
|
2019-04-24 21:36:55 +08:00 |
|
gazebo
|
79542ae756
|
- MaxTaskNameLen = 50
|
2019-04-24 21:34:46 +08:00 |
|
gazebo
|
7f406414b1
|
- 京东回调，非生产环境一定返回成功
|
2019-04-24 20:13:17 +08:00 |
|
gazebo
|
66dc062678
|
- 门店账单统一使用https
|
2019-04-24 20:12:21 +08:00 |
|
renyutian
|
dcb9122425
|
结算京西平台费时，采用四舍五入计算
|
2019-04-24 17:02:42 +08:00 |
|
renyutian
|
b9112379df
|
饿百由于订单降级而导致结账数据有误 优化
|
2019-04-24 16:04:29 +08:00 |
|