Commit Graph

2950 Commits

Author SHA1 Message Date
Rosy-zhudan
40586e19a6 增加StoreScoreEx结构来获取门店名字,去掉表中的字段StoreName 2019-09-10 15:42:26 +08:00
Rosy-zhudan
69c57c6520 Merge remote-tracking branch 'origin/mark' into don 2019-09-10 08:49:35 +08:00
Rosy-zhudan
46f31a7136 门店评分修改 2019-09-10 08:48:58 +08:00
gazebo
7dd0da9f97 - 不支持添加系统参数 2019-09-09 18:00:47 +08:00
gazebo
5f2415c8a5 - PruneMissingStoreSkus中改用NewParallelTask 2019-09-09 17:40:08 +08:00
gazebo
cf6bd1d5ea - SyncStoresCategory中改为并行任务 2019-09-09 17:29:25 +08:00
gazebo
13c9bb76d4 - PruneMissingStoreSkus的bug 2019-09-09 17:07:17 +08:00
gazebo
910e351c00 - PruneMissingStoreSkus也会删除本地不存在的远程分类 2019-09-09 17:03:01 +08:00
gazebo
eb1c8d38b9 - 修复PruneMissingStoreSkus中的bug 2019-09-09 16:05:19 +08:00
Rosy-zhudan
db5d628e75 Merge remote-tracking branch 'origin/mark' into don 2019-09-09 15:38:32 +08:00
Rosy-zhudan
c3873c7614 门店评分修改 2019-09-09 15:37:55 +08:00
Rosy-zhudan
bb74874b12 修改门店评分BUG 2019-09-09 14:42:01 +08:00
gazebo
edd0e8c282 - 饿百将一个分类重复改名,也会报分类名重复错,特殊处理一下,不过因为GetStoreCategory其实会拉取所有的门店分类,是比较耗时的操作 2019-09-09 14:23:37 +08:00
gazebo
322d196992 - 临时修改SendAlarmVendorSnapshot 2019-09-09 13:37:37 +08:00
gazebo
f4e97af0e1 + 添加autils.NewStoreBossRole 2019-09-09 12:03:07 +08:00
gazebo
0abd1b0642 - 去除RefreshElmToken和RefreshWeimobToken的调用 2019-09-09 11:16:18 +08:00
Rosy-zhudan
4822f7741f 修改门店评分相关 2019-09-09 10:55:27 +08:00
gazebo
556ce853da - updateOrderOtherInfo中特殊处理京西自营商城订单 2019-09-09 10:47:28 +08:00
gazebo
f000f44b0d - 添加GoodsOrder.AdjustCount 2019-09-09 10:26:43 +08:00
gazebo
937cfe187c - up 2019-09-07 10:47:13 +08:00
gazebo
92b6c24347 - 调整CreateConsumerFromOrders 2019-09-07 10:37:02 +08:00
gazebo
b1309e90ff - up 2019-09-06 18:49:20 +08:00
gazebo
ecaddecade - 修复api.EbaiAPI.OrderDeliveryGet返回的status是整型而不是string的bug 2019-09-06 18:28:04 +08:00
gazebo
b33fc89275 - fk 2019-09-06 18:16:43 +08:00
gazebo
59355f7159 - 美团坐标信息用远程 2019-09-06 18:11:14 +08:00
Rosy-zhudan
b82327cefa 修改BUG(门店评分) 2019-09-06 18:08:20 +08:00
gazebo
c78b456143 - 饿百与美团外卖尽量同步手机与地址信息 2019-09-06 18:06:37 +08:00
gazebo
90232c2a26 - 修复取京东订单订单级优惠金额的BUG 2019-09-06 17:37:41 +08:00
Rosy-zhudan
5769e93cd9 Merge branch 'don' of e.coding.net:rosydev/jx-callback into don 2019-09-06 17:34:23 +08:00
Rosy-zhudan
52bdbdb4ff 门店评分 2019-09-06 17:33:52 +08:00
Rosy-zhudan
3c3be47085 门店评分 2019-09-06 17:29:09 +08:00
gazebo
f3a99cf2cd - GoodsOrder添加DiscountMoney 2019-09-06 17:25:36 +08:00
gazebo
b10ed6d97d - 从订单来创建的用户Remark都标记为fromOrder 2019-09-06 16:39:13 +08:00
gazebo
f28af0e190 - AuthBind.UserID加索引 2019-09-06 16:31:56 +08:00
gazebo
47a0a892b6 - 重构了dao.GetAuthBind和dao.GetUserBindAuthInfo
- AuthBind的唯一索引调整为"AuthID", "Type", "BindType", "DeletedAt"
2019-09-06 16:26:47 +08:00
gazebo
a12f15af52 - up 2019-09-06 15:33:12 +08:00
gazebo
a89928a366 - remove fuck 2019-09-06 15:11:36 +08:00
gazebo
2d06499663 - CreateConsumerFromOrders在限制并发数为1,以免出现主键重错误 2019-09-06 14:24:39 +08:00
gazebo
9e0ca4f185 + CreateConsumerFromOrders 2019-09-06 13:45:10 +08:00
gazebo
898955729e - SendSMSMsg中处理重复号码的情况 2019-09-06 13:37:47 +08:00
Rosy-zhudan
40d9312acb Merge remote-tracking branch 'origin/mark' into don 2019-09-06 11:29:17 +08:00
Rosy-zhudan
b0022eb26e 门店评分 2019-09-06 11:28:29 +08:00
gazebo
5bc792f337 - 修改NotifyNewOrder 2019-09-06 10:45:44 +08:00
gazebo
e52f0e260a - 发送短信时判断EnableStoreWrite 2019-09-06 10:18:09 +08:00
gazebo
0fbe4d7024 - 新订单时,发送短信消息 2019-09-06 10:16:09 +08:00
gazebo
a393869612 + Store.SMSNotify 2019-09-06 09:07:27 +08:00
gazebo
f3d496ec60 - 查询订单运费与发三方运单时,自提单报错 2019-09-05 18:44:08 +08:00
gazebo
522c9082ef - 修复dao.GetUserList的bug
- QueryActs添加参数syncStatus
2019-09-05 18:02:53 +08:00
Rosy-zhudan
c7d883b51c 更新门店评分 2019-09-05 17:24:52 +08:00
gazebo
f5ec608a1c - 创建或更新京西门店,注册用户时,自动根据门店的tel1,tel2添加门店老板角色 2019-09-05 16:57:28 +08:00