Commit Graph

1563 Commits

Author SHA1 Message Date
gazebo
0f69e9b51e - 拉取平台信息时,存储平台门店名 2019-09-03 08:55:28 +08:00
gazebo
4e617f4ef5 - 京西自营商城可以存订单了 2019-09-02 18:33:43 +08:00
gazebo
f0d8582b12 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-09-02 14:04:48 +08:00
gazebo
3d21ffaf11 - 禁用auth1. 2019-09-02 14:04:27 +08:00
zhudan
6c8ab5cc6c Accept Merge Request #2: (don -> mark)
Merge Request: 优化重排序商品
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/git/merge/2
2019-09-02 11:21:01 +08:00
Rosy-zhudan
b12d7dad77 优化重排序商品 2019-09-02 11:13:46 +08:00
gazebo
9307114a7a + sync2.go 2019-09-02 09:31:26 +08:00
gazebo
0331e704e0 + IPurchasePlatformHandler.UpdateStoreCustomID
- 删除平台门店时,将平台门店的CUSTOMID设置为其平台ID本身
- 饿了么与微商城handler不注册了
2019-09-01 15:27:06 +08:00
gazebo
f74901739c - GetSkuNames返回Sku.Seq 2019-08-30 18:56:48 +08:00
gazebo
5e0f93a1c8 - 展示门店商品时,在分类下,按Sku.Seq排序 2019-08-30 18:41:44 +08:00
gazebo
3e7b07fc9e - UpdateSkuName中的delete几个改为小驼峰 2019-08-30 18:16: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
Rosy-zhudan
c8c09640dc 去掉seq 2019-08-30 16:00:44 +08:00
Rosy-zhudan
a7270ccd84 修改各处商品查询加入Seq排序字段 2019-08-30 15:08:44 +08:00
Rosy-zhudan
de91ac4a20 “测试优化 2019-08-30 14:09:50 +08:00
gazebo
d428a0334a - 注释掉价格审核相关的一些代码 2019-08-30 14:07:25 +08:00
Rosy-zhudan
8ec7239b1d 优化速度 2019-08-30 13:42:10 +08:00
Rosy-zhudan
a1086344ca 优化速度 2019-08-30 13:38:42 +08:00
gazebo
0b899d612f - UpdateStoresSkus中添加调试信息 2019-08-30 12:09:27 +08:00
Rosy-zhudan
088d83417f 删除更新SKU商品数据时的seq字段 2019-08-30 09:20:36 +08:00
Rosy-zhudan
e0bbfa0150 商品子分类下商品的重排序 2019-08-30 08:58:37 +08:00
Rosy-zhudan
1ea9c5aca2 修正和重构代码 2019-08-29 16:05:29 +08:00
Rosy-zhudan
f2d049bdef 修正错误 2019-08-29 15:19:43 +08:00
gazebo
ce5fc2ef9d - 优化AddCreateFlagForJxStoreSku 2019-08-29 14:04:26 +08:00
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