Rosy-zhudan
|
4b7fe79245
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-09-23 16:58:39 +08:00 |
|
Rosy-zhudan
|
2814b0c55a
|
得到门店总分排名
|
2019-09-23 16:58:02 +08:00 |
|
gazebo
|
9ea9e484a7
|
- 不用GROUP BY重新实现GetStores
|
2019-09-23 16:47:10 +08:00 |
|
gazebo
|
06a155daf2
|
- 对于长时间未提交事务报警
|
2019-09-21 22:06:08 +08:00 |
|
gazebo
|
b5e28a280f
|
- 将长时间没有提交的事务打印出来
|
2019-09-21 17:31:44 +08:00 |
|
gazebo
|
190793d6ec
|
- 饿百支持仅传cat3了
|
2019-09-20 17:18:33 +08:00 |
|
gazebo
|
f60554f514
|
- 监控平台门店状态时，如果平台门店是自动接单的，改为非自动接单
|
2019-09-20 16:30:57 +08:00 |
|
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
|
2409b4f323
|
- 每晚8点再同步一次平台门店信息
|
2019-09-20 10:30:45 +08:00 |
|
gazebo
|
aa3bfcd4c2
|
- BatchUpdateEntityByKV中panic时，打印调试信息
|
2019-09-20 09:11:41 +08:00 |
|
gazebo
|
a2e71189db
|
- up
|
2019-09-18 14:36:21 +08:00 |
|
gazebo
|
6fb485cd6b
|
- 菜谱查询返回创建都名字
|
2019-09-18 14:25:50 +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
|
b140091b33
|
- 菜谱配料列表中，返回sku的名字与图片
|
2019-09-17 17:57:54 +08:00 |
|
gazebo
|
8dbb872f4c
|
- 修改菜谱的几个bug
|
2019-09-17 17:25:24 +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
|
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 |
|
gazebo
|
312ce745cc
|
- 菜谱相关
|
2019-09-16 18:40:43 +08:00 |
|
gazebo
|
ea58ab6f79
|
- 门店报警信息按城市排序
|
2019-09-16 15:33:29 +08:00 |
|
gazebo
|
f3e64ed996
|
- up
|
2019-09-12 10:28:18 +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
|
a90941b26e
|
- 京西自营商城
|
2019-09-10 17:21:44 +08:00 |
|
gazebo
|
fb8732c94c
|
- 门店状态变化添加发送微信通知消息
|
2019-09-10 11:23:39 +08:00 |
|
gazebo
|
910e351c00
|
- PruneMissingStoreSkus也会删除本地不存在的远程分类
|
2019-09-09 17:03:01 +08:00 |
|
gazebo
|
47a0a892b6
|
- 重构了dao.GetAuthBind和dao.GetUserBindAuthInfo
- AuthBind的唯一索引调整为"AuthID", "Type", "BindType", "DeletedAt"
|
2019-09-06 16:26:47 +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
|
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 |
|
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 |
|
gazebo
|
1f2c9ae48f
|
+ Store添加OperatorRole2，Store.PrinterFontSize
|
2019-08-19 09:48:59 +08:00 |
|