gazebo
|
3b38645c71
|
- act.SyncAct中，当前逻辑要求传入活动的全部SKU信息（以便低层做一些判断，比如全部删除时要取消，所以暂时删除storeIDs与skuIDs这两个参数
|
2019-08-19 19:00:43 +08:00 |
|
gazebo
|
3c5f25b839
|
+ SyncStoresQualify
|
2019-08-15 12:40:14 +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
|
03e23ca0fd
|
- 修复之前将老平台同步逻辑注释掉引入的BUG
|
2019-08-14 00:20:35 +08:00 |
|
gazebo
|
e2867d6f67
|
Merge remote-tracking branch 'origin/don' into mark
|
2019-08-13 15:18:52 +08:00 |
|
gazebo
|
567046a238
|
- 在beta上启用EnableWXAuth2
|
2019-08-13 15:12:30 +08:00 |
|
gazebo
|
d4270bf8c3
|
- auth2也支持多小程序登录
|
2019-08-13 11:50:33 +08:00 |
|
gazebo
|
d59ca265c4
|
- IAuther.UnbindAuth的接口改为userID
|
2019-08-13 11:02:14 +08:00 |
|
Rosy-zhudan
|
505dc40559
|
ctx传参
|
2019-08-13 09:17:50 +08:00 |
|
gazebo
|
6a8e3cb4b0
|
- 去除auth.localpass（已经移到auth2.localpass）
|
2019-08-12 17:56:50 +08:00 |
|
gazebo
|
c5a5f4777b
|
- AdjustOrder与PartRefundOrder中，为了区别活动与非活动SKU，需转入SubStoreID（即单品的活动ID）区分
|
2019-08-12 17:17:12 +08:00 |
|
gazebo
|
342be58814
|
- 修复多小程序支持的BUG，从referer中得到小程序ID信息
|
2019-08-12 14:42:55 +08:00 |
|
gazebo
|
4ec85bbb73
|
- RegisterUser在已经找到相应手机号用户的情况下，返回正式登录信息
|
2019-08-12 10:59:01 +08:00 |
|
gazebo
|
d8f3b7f467
|
- 活动商品后台分页,GetActStoreSkuInfo分页，添加keyword
|
2019-08-09 11:19:43 +08:00 |
|
gazebo
|
0e45ae3151
|
- up
|
2019-08-09 09:54:51 +08:00 |
|
gazebo
|
4d1c5a6704
|
- 调试DeleteSkusFromAct
|
2019-08-09 09:48:01 +08:00 |
|
gazebo
|
7b652ed47c
|
Merge branch 'mark' of git.coding.net:XJH-Rosy/jx-callback into mark
|
2019-08-09 09:33:18 +08:00 |
|
gazebo
|
35e06e8c94
|
+ DeleteSkusFromAct
|
2019-08-09 09:33:01 +08:00 |
|
Rosy-zhudan
|
748a530108
|
ctx外部传参
|
2019-08-09 08:55:54 +08:00 |
|
gazebo
|
b51614946f
|
- 重构authz结构
- 角色管理初版完成
|
2019-08-08 17:06:58 +08:00 |
|
XJH-Rosy
|
50c5a52d6b
|
Accept Merge Request #25: (don -> mark)
Merge Request: 修改库存刷新机制-美团和饿百分时刷新
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/25
|
2019-08-08 15:06:51 +08:00 |
|
gazebo
|
1338877972
|
- weixin to wxqrcode
|
2019-08-08 10:59:41 +08:00 |
|
Rosy-zhudan
|
4facbdbbfd
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-08 09:14:21 +08:00 |
|
gazebo
|
7b488090bc
|
- rename AuthTypeWeixin from weixin to wxqrcode
|
2019-08-07 18:45:47 +08:00 |
|
gazebo
|
3639a1c7cb
|
- 角色管理初版
|
2019-08-07 18:16:44 +08:00 |
|
Rosy-zhudan
|
877566cc80
|
修改库存刷新机制-美团和饿百分时刷新
|
2019-08-07 15:19:29 +08:00 |
|
Rosy-zhudan
|
f5208eea28
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-07 09:06:50 +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
|
88ebbbf9e7
|
- GetUsers添加userID参数
|
2019-08-06 11:15:32 +08:00 |
|
Rosy-zhudan
|
dd76433a5d
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-05 15:13:44 +08:00 |
|
gazebo
|
73169746c9
|
+ user2/GetUsers
|
2019-08-05 09:38:48 +08:00 |
|
Rosy-zhudan
|
876af999c3
|
京西平台和其他平台商品的对比
|
2019-08-02 17:38:07 +08:00 |
|
Rosy-zhudan
|
06d564331e
|
京西和平台商品差异
|
2019-08-02 15:33:28 +08:00 |
|
Rosy-zhudan
|
66c3b86762
|
同步修改
|
2019-08-01 17:05:09 +08:00 |
|
Rosy-zhudan
|
018ae0e4f9
|
添加是否异步等参数，区分菜市和果园的刷新时间
|
2019-08-01 16:38:21 +08:00 |
|
Rosy-zhudan
|
6f105a7598
|
对比京西和平台商品差异
|
2019-08-01 16:00:43 +08:00 |
|
gazebo
|
d58f2879d7
|
- GetTokenInfo特殊处理ErrTokenIsInvalid
|
2019-07-31 17:31:00 +08:00 |
|
Rosy-zhudan
|
119c10a8d5
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-30 15:37:30 +08:00 |
|
gazebo
|
5628f86a10
|
- GetOrders添加可选参数：isDateFinish
- ExportOrders以完成时间来导出
|
2019-07-30 11:56:45 +08:00 |
|
Rosy-zhudan
|
0fa2d29dca
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-30 08:35:17 +08:00 |
|
gazebo
|
5b10960232
|
- 门店商品自动可售，未启用
|
2019-07-29 18:47:11 +08:00 |
|
Rosy-zhudan
|
72e8e62da5
|
修正自动更新门店数量和营业时间的问题
|
2019-07-29 17:26:43 +08:00 |
|
gazebo
|
245d5581ff
|
- PartRefundOrder与AdjustOrder针对removedList为所有商品的情况特殊处理
|
2019-07-29 16:44:42 +08:00 |
|
Rosy-zhudan
|
d1bf437044
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-07-29 16:34:37 +08:00 |
|
gazebo
|
ee613bfa75
|
+ TmpGetMyStoreList
|
2019-07-29 13:59:08 +08:00 |
|
Rosy-zhudan
|
e7f618859d
|
'定时刷新商店库存和营业时间（暂饿百和美团）'
|
2019-07-29 10:58:19 +08:00 |
|
gazebo
|
98325e40cc
|
- 修复controller.DeleteRemoteStoreSkus中的bug
|
2019-07-26 17:15:52 +08:00 |
|
gazebo
|
629a34f4d7
|
- GetStoreCourierMaps的参数全部改成formData
|
2019-07-25 18:16:20 +08:00 |
|