Commit Graph

589 Commits

Author SHA1 Message Date
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
gazebo
03296d1a99 - dao.GetSkuByCats中,要判断sku_name是否被删除了 2019-08-30 15:56:43 +08:00
Rosy-zhudan
a1086344ca 优化速度 2019-08-30 13:38:42 +08:00
gazebo
7afd15cf0e - 优化dao.GenQuestionMarks 2019-08-30 09:54:23 +08:00
Rosy-zhudan
e0bbfa0150 商品子分类下商品的重排序 2019-08-30 08:58:37 +08:00
gazebo
81ae87f5a5 - 优化GetStoreSkus2中的SQL(强制转换vendor_category_id至字符串以使用索引) 2019-08-29 15:13:36 +08:00
gazebo
4e09e36cff + SkuCategoryMap 2019-08-29 08:39:58 +08:00
gazebo
3cf3c9ddfe + apimanager 2019-08-28 11:41:04 +08:00
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