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 |
|
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 |
|
gazebo
|
a5b8513eb5
|
- 饿百对订单也设置deliveryType
|
2019-09-20 11:22:46 +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 |
|
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 |
|