Commit Graph

3073 Commits

Author SHA1 Message Date
gazebo
aa3bfcd4c2 - BatchUpdateEntityByKV中panic时,打印调试信息 2019-09-20 09:11:41 +08:00
gazebo
61a5f9f040 - jdapi.UpdateStoreInfo4Open2 2019-09-19 17:26:38 +08:00
gazebo
a74c9230f1 - 修复CaculateSkuPrice四舍五入的bug 2019-09-19 16:56:38 +08:00
gazebo
72f9852d42 - 去掉调试代码(门店状态报警只发老板) 2019-09-19 16:31:24 +08:00
gazebo
4917b8fca6 - 京东门店相关的操作改用新API(非map) 2019-09-19 15:56:38 +08:00
gazebo
af41dbb6b8 + EnableAutoAcceptOrder 2019-09-19 11:46:58 +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
3d9aefb411 - 调整OrderSku的索引 2019-09-19 09:57:18 +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
gazebo
54e95857bd - 处理在修改美团分类名,但分类已不存在的情况 2019-09-18 15:04:24 +08:00
gazebo
a2e71189db - up 2019-09-18 14:36:21 +08:00
gazebo
6fb485cd6b - 菜谱查询返回创建都名字 2019-09-18 14:25:50 +08:00
gazebo
f438b005a2 - fk 2019-09-18 14:16:30 +08:00
gazebo
135089e12b - fk 2019-09-18 14:12:22 +08:00
gazebo
737a7f3387 - 订单事件中加载订单时,把sku都加载了 2019-09-18 14:09:19 +08:00
gazebo
88f1976f61 - 修复订单取消消息发送的bug 2019-09-18 13:50:13 +08:00
gazebo
cef2b9e1e6 - 修复addOrderOrWaybillStatus中判断消息重复的逻辑问题(要加Status判断,否则在自动补运单新运单消息时会出错) 2019-09-18 11:36:52 +08:00
gazebo
32e0ec7219 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-09-18 10:53:50 +08:00
gazebo
285d7d68ec - 添加订单取消微信与短信通知 2019-09-18 10:53:33 +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
96bb72f87a - dao.GetSkusCategories 2019-09-18 08:23:40 +08:00
gazebo
d919b5d9f1 - up 2019-09-17 21:48:24 +08:00
gazebo
26221afaef - 修复dao.GetSkusCategories没有取全分类的问题 2019-09-17 21:44:04 +08:00
gazebo
d5b31014ca - 临时禁止同步时平台分类为空的报警 2019-09-17 21:16:30 +08:00
gazebo
025b2b0cfd + DeleteRecipes 2019-09-17 18:22:06 +08:00
gazebo
9a7ab6425f - 活动出错信息返回最终的活动价 2019-09-17 18:15:55 +08:00
gazebo
b140091b33 - 菜谱配料列表中,返回sku的名字与图片 2019-09-17 17:57:54 +08:00
gazebo
c4c5afb6f9 - 修复菜谱BUG 2019-09-17 17:46:56 +08:00
gazebo
8dbb872f4c - 修改菜谱的几个bug 2019-09-17 17:25:24 +08:00
gazebo
8357152344 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-09-17 17:06:21 +08:00
gazebo
d8f684f720 - up 2019-09-17 17:06:08 +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
gazebo
7b0d1d396f - up 2019-09-17 16:57:46 +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
gazebo
bf8fd2f255 - 菜谱API基本OK 2019-09-17 14:39:15 +08:00
gazebo
daa72b7b7d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-09-17 11:31:07 +08:00
gazebo
b54f86f00c - IsSyncStatusSec fixed to IsSyncStatusSeq
- 修改(或创建)单平台门店商品时,如果没有平台分类ID,报警
2019-09-17 11:30:07 +08:00
xujianhua
9c7ae16186 Accept Merge Request #3: (don -> mark)
Merge Request: 门店评分
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/3
2019-09-17 11:12:33 +08:00
gazebo
7bc963c31f - 修复门店报警门店按城市排序的bug 2019-09-17 10:47:09 +08:00
Rosy-zhudan
957db04544 修改细节 2019-09-17 10:32:49 +08:00
gazebo
6bf8296963 + QueryFoodRecipes 2019-09-17 10:17:10 +08:00
gazebo
4caa33cac5 + UpdateFoodRecipe 2019-09-17 09:33:36 +08:00
Rosy-zhudan
6199a2e714 Merge remote-tracking branch 'origin/mark' into don 2019-09-17 09:29:46 +08:00