gazebo
|
412b11396a
|
- 注释掉老user与auth相关的代码
|
2019-09-24 16:39:50 +08:00 |
|
gazebo
|
72c9889d10
|
- GetOrders添加GetOrders参数
|
2019-09-24 14:51:15 +08:00 |
|
gazebo
|
3153ee6ea9
|
- 添加美团配送店时，强制忽略更新错
|
2019-09-24 12:01:04 +08:00 |
|
gazebo
|
9b1d282c82
|
- 重构dao.Sku
|
2019-09-24 10:55:13 +08:00 |
|
gazebo
|
53f4d84025
|
- 添加京西商城订单取消事件
|
2019-09-24 10:15:16 +08:00 |
|
gazebo
|
1144d9e8ee
|
- 恢复每晚同步平台价格
|
2019-09-24 08:49:55 +08:00 |
|
gazebo
|
86b958a8f0
|
- GetStoreTotalScoreList中的日期处理错误
|
2019-09-24 08:49:06 +08:00 |
|
gazebo
|
dfe1b5c3d3
|
- 京西商城订单设置vendorStatus
|
2019-09-23 18:41:27 +08:00 |
|
gazebo
|
041bb9ca87
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-23 18:26:57 +08:00 |
|
gazebo
|
c6ae8e830d
|
- 京西商城发送假订单消息时，不直接修改改订单状态
|
2019-09-23 18:26:11 +08:00 |
|
Rosy-zhudan
|
4b7fe79245
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-23 16:58:39 +08:00 |
|
Rosy-zhudan
|
2814b0c55a
|
得到门店总分排名
|
2019-09-23 16:58:02 +08:00 |
|
gazebo
|
f0f7d241d5
|
- 京东到家0923晚上维护价格接口，暂停同步到家
|
2019-09-23 16:50:27 +08:00 |
|
gazebo
|
9ea9e484a7
|
- 不用GROUP BY重新实现GetStores
|
2019-09-23 16:47:10 +08:00 |
|
gazebo
|
76e42e7043
|
- 修复getMapCenter的bug
|
2019-09-23 12:21:03 +08:00 |
|
gazebo
|
06a155daf2
|
- 对于长时间未提交事务报警
|
2019-09-21 22:06:08 +08:00 |
|
gazebo
|
b5e28a280f
|
- 将长时间没有提交的事务打印出来
|
2019-09-21 17:31:44 +08:00 |
|
gazebo
|
61dcd6db6f
|
- up
|
2019-09-21 17:04:37 +08:00 |
|
gazebo
|
3f459a5e10
|
- 防止重复发送订单取消通知消息
|
2019-09-21 17:01:41 +08:00 |
|
gazebo
|
190793d6ec
|
- 饿百支持仅传cat3了
|
2019-09-20 17:18:33 +08:00 |
|
gazebo
|
b48281d893
|
- 修复GuessDataResourceVendor中的bug
|
2019-09-20 16:57:26 +08:00 |
|
gazebo
|
4fe91cfdcb
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-20 16:31:45 +08:00 |
|
gazebo
|
f60554f514
|
- 监控平台门店状态时，如果平台门店是自动接单的，改为非自动接单
|
2019-09-20 16:30:57 +08:00 |
|
Rosy-zhudan
|
7216cfd911
|
合并修改
|
2019-09-20 16:14:56 +08:00 |
|
Rosy-zhudan
|
ea0358f00d
|
增加未找到门店的异常捕捉
|
2019-09-20 16:11:08 +08:00 |
|
gazebo
|
b030168e07
|
Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark
|
2019-09-20 15:46:27 +08:00 |
|
gazebo
|
d1d0e576eb
|
- 移除常量字符串'1970-01-01 00:00:00'
|
2019-09-20 15:46:09 +08:00 |
|
xujianhua
|
c5df4f5f5e
|
Accept Merge Request #6: (don -> mark)
Merge Request: 城市商品销量统计
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/6
|
2019-09-20 15:25:39 +08:00 |
|
gazebo
|
92cdb1d975
|
- 修复美团外卖售后单的处理bug，对于notifyType与resType的处理
|
2019-09-20 15:12:59 +08:00 |
|
Rosy-zhudan
|
6a20aa4aa4
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-20 15:05:17 +08:00 |
|
Rosy-zhudan
|
f901750850
|
修改SQL查询时间的方式
|
2019-09-20 15:04:22 +08:00 |
|
gazebo
|
4a8c3190fb
|
- 处理美团外卖poi/save时，报错：商家已接入美团配送，不可修改门店配送相关信息的问题（忽略错误）
|
2019-09-20 14:38:10 +08:00 |
|
gazebo
|
7e1104c068
|
- 修复美团门店修改状态没有合并的bug
|
2019-09-20 14:20:34 +08:00 |
|
gazebo
|
877ffb2bec
|
- JxBadComments.Createtime添加索引
|
2019-09-20 12:04:42 +08:00 |
|
gazebo
|
900544560b
|
- 美团外卖门店同步不同步地址（要报错，已接入美团配送，不可修改门店配送相关信息）
|
2019-09-20 11:53:54 +08:00 |
|
Rosy-zhudan
|
634c9afa6e
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-20 11:31:22 +08:00 |
|
gazebo
|
a5b8513eb5
|
- 饿百对订单也设置deliveryType
|
2019-09-20 11:22:46 +08:00 |
|
Rosy-zhudan
|
62d941d3f7
|
城市商品销量统计-修复问题
|
2019-09-20 11:12:18 +08:00 |
|
gazebo
|
af931ce496
|
- ebai的shop_fee用ForceInterface2Int64
|
2019-09-20 10:53:44 +08:00 |
|
gazebo
|
479fb6e1d9
|
- up
|
2019-09-20 10:41:30 +08:00 |
|
gazebo
|
2409b4f323
|
- 每晚8点再同步一次平台门店信息
|
2019-09-20 10:30:45 +08:00 |
|
gazebo
|
aa3bfcd4c2
|
- BatchUpdateEntityByKV中panic时，打印调试信息
|
2019-09-20 09:11:41 +08:00 |
|
Rosy-zhudan
|
201411d325
|
统计商品销量
|
2019-09-19 18:32:12 +08:00 |
|
Rosy-zhudan
|
24ff7daad9
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-19 17:46:01 +08:00 |
|
Rosy-zhudan
|
6d90f5117d
|
处理err
|
2019-09-19 17:43:56 +08:00 |
|
gazebo
|
61a5f9f040
|
- jdapi.UpdateStoreInfo4Open2
|
2019-09-19 17:26:38 +08:00 |
|
Rosy-zhudan
|
1303962088
|
修改BUG
|
2019-09-19 17:10:09 +08:00 |
|
Rosy-zhudan
|
dc53e2e46b
|
城市商品销量统计
|
2019-09-19 16:57:24 +08:00 |
|
gazebo
|
a74c9230f1
|
- 修复CaculateSkuPrice四舍五入的bug
|
2019-09-19 16:56:38 +08:00 |
|
gazebo
|
72f9852d42
|
- 去掉调试代码（门店状态报警只发老板）
|
2019-09-19 16:31:24 +08:00 |
|