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 |
|
gazebo
|
b225f814ec
|
- 京东回调活动创建等5秒再执行，以免通过API创建时重复创建
- 饿百防重复创建
|
2019-07-31 09:13:09 +08:00 |
|
gazebo
|
166fcc8b6b
|
- GetStoreListByMobile去除删除的门店
|
2019-07-30 15:37:41 +08:00 |
|
gazebo
|
3c7ddddcba
|
- 调整dao.GetVendorStoreSnapshot的实现
- updateVendorStoreStatusBySnapshot中更新本地平台门店信息
|
2019-07-30 09:27:14 +08:00 |
|
gazebo
|
5b10960232
|
- 门店商品自动可售，未启用
|
2019-07-29 18:47:11 +08:00 |
|
gazebo
|
ee613bfa75
|
+ TmpGetMyStoreList
|
2019-07-29 13:59:08 +08:00 |
|
gazebo
|
6fc89defcd
|
- 修改sku规格时，相应重新计算门店商品价格并设置合适的同步标志
|
2019-07-28 16:02:52 +08:00 |
|
gazebo
|
8814628c62
|
- 修复GetEffectiveActStoreSkuInfo中没有获取vendor_id的bug
|
2019-07-27 15:56:59 +08:00 |
|
gazebo
|
4e710662ca
|
- 修复查询活动没有判断是否删除的BUG
|
2019-07-26 11:05:46 +08:00 |
|
gazebo
|
60271b83bb
|
- AddStoreCategoryMap中忽略重复错
|
2019-07-25 18:15:39 +08:00 |
|
gazebo
|
f265e13c2c
|
- 修复GetEffectiveActStoreSkuInfo不返回平台信息的bug
|
2019-07-25 16:53:49 +08:00 |
|
gazebo
|
485d402116
|
- GetStoresOrderSaleInfo中的时间从order_created_at至order_finished_at
|
2019-07-25 10:10:36 +08:00 |
|
gazebo
|
60607674b7
|
+ UpdateActStatusByTime
|
2019-07-25 10:06:04 +08:00 |
|
gazebo
|
e84e046dde
|
- 优化GetActStoreSkuVendorInfo
|
2019-07-25 09:42:47 +08:00 |
|
gazebo
|
ac7c086b7a
|
- 在创建快递门店时，处理PayeeName为空的情况
|
2019-07-24 17:56:57 +08:00 |
|
gazebo
|
1827622840
|
- GetPromotionSkuPriceMap的时间区间判断逻辑修正
|
2019-07-24 10:56:41 +08:00 |
|
gazebo
|
73d0976038
|
- up
|
2019-07-23 23:52:34 +08:00 |
|
gazebo
|
22737c7681
|
- 重构配送门店管理
|
2019-07-23 14:29:58 +08:00 |
|