Commit Graph

513 Commits

Author SHA1 Message Date
Rosy-zhudan
a7b2dc3abd 门店红线警告 2019-09-27 10:36:34 +08:00
gazebo
8a1d364e4e 商品详情描述图片加入DataResource管理,老数据还未迁移 2019-09-26 20:55:08 +08:00
gazebo
39051c2189 上传图片至平台的并行数调整为2,经常出timeout,带宽不够 2019-09-26 17:01:11 +08:00
gazebo
78930d9c1a 三方运单计价各管各,不在以美团为基准,创建运单只有一个限制条件,最高运费:maxDeliveryFee
优化美团运费计算,两点距离用高德API实际计算行走距离
2019-09-26 15:47:18 +08:00
gazebo
7f46072cc5 - 将skuName中的图片外移至dataResource 2019-09-26 08:35:26 +08:00
gazebo
d25b096353 - GetAfsOrders添加参数skuIDs 2019-09-25 11:16:51 +08:00
gazebo
bf86235ce2 - 添加用户最后登录信息 2019-09-24 18:09:32 +08:00
gazebo
412b11396a - 注释掉老user与auth相关的代码 2019-09-24 16:39:50 +08:00
gazebo
72c9889d10 - GetOrders添加GetOrders参数 2019-09-24 14:51:15 +08:00
gazebo
86b958a8f0 - GetStoreTotalScoreList中的日期处理错误 2019-09-24 08:49:06 +08:00
Rosy-zhudan
2814b0c55a 得到门店总分排名 2019-09-23 16:58:02 +08:00
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