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 |
|
gazebo
|
7f6ec1b9de
|
- 配置类型增加银行
|
2019-07-25 11:46:32 +08:00 |
|
gazebo
|
db45cf2051
|
- 禁止在老版活动上创建补贴表，迁移至新版，暂时保持活动表的兼容
|
2019-07-25 08:35:30 +08:00 |
|
gazebo
|
5434ea0336
|
- UpdateActStoreSkuBind正确处理返回错误
|
2019-07-24 16:50:05 +08:00 |
|
gazebo
|
e13a2d2427
|
- TestIt
|
2019-07-23 16:47:53 +08:00 |
|
gazebo
|
834a011a1f
|
- TestIt
|
2019-07-23 16:38:39 +08:00 |
|
gazebo
|
22737c7681
|
- 重构配送门店管理
|
2019-07-23 14:29:58 +08:00 |
|
gazebo
|
e2453e6832
|
+ RefundOrder, PartRefundOrder
|
2019-07-22 11:08:02 +08:00 |
|
gazebo
|
b65f5ed0a0
|
- GetStores API增加POST方式以方便传入大量参数
新增storeIDs参数，可传入要查询的城市列表，storeID参数与新参数是或的关系。
|
2019-07-22 08:55:25 +08:00 |
|
gazebo
|
f65e06168e
|
- 重构了一下misc中定时器相关的函数
|
2019-07-19 15:10:56 +08:00 |
|
gazebo
|
7f94f15dca
|
+ OpenRemoteStoreByJxStatus
|
2019-07-19 14:27:48 +08:00 |
|
gazebo
|
1096613dd5
|
- TestIt
|
2019-07-19 13:57:43 +08:00 |
|
gazebo
|
d5752381c7
|
+ partner.ListOrders
+ AmendMissingOrders
|
2019-07-18 18:46:14 +08:00 |
|
gazebo
|
450876f342
|
+ AmmendMissingOrders
|
2019-07-18 16:22:43 +08:00 |
|
gazebo
|
6087f27c38
|
- SendMsg2Somebody直接使用mobileNum与verifyCode来验证
|
2019-07-16 17:27:51 +08:00 |
|
gazebo
|
f133ccb290
|
- 平台门店调价价格包实现初始版本
|
2019-07-16 11:36:28 +08:00 |
|
gazebo
|
598a9738e8
|
+ globals.EnableNewAct
|
2019-07-15 14:19:38 +08:00 |
|
gazebo
|
498bbe07f8
|
+ cms/SendMsg2Somebody
|
2019-07-15 11:28:36 +08:00 |
|
gazebo
|
5758252cee
|
- GetStoresSkus支持Post
|
2019-07-11 13:45:46 +08:00 |
|
gazebo
|
69f9c14a15
|
+ GetStoresSkusByPost
|
2019-07-11 12:10:36 +08:00 |
|
gazebo
|
630f1b02e6
|
- 支持易联云开放应用
|
2019-07-11 10:44:07 +08:00 |
|
gazebo
|
e8f93aed2d
|
- GetActStoreSkuInfo没有商品信息时不报错
- 不存储空的饿百网页活动
|
2019-07-10 17:25:48 +08:00 |
|