Commit Graph

3139 Commits

Author SHA1 Message Date
gazebo
3da4a38803 去掉每晚同步的特殊sku列表 2019-09-26 10:10:15 +08:00
gazebo
00bb81f11d UploadImg4Vendors 2019-09-26 10:06:24 +08:00
gazebo
b3c83924ba - UploadImg4Vendors 2019-09-26 09:58:23 +08:00
gazebo
5e577c0632 UploadImg4Vendors中处理skuName之前没有ImgHashCode的情况 2019-09-26 09:50:56 +08:00
gazebo
946d89b74c up 2019-09-26 08:47:16 +08:00
gazebo
c6c9eab9ba fk 2019-09-26 08:44:46 +08:00
gazebo
97556194d0 修复GetNeedUploadDataResource中的bug 2019-09-26 08:42:38 +08:00
gazebo
7f46072cc5 - 将skuName中的图片外移至dataResource 2019-09-26 08:35:26 +08:00
gazebo
1766adf203 修复AddSkuName中事务使用不合理的问题 2019-09-25 15:22:09 +08:00
gazebo
41866bf4b2 商品支持有两张图片 2019-09-25 14:57:45 +08:00
gazebo
84740c33f0 售后方式强制显示成退款 2019-09-25 13:50:27 +08:00
gazebo
8b0503c954 去掉微盟微商城相关的代码 2019-09-25 13:41:54 +08:00
gazebo
1fe347275a DataResource.MainURL改为唯一索引 2019-09-25 12:03:30 +08:00
gazebo
a42b6df61c - 去掉非法token报警 2019-09-25 11:21:37 +08:00
gazebo
20b4bff48f - 商品单价最高限价改为5000元 2019-09-25 11:17:06 +08:00
gazebo
d25b096353 - GetAfsOrders添加参数skuIDs 2019-09-25 11:16:51 +08:00
gazebo
15d16c41a6 删除分类调价比例 2019-09-25 10:28:54 +08:00
gazebo
4e63f526f2 去掉SkuName的ElmImgHashCode与ImgWeimob 2019-09-25 10:05:31 +08:00
gazebo
9cc4328706 - 屏蔽StoreRange越界异步,打印调试信息 2019-09-25 09:37:41 +08:00
gazebo
bf86235ce2 - 添加用户最后登录信息 2019-09-24 18:09:32 +08:00
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