Commit Graph

632 Commits

Author SHA1 Message Date
Rosy-zhudan
7d194b3b90 Merge remote-tracking branch 'origin/mark' into don 2019-09-12 15:44:48 +08:00
Rosy-zhudan
6b3b0bcd35 门店评分-优化数据读取速度 2019-09-12 15:36:39 +08:00
gazebo
e789e17714 + getAllUsers4Store 2019-09-12 14:54:28 +08:00
gazebo
f3e64ed996 - up 2019-09-12 10:28:18 +08:00
Rosy-zhudan
895ad8b4f6 Merge remote-tracking branch 'origin/mark' into don 2019-09-12 08:40:59 +08:00
gazebo
84b4d400e4 - BatchUpdateEntityByKV中不用事务 2019-09-11 22:59:19 +08:00
gazebo
5baecb3b37 - dao.QueryPageStores keyword查询licence_code 2019-09-11 17:44:09 +08:00
gazebo
435b4397d6 - 门店状态报警提示修改 2019-09-11 17:42:26 +08:00
Rosy-zhudan
8378b832a3 Merge remote-tracking branch 'origin/mark' into don 2019-09-11 17:38:54 +08:00
gazebo
569abe56b5 - 添加自提假订单处理 2019-09-11 17:31:07 +08:00
gazebo
4e52916066 - 拉取饿百门店营业执照信息 2019-09-11 16:24:42 +08:00
Rosy-zhudan
3784696334 修正 2019-09-11 10:35:54 +08:00
gazebo
f632622b55 + ConfigSysFakeOrderMobiles 2019-09-10 18:32:55 +08:00
gazebo
a90941b26e - 京西自营商城 2019-09-10 17:21:44 +08:00
Rosy-zhudan
40586e19a6 增加StoreScoreEx结构来获取门店名字,去掉表中的字段StoreName 2019-09-10 15:42:26 +08:00
gazebo
fb8732c94c - 门店状态变化添加发送微信通知消息 2019-09-10 11:23:39 +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
910e351c00 - PruneMissingStoreSkus也会删除本地不存在的远程分类 2019-09-09 17:03:01 +08:00
Rosy-zhudan
db5d628e75 Merge remote-tracking branch 'origin/mark' into don 2019-09-09 15:38:32 +08:00
Rosy-zhudan
bb74874b12 修改门店评分BUG 2019-09-09 14:42:01 +08:00
Rosy-zhudan
4822f7741f 修改门店评分相关 2019-09-09 10:55:27 +08:00
gazebo
f000f44b0d - 添加GoodsOrder.AdjustCount 2019-09-09 10:26:43 +08:00
gazebo
b1309e90ff - up 2019-09-06 18:49:20 +08:00
Rosy-zhudan
52bdbdb4ff 门店评分 2019-09-06 17:33:52 +08:00
gazebo
f3a99cf2cd - GoodsOrder添加DiscountMoney 2019-09-06 17:25:36 +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
Rosy-zhudan
40d9312acb Merge remote-tracking branch 'origin/mark' into don 2019-09-06 11:29:17 +08:00
gazebo
a393869612 + Store.SMSNotify 2019-09-06 09:07:27 +08:00
gazebo
522c9082ef - 修复dao.GetUserList的bug
- QueryActs添加参数syncStatus
2019-09-05 18:02:53 +08:00
gazebo
f5ec608a1c - 创建或更新京西门店,注册用户时,自动根据门店的tel1,tel2添加门店老板角色 2019-09-05 16:57:28 +08:00
gazebo
059e563f08 - HandleOrder4Consignee 2019-09-05 14:58:31 +08:00
Rosy-zhudan
9e5d152a48 Merge remote-tracking branch 'origin/mark' into don 2019-09-05 08:37:48 +08:00
Rosy-zhudan
4eaccdc917 门店评分 2019-09-05 08:37:23 +08:00
gazebo
a0bb7d37f0 - 将IsMobileFake用IsStringLikeMobile替换
- 添加HandleOrder4Consignee, GetRealMobile4Order和GetAuthType4Vendor
- 添加GoodsOrder.VendorUserID
2019-09-04 18:50:25 +08:00
gazebo
5105a00075 - RegisterUser-->RegisterUserWithMobile 2019-09-04 17:44:20 +08:00
gazebo
0bdcdde11c - 添加IStoreSkuSorter接口,但当前无实际平台支持 2019-09-04 11:42:58 +08:00
gazebo
d54a4f569a - 京东到家自提单支持,新增API:ConfirmSelfTake, GoodsOrder新增字段DeliveryType 2019-09-03 18:18:54 +08:00
gazebo
9bff8840e5 - User.GetMobile and User.GetEmail bug修改 2019-09-03 15:51:15 +08:00
gazebo
dad8adc4bf + AuthBind中添加BindType
- 合并函数GetAuthBindsByAuthID2
- User中的mobile与email改为可为null
2019-09-03 15:35:54 +08:00
Rosy-zhudan
2afa452d78 Merge remote-tracking branch 'origin/mark' into don 2019-09-03 14:49:08 +08:00
Rosy-zhudan
ad1bcd36ff 门店评分 2019-09-03 14:48:37 +08:00
gazebo
73c5656be2 - ActStoreSku2添加Type,活动类型 2019-09-03 14:45:07 +08:00
gazebo
0f69e9b51e - 拉取平台信息时,存储平台门店名 2019-09-03 08:55:28 +08:00
gazebo
4e617f4ef5 - 京西自营商城可以存订单了 2019-09-02 18:33:43 +08:00
gazebo
7ca4429e43 - remove globals.ReallyReplyComment 2019-09-02 16:53:22 +08:00
gazebo
de6c5de6df - SkuCategoryMap 2019-09-02 10:42:38 +08:00
Rosy-zhudan
b9ec8067ac 修改问题 2019-08-30 16:59:46 +08:00
Rosy-zhudan
02bb89d67d Merge remote-tracking branch 'origin/mark' into don 2019-08-30 16:01:12 +08:00