Rosy-zhudan
|
52bdbdb4ff
|
门店评分
|
2019-09-06 17:33:52 +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 |
|
gazebo
|
1f2c9ae48f
|
+ Store添加OperatorRole2，Store.PrinterFontSize
|
2019-08-19 09:48:59 +08:00 |
|
Rosy-zhudan
|
9b09fc9cae
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-16 14:29:07 +08:00 |
|
Rosy-zhudan
|
4636ea7fd5
|
敏感词过滤
|
2019-08-16 14:26:22 +08:00 |
|
gazebo
|
14e3594455
|
- GetStoresOrderSaleInfo添加售后单信息
|
2019-08-16 11:08:09 +08:00 |
|
gazebo
|
c63c43a92b
|
- 准备处理平台价格字段
|
2019-08-14 14:08:41 +08:00 |
|
gazebo
|
f788eec5c1
|
- GetUsers支持分页
|
2019-08-14 11:32:20 +08:00 |
|
gazebo
|
4c484a6280
|
- 去除无用代码，主要是promotion相关的
|
2019-08-14 11:12:33 +08:00 |
|
gazebo
|
15d270b075
|
- 同步商品库已下架商品时，设置删除日期
|
2019-08-10 08:18:07 +08:00 |
|
gazebo
|
6f403e909f
|
- 修复GetStores中没有限制new_config未删除的bug
|
2019-08-09 11:59:38 +08:00 |
|
gazebo
|
d8f3b7f467
|
- 活动商品后台分页,GetActStoreSkuInfo分页，添加keyword
|
2019-08-09 11:19:43 +08:00 |
|
gazebo
|
304f3fe86e
|
- 启用DeleteSkusFromAct
|
2019-08-09 10:01:23 +08:00 |
|
gazebo
|
3541fada72
|
- fk
|
2019-08-08 22:42:46 +08:00 |
|
gazebo
|
b51614946f
|
- 重构authz结构
- 角色管理初版完成
|
2019-08-08 17:06:58 +08:00 |
|
gazebo
|
60f3ec9c3b
|
+ Store添加MarketManRole与OperatorRole
- GetStoreListByMobileOrStoreIDs支持按Store.MarketManRole与OperatorRole来得到门店列表
|
2019-08-08 15:46:32 +08:00 |
|
gazebo
|
17b91e4ee7
|
- 根据已经部分关注的商品，得到已经存在的门店商品单价
|
2019-08-08 14:57:26 +08:00 |
|
gazebo
|
3639a1c7cb
|
- 角色管理初版
|
2019-08-07 18:16:44 +08:00 |
|
gazebo
|
cef5be3e06
|
- GetUsers过滤掉离职人员信息
|
2019-08-07 11:35:46 +08:00 |
|
gazebo
|
447237f252
|
- fix bug in GetUsers
|
2019-08-06 17:01:51 +08:00 |
|
gazebo
|
a0c74cf02a
|
- GetUsers接口改变
|
2019-08-06 16:40:38 +08:00 |
|
gazebo
|
7ad7a7be44
|
- GetEffectiveActStoreSkuInfo中的BUG，对于非结算活动类型，要判断同步状态
|
2019-08-06 15:55:46 +08:00 |
|
gazebo
|
c020130819
|
- tasksch.NewParallelTask2，支持部分失败时得到准备的成功，失败个数信息
|
2019-08-06 14:20:32 +08:00 |
|
gazebo
|
88ebbbf9e7
|
- GetUsers添加userID参数
|
2019-08-06 11:15:32 +08:00 |
|
gazebo
|
d0821c05b0
|
- up
|
2019-08-06 11:09:04 +08:00 |
|
gazebo
|
539cfb31fe
|
- 修复UpdateActStatusByTime中的BUG
|
2019-08-05 16:59:30 +08:00 |
|
gazebo
|
73169746c9
|
+ user2/GetUsers
|
2019-08-05 09:38:48 +08:00 |
|
gazebo
|
c088b793e8
|
- fk
|
2019-08-03 16:06:08 +08:00 |
|
gazebo
|
75e5e99273
|
- GetMyStoreList 返回城市名
|
2019-07-31 15:17:13 +08:00 |
|
gazebo
|
5498ea4069
|
- ActStoreSku2中添加VendorPrice
|
2019-07-31 09:44:30 +08:00 |
|