xujianhua
|
c5df4f5f5e
|
Accept Merge Request #6: (don -> mark)
Merge Request: 城市商品销量统计
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/6
|
2019-09-20 15:25:39 +08:00 |
|
gazebo
|
025b2b0cfd
|
+ DeleteRecipes
|
2019-09-17 18:22:06 +08:00 |
|
gazebo
|
c4c5afb6f9
|
- 修复菜谱BUG
|
2019-09-17 17:46:56 +08:00 |
|
gazebo
|
8dbb872f4c
|
- 修改菜谱的几个bug
|
2019-09-17 17:25:24 +08:00 |
|
gazebo
|
d8f684f720
|
- up
|
2019-09-17 17:06:08 +08:00 |
|
gazebo
|
f4b6516b4d
|
+ 添加数据资源操作相关的API
|
2019-09-17 16:02:44 +08:00 |
|
gazebo
|
bf8fd2f255
|
- 菜谱API基本OK
|
2019-09-17 14:39:15 +08:00 |
|
xujianhua
|
9c7ae16186
|
Accept Merge Request #3: (don -> mark)
Merge Request: 门店评分
Created By: @zhudan
Accepted By: @xujianhua
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/3
|
2019-09-17 11:12:33 +08:00 |
|
gazebo
|
312ce745cc
|
- 菜谱相关
|
2019-09-16 18:40:43 +08:00 |
|
gazebo
|
0a0c051d50
|
- up
|
2019-09-16 14:16:21 +08:00 |
|
gazebo
|
569abe56b5
|
- 添加自提假订单处理
|
2019-09-11 17:31:07 +08:00 |
|
gazebo
|
3919aafe83
|
- GetAndStoreCitiesShops添加参数isShuffle
|
2019-09-11 16:49:56 +08:00 |
|
gazebo
|
86fc32cf2e
|
+ GetRolesUserList
|
2019-09-11 11:04:29 +08:00 |
|
gazebo
|
edd0e8c282
|
- 饿百将一个分类重复改名，也会报分类名重复错，特殊处理一下，不过因为GetStoreCategory其实会拉取所有的门店分类，是比较耗时的操作
|
2019-09-09 14:23:37 +08:00 |
|
gazebo
|
9e0ca4f185
|
+ CreateConsumerFromOrders
|
2019-09-06 13:45:10 +08:00 |
|
gazebo
|
522c9082ef
|
- 修复dao.GetUserList的bug
- QueryActs添加参数syncStatus
|
2019-09-05 18:02:53 +08:00 |
|
gazebo
|
5105a00075
|
- RegisterUser-->RegisterUserWithMobile
|
2019-09-04 17:44:20 +08:00 |
|
gazebo
|
c2f76e38b6
|
- RegisterUser修改操作人员为IP加认证ID
|
2019-09-04 16:47:20 +08:00 |
|
gazebo
|
f55a744570
|
- 处理美团外卖隐私号降级的情况
|
2019-09-04 15:13:27 +08:00 |
|
gazebo
|
d54a4f569a
|
- 京东到家自提单支持，新增API:ConfirmSelfTake, GoodsOrder新增字段DeliveryType
|
2019-09-03 18:18:54 +08:00 |
|
gazebo
|
4e617f4ef5
|
- 京西自营商城可以存订单了
|
2019-09-02 18:33:43 +08:00 |
|
Rosy-zhudan
|
02bb89d67d
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-30 16:01:12 +08:00 |
|
Rosy-zhudan
|
a7270ccd84
|
修改各处商品查询加入Seq排序字段
|
2019-08-30 15:08:44 +08:00 |
|
gazebo
|
d428a0334a
|
- 注释掉价格审核相关的一些代码
|
2019-08-30 14:07:25 +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
|
511a0b02e9
|
Merge remote-tracking branch 'origin/mark' into don
|
2019-08-29 14:49:09 +08:00 |
|
gazebo
|
ce53d17461
|
- UnmanageTasks中添加GC
|
2019-08-29 12:02:10 +08:00 |
|
Rosy-zhudan
|
71f918568c
|
二维码/条形码的生成
|
2019-08-29 11:54:21 +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
|
da6fdd4c8e
|
- BindMiniProgram成功后调用TransferLegacyWeixins
|
2019-08-28 13:54:49 +08:00 |
|
gazebo
|
5eab792196
|
- 认证通过且通过手机（或邮箱）能找到用户，在没有相应认证方式的情况下，自动绑定此认证方式
|
2019-08-28 10:41:51 +08:00 |
|
gazebo
|
4a54ea1ec2
|
+ UnmanageTasks
|
2019-08-28 09:19:43 +08:00 |
|
gazebo
|
f2972580d1
|
+ TransferLegacyWeixins
|
2019-08-27 10:10:43 +08:00 |
|
gazebo
|
7bd415c21f
|
- up
|
2019-08-26 16:01:12 +08:00 |
|
Rosy-zhudan
|
949d4e7c8d
|
重构-开启或结束所有平台商店的额外时间
|
2019-08-25 10:05:37 +08:00 |
|
gazebo
|
2be1c7b71d
|
- GetStores添加参数:startStoreID, coordinateType。返回值添加provinceName省名
|
2019-08-21 18:21:07 +08:00 |
|
gazebo
|
cdc5ec75b3
|
+ ScheduleTimerFuncOnce
|
2019-08-21 17:22:02 +08:00 |
|
gazebo
|
c0339d245a
|
- 修复GetSingleStoreVendorIDs的bug
|
2019-08-21 11:53:41 +08:00 |
|
Rosy-zhudan
|
55a1ec6ff5
|
得到敏感词列表
|
2019-08-20 17:16:47 +08:00 |
|
Rosy-zhudan
|
212800934f
|
把京西有，平台无且没有待创建标记的商品加上待创建标记
|
2019-08-20 15:56:24 +08:00 |
|
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 |
|