Commit Graph

2181 Commits

Author SHA1 Message Date
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
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
8b0503c954 去掉微盟微商城相关的代码 2019-09-25 13:41:54 +08:00
gazebo
20b4bff48f - 商品单价最高限价改为5000元 2019-09-25 11:17:06 +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
3153ee6ea9 - 添加美团配送店时,强制忽略更新错 2019-09-24 12:01:04 +08:00
gazebo
1144d9e8ee - 恢复每晚同步平台价格 2019-09-24 08:49:55 +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
3f459a5e10 - 防止重复发送订单取消通知消息 2019-09-21 17:01:41 +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
Rosy-zhudan
634c9afa6e Merge remote-tracking branch 'origin/mark' into don 2019-09-20 11:31:22 +08:00
Rosy-zhudan
62d941d3f7 城市商品销量统计-修复问题 2019-09-20 11:12:18 +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
6d90f5117d 处理err 2019-09-19 17:43:56 +08:00
Rosy-zhudan
dc53e2e46b 城市商品销量统计 2019-09-19 16:57:24 +08:00
gazebo
72f9852d42 - 去掉调试代码(门店状态报警只发老板) 2019-09-19 16:31:24 +08:00
gazebo
a9c7be1027 - 微信端改价强制异步 2019-09-19 11:20:55 +08:00
gazebo
dbd99797aa - 添加周到测试 2019-09-19 10:57:26 +08:00
gazebo
546cb648dd - 添加门店商品修改强制异步(asyncStoreSkuOpFilter) 2019-09-19 10:27:51 +08:00
gazebo
103ab3c755 - DeleteStoreAllCategories中的任务改为可错误继续的 2019-09-19 09:28:46 +08:00
gazebo
e6af1d9ebe - 修复CreateStoreCategoryByStoreSku中误用常量VendorIDMTWM的bug 2019-09-18 17:24:02 +08:00
gazebo
d0667a818d - PruneMissingStoreSkus, 因为美团外卖分类当前是用的名字关联的,所以改名后如果没有及时同步,这个函数会导致美团平台的分类被误删 2019-09-18 15:15:43 +08:00
Rosy-zhudan
ac95d41f75 Merge remote-tracking branch 'origin/mark' into don 2019-09-18 09:17:48 +08:00
Rosy-zhudan
0d92a2edd1 门店评分-修改bug 2019-09-18 09:13:33 +08:00
gazebo
d5b31014ca - 临时禁止同步时平台分类为空的报警 2019-09-17 21:16:30 +08:00
gazebo
9a7ab6425f - 活动出错信息返回最终的活动价 2019-09-17 18:15:55 +08:00
zhudan
61c52330fd Accept Merge Request #4: (don -> mark)
Merge Request: 门店评分-修改BUG
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/4
2019-09-17 17:03:10 +08:00
Rosy-zhudan
78c238e6c6 解决冲突,合并提交 2019-09-17 16:37:01 +08:00
Rosy-zhudan
6b1a2f19fc 门店评分-修改BUG 2019-09-17 16:30:43 +08:00
gazebo
f4b6516b4d + 添加数据资源操作相关的API 2019-09-17 16:02:44 +08:00