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 |
|
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
|
6bf8296963
|
+ QueryFoodRecipes
|
2019-09-17 10:17:10 +08:00 |
|
Rosy-zhudan
|
299444ddd5
|
提交
|
2019-09-17 08:31:04 +08:00 |
|
gazebo
|
312ce745cc
|
- 菜谱相关
|
2019-09-16 18:40:43 +08:00 |
|
Rosy-zhudan
|
12194ac987
|
修改字段名
|
2019-09-16 17:46:42 +08:00 |
|
Rosy-zhudan
|
f88b273f92
|
修改SQL字段名
|
2019-09-16 17:42:32 +08:00 |
|
Rosy-zhudan
|
e35d86f690
|
修改门店评分细节
|
2019-09-16 16:20:46 +08:00 |
|
gazebo
|
ea58ab6f79
|
- 门店报警信息按城市排序
|
2019-09-16 15:33:29 +08:00 |
|
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
|
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 |
|
Rosy-zhudan
|
8378b832a3
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-11 17:38:54 +08:00 |
|
Rosy-zhudan
|
3784696334
|
修正
|
2019-09-11 10:35:54 +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
|
52bdbdb4ff
|
门店评分
|
2019-09-06 17:33:52 +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
|
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 |
|
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
|
5105a00075
|
- RegisterUser-->RegisterUserWithMobile
|
2019-09-04 17:44:20 +08:00 |
|
gazebo
|
0bdcdde11c
|
- 添加IStoreSkuSorter接口，但当前无实际平台支持
|
2019-09-04 11:42:58 +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
|
4e617f4ef5
|
- 京西自营商城可以存订单了
|
2019-09-02 18:33:43 +08:00 |
|
Rosy-zhudan
|
b9ec8067ac
|
修改问题
|
2019-08-30 16:59:46 +08:00 |
|
gazebo
|
03296d1a99
|
- dao.GetSkuByCats中，要判断sku_name是否被删除了
|
2019-08-30 15:56:43 +08:00 |
|
gazebo
|
7afd15cf0e
|
- 优化dao.GenQuestionMarks
|
2019-08-30 09:54:23 +08:00 |
|
gazebo
|
81ae87f5a5
|
- 优化GetStoreSkus2中的SQL（强制转换vendor_category_id至字符串以使用索引）
|
2019-08-29 15:13:36 +08:00 |
|
gazebo
|
1a54bdd91d
|
- up
|
2019-08-20 14:28:00 +08:00 |
|
gazebo
|
6bd473839c
|
- 修复GetStoresOrderSaleInfoNew中的bug
|
2019-08-20 14:07:31 +08:00 |
|
gazebo
|
7a91faec5b
|
+ GetStoresOrderSaleInfoNew
|
2019-08-20 10:59:47 +08:00 |
|
Rosy-zhudan
|
5c124f5c8f
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-19 10:36:25 +08:00 |
|
Rosy-zhudan
|
dee9eea64a
|
修改敏感词过滤代码结构
|
2019-08-19 10:27:04 +08:00 |
|