Commit Graph

575 Commits

Author SHA1 Message Date
gazebo
3f69f94cbb - 平台多账号相关 2019-08-27 18:45:58 +08:00
gazebo
c8926056fb - 京东售后枚举调整 2019-08-27 17:11:53 +08:00
gazebo
5e94bf4dbd - fk 2019-08-21 16:42:36 +08:00
gazebo
e626d4242f - fk 2019-08-21 16:34:49 +08:00
gazebo
8e284beba0 + StoreMap添加FakeOpenStart和FakeOpenStop 2019-08-21 16:28:57 +08:00
gazebo
3780f5c62e - 用户添加角色时,判断用户类型 2019-08-20 15:36:49 +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
b36f8b3ae1 - UpdateStoresSkusSale中对于autoSaleAt按服务器设置处理,不管客户端传的具体值 2019-08-15 18:43:55 +08:00
gazebo
634ac5ebe6 + StoreSkuBind添加JdPrice, EbaiPrice, MtwmPrice和WscPrice 2019-08-14 17:31:17 +08:00
gazebo
79925dd1de - fk 2019-08-14 16:51:06 +08:00
gazebo
8440c6dca5 - 门店商品相关表中去除饿了么的字段 2019-08-14 14:49:12 +08:00
gazebo
c63c43a92b - 准备处理平台价格字段 2019-08-14 14:08:41 +08:00
gazebo
d3ed741016 - up 2019-08-14 13:57:12 +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
f8a5e1bc8d - SyncFlagStoreSkuOnlyMask去掉SyncFlagStockMask 2019-08-13 18:34:03 +08:00
gazebo
ad0c8eb3c0 + api_config.go 2019-08-13 17:57:03 +08:00
gazebo
37b931abe5 + OrderSkuFinancial.StoreSubID, StoreSubName 2019-08-13 10:27:29 +08:00
gazebo
6a8e3cb4b0 - 去除auth.localpass(已经移到auth2.localpass) 2019-08-12 17:56:50 +08:00
gazebo
4ec85bbb73 - RegisterUser在已经找到相应手机号用户的情况下,返回正式登录信息 2019-08-12 10:59:01 +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
fb7c59b38e - SyncFlagSpecMask从32改为64
- 添加SyncFlagStockMask为32
- 修复新关注商品在同步至多门店平台时,同步出错时可能的清同步标识不正确的问题
2019-08-07 23:48:39 +08:00
gazebo
3639a1c7cb - 角色管理初版 2019-08-07 18:16:44 +08:00
gazebo
cef5be3e06 - GetUsers过滤掉离职人员信息 2019-08-07 11:35:46 +08:00
gazebo
b1209a954b - 修改门店状态同步逻辑,只有在京西本地修改过门店状态相关的信息后才同步 2019-08-07 09:52:35 +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
baa9157949 - User添加Remark 2019-08-06 11:49:42 +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
96a160e3b5 - 已接单改为待拣货,已拣货改为待配送 2019-08-06 10:50:47 +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