liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,161 Commits 4 Branches 0 Tags
e9aeb8a5cdbf8a738e0a08dd5a9b617de93f1e49
Commit Graph

2181 Commits

Author SHA1 Message Date
gazebo
470f54f705 添加API SyncStoresCourierInfo 2019-10-11 16:12:09 +08:00
zhudan
ed877c246b Accept Merge Request #9: (don -> mark) 
Merge Request: 门店触犯红线通知
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/9
 2019-10-10 10:12:26 +08:00
gazebo
90bffc3757 处理只单独修改门店AutoEnableAt的情况 2019-10-10 09:55:33 +08:00
gazebo
c8f702a861 up 2019-10-10 09:44:31 +08:00
Rosy-zhudan
dab0452531 Merge remote-tracking branch 'origin/mark' into don 2019-10-10 09:43:15 +08:00
Rosy-zhudan
1c5c0bbbcc 修改反馈 2019-10-10 09:42:41 +08:00
gazebo
c237c4957c 修改临时休息自动恢复逻辑，兼容之前没有设置恢复营业时间的情况 2019-10-10 09:40:48 +08:00
gazebo
de09aeaedd Store添加字段AutoEnableAt 2019-10-10 09:20:57 +08:00
Rosy-zhudan
de617fbc49 Merge remote-tracking branch 'origin/mark' into don 2019-10-10 08:45:07 +08:00
gazebo
3855e79809 用户修改属性时的最后修改人从jxadmin改为用户id 
用户注册时也记录相应的最后登录信息
 2019-10-09 11:06:08 +08:00
Rosy-zhudan
83349188fc 修正 2019-10-09 09:50:47 +08:00
Rosy-zhudan
aa6e94be89 Merge remote-tracking branch 'origin/mark' into don 2019-10-09 08:45:50 +08:00
gazebo
1c7edc4b86 修复getStoresSql中对于角色查询条件的bug 2019-10-08 17:05:14 +08:00
gazebo
34506d08a9 添加Store.OperatorPhone2 
门店搜索支持电话号码
 2019-10-08 14:18:44 +08:00
Rosy-zhudan
0079a04817 重构警告等级 2019-09-30 18:55:46 +08:00
gazebo
22693ea969 fk 2019-09-30 14:13:37 +08:00
gazebo
9eca49c7e1 设置可售时修改最后修改时间与修改人 2019-09-30 12:15:56 +08:00
gazebo
e876031a21 修复在活动中强行添加VendorIDJX导致的bug 2019-09-30 12:10:15 +08:00
gazebo
ff9c21fbe4 活动异常调试 2019-09-30 12:03:09 +08:00
gazebo
919f9e303e 抓取网页门店数据的任务，在beta上每天04:05:06执行 2019-09-30 11:01:27 +08:00
Rosy-zhudan
ec6565992f 门店红线-写入和统计数据 2019-09-30 10:45:29 +08:00
gazebo
a41a00d069 添加API：cms/GetCityBankBranches 2019-09-30 10:05:08 +08:00
Rosy-zhudan
b9e0145cd5 Merge remote-tracking branch 'origin/mark' into don 2019-09-29 18:33:38 +08:00
Rosy-zhudan
1ef5d248e8 门店红线/黄线统计-写入数据库 2019-09-29 18:32:55 +08:00
gazebo
7d03337e50 dao.GetStoreDetail针对VendorIDJX特殊处理 2019-09-29 17:51:57 +08:00
gazebo
4c6cdc4e97 活动创建平台添加京西 2019-09-29 17:19:12 +08:00
Rosy-zhudan
7b89b528c3 Merge remote-tracking branch 'origin/mark' into don 2019-09-27 18:04:57 +08:00
Rosy-zhudan
0c0ac4fd69 触犯红线通知 2019-09-27 17:59:39 +08:00
gazebo
4af8ebd8ef 不需要客户端再主动调用RegisterDataResource了，RegisterDataResource改为空操作 2019-09-27 16:56:51 +08:00
Rosy-zhudan
6f579e7f1b 门店触犯红线通知 2019-09-27 16:30:18 +08:00
gazebo
f4c13e2159 GetStoresSkus和GetStoreSkus添加参数isAct 2019-09-27 16:24:56 +08:00
gazebo
02e14a1b1d CheckImages中，如果商品下架，则不报警 2019-09-27 15:37:27 +08:00
gazebo
e6cdf9fb86 up 2019-09-27 14:54:02 +08:00
gazebo
355a1ce72f up 2019-09-27 14:30:46 +08:00
gazebo
2ed3b3fa64 tempop.CheckImages 2019-09-27 12:08:27 +08:00
Rosy-zhudan
a7b2dc3abd 门店红线警告 2019-09-27 10:36:34 +08:00
gazebo
918dda4851 修复门店配送范围时，检查数据合法性 2019-09-27 09:59:31 +08:00
gazebo
88fa351cbb 将DataResource.IsVendor改为UseType 2019-09-27 09:23:11 +08:00
gazebo
67f1c3bf77 修复UploadImg4Vendors中ImgHashCode可能重复的bug 2019-09-27 09:12:49 +08:00
gazebo
326990cd18 处理DescImg 2019-09-27 08:50:32 +08:00
gazebo
ad51a01e75 修改UploadImg4Vendors为SkuName.DescImg用 2019-09-26 21:06:56 +08:00
gazebo
b88aa22b40 去除对于SkuName.ImgHashCode的依赖 2019-09-26 21:02:42 +08:00
gazebo
8a1d364e4e 商品详情描述图片加入DataResource管理，老数据还未迁移 2019-09-26 20:55:08 +08:00
gazebo
14961bd9f1 fix DataResource.ResoureType为ResourceType 2019-09-26 18:06:14 +08:00
gazebo
5b1475fa13 err在UploadImg4Vendors中错误被局部了 2019-09-26 17:35:08 +08:00
gazebo
39051c2189 上传图片至平台的并行数调整为2，经常出timeout，带宽不够 2019-09-26 17:01:11 +08:00
gazebo
0b2321e7a6 优化GetMyStoreListNew的返回数据 2019-09-26 16:10:59 +08:00
gazebo
3e6c031cd3 UploadImg4Vendors中防止添加DataResource时，加入hashCode为空的 2019-09-26 10:49:54 +08:00
gazebo
3d916f5dd6 UploadImg4Vendors中添加：统一SkuName中同hashCode，不同图片地址至同一地址 2019-09-26 10:31:25 +08:00
gazebo
3da4a38803 去掉每晚同步的特殊sku列表 2019-09-26 10:10:15 +08:00