苏尹岚
|
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 |
|
gazebo
|
0416712318
|
去除临时通过门店账单上传永辉的代码
|
2019-11-21 11:52:43 +08:00 |
|
gazebo
|
81249ae3b7
|
京东活动即使创建失败，也记录平台活动ID
删除活动商品时，如果之前是同步失败状态，不调用SyncAct
|
2019-11-21 11:40:35 +08:00 |
|
gazebo
|
603c6bffa2
|
auth2.Login中，暂时禁用利用得到受信任的信息查找用户
|
2019-11-21 10:40:21 +08:00 |
|
gazebo
|
7c5e411f8b
|
+微信支付证书
|
2019-11-21 09:51:13 +08:00 |
|
gazebo
|
db9e80212f
|
微信支付退款
|
2019-11-21 09:20:56 +08:00 |
|
gazebo
|
75caa1fffd
|
处理UpdateStore时，传入autoEnableAt引起的crash
|
2019-11-20 22:21:35 +08:00 |
|
苏尹岚
|
605ca94ccf
|
读取永辉excel
|
2019-11-20 19:35:40 +08:00 |
|
苏尹岚
|
e60ce73799
|
读取永辉excel
|
2019-11-20 19:24:51 +08:00 |
|
gazebo
|
358e3eea1e
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-11-20 16:04:29 +08:00 |
|
gazebo
|
a71d4be51a
|
jd.getStrOutSkuIDs中，因应StoreSkuBatchUpdateResponse.Code改为string
|
2019-11-20 16:03:37 +08:00 |
|
gazebo
|
1195e194a1
|
+Pay4Order
|
2019-11-20 15:55:09 +08:00 |
|
苏尹岚
|
0e481ffe72
|
Merge remote-tracking branch 'origin/mark' into su
|
2019-11-20 09:55:42 +08:00 |
|
苏尹岚
|
b6dced6a3c
|
时间校验
|
2019-11-20 09:55:30 +08:00 |
|
gazebo
|
ea49b20528
|
InitVendorCategory中改用批量插入
|
2019-11-20 09:41:00 +08:00 |
|
gazebo
|
61570289a2
|
创建活动折扣检查失败时，返回平台价
|
2019-11-20 09:12:27 +08:00 |
|
gazebo
|
56869ef22a
|
+StoreSkuNamesInfo添加actType
|
2019-11-19 16:06:56 +08:00 |
|