苏尹岚
|
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 |
|
gazebo
|
78a26364c0
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-22 18:33:02 +08:00 |
|
gazebo
|
5d2e9be549
|
创建活动时，OriginalPrice返回京西价
|
2019-11-22 18:32:31 +08:00 |
|
苏尹岚
|
ec494368a4
|
Accept Merge Request #33: (yonghui -> mark)
Merge Request: 修改永辉Excel接口修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/33
|
2019-11-22 18:03:39 +08:00 |
|
苏尹岚
|
70bf3a70a9
|
永辉Excel接口修改
|
2019-11-22 18:03:12 +08:00 |
|
苏尹岚
|
92b9f96889
|
读取永辉Excel接口修改
|
2019-11-22 17:59:48 +08:00 |
|
gazebo
|
aaf9e9a183
|
取消生成美团店的假商品
|
2019-11-22 17:34:00 +08:00 |
|
gazebo
|
27a573bd30
|
specialStoreID = "8171010"
|
2019-11-22 17:13:41 +08:00 |
|
gazebo
|
0fef41b956
|
up
|
2019-11-22 17:09:25 +08:00 |
|
gazebo
|
90092058a2
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-22 17:06:01 +08:00 |
|
gazebo
|
251894e2d2
|
up
|
2019-11-22 17:05:50 +08:00 |
|
gazebo
|
aa5a8bacc0
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-22 17:00:10 +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
|
4a6ada20c4
|
临时测试温江直营店SKU与图片自动加多
|
2019-11-22 16:59:32 +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
|
61eb7d0546
|
ShouldSetTimer结构优化
|
2019-11-22 14:37:21 +08:00 |
|
gazebo
|
36403a3797
|
fk
|
2019-11-22 10:52:42 +08:00 |
|
gazebo
|
3a032c18cd
|
直营店始终按比例结算
|
2019-11-21 18:14:55 +08:00 |
|
gazebo
|
9dda86169b
|
美团订单完全忽略运单定时器
|
2019-11-21 17:42:24 +08:00 |
|
苏尹岚
|
ce76490526
|
读取永辉Excel测试
|
2019-11-21 17:28:11 +08:00 |
|
gazebo
|
b78012d82b
|
每隔10天要强刷门店商品可售状态
|
2019-11-21 17:27:13 +08:00 |
|
gazebo
|
0f0fd28f26
|
晚上只强刷价格
|
2019-11-21 15:56:47 +08:00 |
|
gazebo
|
3edc4b0e37
|
syncStoreSkuNew中强制出错继续
|
2019-11-21 15:38:49 +08:00 |
|
gazebo
|
bd8100d3c2
|
openTimeMtwm2JX中防止越界
|
2019-11-21 15:28:22 +08:00 |
|
苏尹岚
|
8618dfc297
|
永辉excel接口测试
|
2019-11-21 13:58:17 +08:00 |
|
苏尹岚
|
53d9c30dfa
|
时间范围修改
|
2019-11-21 13:48:10 +08:00 |
|