gazebo
|
7cb6708165
|
- 老TOKEN调用user2/GetMyStoreList时，返回TOKEN无效或过期错，要求重新登录
|
2019-08-28 16:50:00 +08:00 |
|
gazebo
|
9e6a0148f8
|
- 修复updateStoreSkusSaleWithoutSync中的bug
|
2019-08-28 16:43:30 +08:00 |
|
gazebo
|
5eab792196
|
- 认证通过且通过手机（或邮箱）能找到用户，在没有相应认证方式的情况下，自动绑定此认证方式
|
2019-08-28 10:41:51 +08:00 |
|
gazebo
|
3f69f94cbb
|
- 平台多账号相关
|
2019-08-27 18:45:58 +08:00 |
|
gazebo
|
71495be821
|
- fk
|
2019-08-27 15:05:09 +08:00 |
|
gazebo
|
11f4468846
|
- 再次调整TransferLegacyWeixins的调用时机，回到之前几个点都要调用的方式
|
2019-08-27 14:56:21 +08:00 |
|
gazebo
|
ebb8b8ed44
|
- RegisterUser中误设置UserTypeBoss
|
2019-08-27 14:44:10 +08:00 |
|
gazebo
|
af5947288d
|
- 修复TransferLegacyWeixins中删除角色的BUG
|
2019-08-27 14:36:18 +08:00 |
|
gazebo
|
702713933d
|
- 调整TransferLegacyWeixins的调用时机，只在UnbindMobile与BindMobile2调用
|
2019-08-27 14:27:58 +08:00 |
|
gazebo
|
7dfa59e6e0
|
- 区分菜市与果园的调试端口
|
2019-08-27 10:00:40 +08:00 |
|
gazebo
|
0eaa99bb62
|
- GetStores中转换至百度坐标OK
|
2019-08-26 18:53:12 +08:00 |
|
gazebo
|
b1d7cb8f18
|
- fk
|
2019-08-26 18:37:53 +08:00 |
|
gazebo
|
139d3fec0f
|
- fk
|
2019-08-26 17:47:40 +08:00 |
|
gazebo
|
ec612b807b
|
- fk
|
2019-08-26 17:31:56 +08:00 |
|
gazebo
|
a39a4b7917
|
- UpdateStore中调用updateCourierStores时的判断逻辑修改
|
2019-08-26 16:58:08 +08:00 |
|
gazebo
|
20c63e7f59
|
- auth1与auth2以为是兼容
|
2019-08-26 15:17:42 +08:00 |
|
gazebo
|
fcc87c34af
|
- TransferLegacyWeixins中采用增量式
|
2019-08-26 11:44:47 +08:00 |
|
gazebo
|
881198d0f1
|
- GetStores添加provinceCode
|
2019-08-22 19:19:01 +08:00 |
|
gazebo
|
966646f953
|
- 去掉GetStores的坐标转（转换至百度坐标要百度API，高德不行）
|
2019-08-21 21:28:23 +08:00 |
|
gazebo
|
2be1c7b71d
|
- GetStores添加参数:startStoreID, coordinateType。返回值添加provinceName省名
|
2019-08-21 18:21:07 +08:00 |
|
gazebo
|
5e94bf4dbd
|
- fk
|
2019-08-21 16:42:36 +08:00 |
|
gazebo
|
8e284beba0
|
+ StoreMap添加FakeOpenStart和FakeOpenStop
|
2019-08-21 16:28:57 +08:00 |
|
gazebo
|
c35df3a5a4
|
- 同步门店商品时，修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
|
2019-08-21 15:35:13 +08:00 |
|
gazebo
|
9b8173d0f7
|
- 修改getGetStoresSkusBaseSQL中查询导常商品的逻辑
|
2019-08-21 14:17:02 +08:00 |
|
gazebo
|
bf3e825f11
|
- SyncStoresSkus2中，当setSyncStatus不为0时，在要处理相应门店时，才设置相应标志（之前是一开始全部设置标志）
|
2019-08-21 08:34:32 +08:00 |
|
XJH-Rosy
|
360844863c
|
Accept Merge Request #37: (don -> mark)
Merge Request: 把京西有，平台无且没有待创建标记的商品加上待创建标记
Created By: @Nathan drake
Accepted By: @XJH-Rosy
URL: https://coding.net/u/XJH-Rosy/p/jx-callback/git/merge/37
|
2019-08-20 17:20:28 +08:00 |
|
Rosy-zhudan
|
faef402cbb
|
修改-把京西有，平台无且没有待创建标记的商品加上待创建标记
|
2019-08-20 16:50:09 +08:00 |
|
Rosy-zhudan
|
212800934f
|
把京西有，平台无且没有待创建标记的商品加上待创建标记
|
2019-08-20 15:56:24 +08:00 |
|
gazebo
|
3780f5c62e
|
- 用户添加角色时，判断用户类型
|
2019-08-20 15:36:49 +08:00 |
|
gazebo
|
467bb42e13
|
- UpdatStore时，如果是外卖管理，忽略printerKey
|
2019-08-20 11:43:09 +08:00 |
|
Rosy-zhudan
|
9773900d34
|
敏感词修改代码结构
|
2019-08-19 11:22:30 +08:00 |
|
Rosy-zhudan
|
793a9a135a
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-19 11:13:57 +08:00 |
|
gazebo
|
6b792f94cf
|
- up
|
2019-08-19 10:43:36 +08:00 |
|
Rosy-zhudan
|
5c124f5c8f
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-19 10:36:25 +08:00 |
|
gazebo
|
95ad39fd49
|
- GetStores添加
t1.market_man_role,
t1.operator_role,
t1.operator_role2,
t1.printer_font_size,
|
2019-08-19 10:28:43 +08:00 |
|
Rosy-zhudan
|
dee9eea64a
|
修改敏感词过滤代码结构
|
2019-08-19 10:27:04 +08:00 |
|
gazebo
|
ba94bb061b
|
- AddStoreBossByMoble添加调试
|
2019-08-19 10:17:47 +08:00 |
|
gazebo
|
d7b38e196e
|
+ AddStoreBossByMoble
|
2019-08-19 10:04:25 +08:00 |
|
gazebo
|
1f2c9ae48f
|
+ Store添加OperatorRole2，Store.PrinterFontSize
|
2019-08-19 09:48:59 +08:00 |
|
Rosy-zhudan
|
9425f3c07a
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-19 08:33:05 +08:00 |
|
gazebo
|
882a7c60ad
|
- 修复添加excludeSkuIDs引入的同步bug
|
2019-08-17 11:16:21 +08:00 |
|
Rosy-zhudan
|
353b187edb
|
京西和平台商品对比-加入数据分析Sheet
|
2019-08-16 18:34:21 +08:00 |
|
gazebo
|
33e4b7e329
|
- up
|
2019-08-16 17:51:32 +08:00 |
|
gazebo
|
60d5940f3e
|
- GetStores时keyword查询证照相关的信息
|
2019-08-16 17:49:52 +08:00 |
|
gazebo
|
79533bed09
|
- 同步相关操作添加excludeSkuIDs参数
|
2019-08-16 15:06:20 +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
|
c27d610fbb
|
- 整理sync.go
|
2019-08-16 14:12:11 +08:00 |
|
gazebo
|
b36f8b3ae1
|
- UpdateStoresSkusSale中对于autoSaleAt按服务器设置处理，不管客户端传的具体值
|
2019-08-15 18:43:55 +08:00 |
|
gazebo
|
dd201a58fb
|
- up
|
2019-08-15 15:50:13 +08:00 |
|