Commit Graph

1099 Commits

Author SHA1 Message Date
gazebo
d5b31014ca - 临时禁止同步时平台分类为空的报警 2019-09-17 21:16:30 +08:00
gazebo
9a7ab6425f - 活动出错信息返回最终的活动价 2019-09-17 18:15:55 +08:00
zhudan
61c52330fd Accept Merge Request #4: (don -> mark)
Merge Request: 门店评分-修改BUG
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/4
2019-09-17 17:03:10 +08:00
gazebo
f4b6516b4d + 添加数据资源操作相关的API 2019-09-17 16:02:44 +08:00
gazebo
daa72b7b7d Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-09-17 11:31:07 +08:00
gazebo
b54f86f00c - IsSyncStatusSec fixed to IsSyncStatusSeq
- 修改(或创建)单平台门店商品时,如果没有平台分类ID,报警
2019-09-17 11:30:07 +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
7bc963c31f - 修复门店报警门店按城市排序的bug 2019-09-17 10:47:09 +08:00
gazebo
ea58ab6f79 - 门店报警信息按城市排序 2019-09-16 15:33:29 +08:00
gazebo
54a55dcac0 - 活动价保留到到角 2019-09-12 16:55:11 +08:00
gazebo
e789e17714 + getAllUsers4Store 2019-09-12 14:54:28 +08:00
gazebo
9345f12738 - beta启动时自动运行netspider.GetAndStoreCitiesShops 2019-09-11 21:44:06 +08:00
gazebo
88f55a1234 - checkConfig 2019-09-11 17:58:09 +08:00
gazebo
435b4397d6 - 门店状态报警提示修改 2019-09-11 17:42:26 +08:00
gazebo
eab614a734 + RegisterPurchaseOrderHandler(为了适应加入的京西自营商城) 2019-09-11 15:10:32 +08:00
gazebo
86fc32cf2e + GetRolesUserList 2019-09-11 11:04:29 +08:00
gazebo
cc750af2ca - 修复SendAlarmVendorSnapshot调用GetUsers时,防止roleUserIDList为空的bug 2019-09-10 15:22:15 +08:00
gazebo
fb8732c94c - 门店状态变化添加发送微信通知消息 2019-09-10 11:23:39 +08:00
gazebo
7dd0da9f97 - 不支持添加系统参数 2019-09-09 18:00:47 +08:00
gazebo
5f2415c8a5 - PruneMissingStoreSkus中改用NewParallelTask 2019-09-09 17:40:08 +08:00
gazebo
cf6bd1d5ea - SyncStoresCategory中改为并行任务 2019-09-09 17:29:25 +08:00
gazebo
13c9bb76d4 - PruneMissingStoreSkus的bug 2019-09-09 17:07:17 +08:00
gazebo
910e351c00 - PruneMissingStoreSkus也会删除本地不存在的远程分类 2019-09-09 17:03:01 +08:00
gazebo
eb1c8d38b9 - 修复PruneMissingStoreSkus中的bug 2019-09-09 16:05:19 +08:00
gazebo
322d196992 - 临时修改SendAlarmVendorSnapshot 2019-09-09 13:37:37 +08:00
gazebo
f4e97af0e1 + 添加autils.NewStoreBossRole 2019-09-09 12:03:07 +08:00
gazebo
937cfe187c - up 2019-09-07 10:47:13 +08:00
gazebo
92b6c24347 - 调整CreateConsumerFromOrders 2019-09-07 10:37:02 +08:00
gazebo
b10ed6d97d - 从订单来创建的用户Remark都标记为fromOrder 2019-09-06 16:39:13 +08:00
gazebo
47a0a892b6 - 重构了dao.GetAuthBind和dao.GetUserBindAuthInfo
- AuthBind的唯一索引调整为"AuthID", "Type", "BindType", "DeletedAt"
2019-09-06 16:26:47 +08:00
gazebo
a12f15af52 - up 2019-09-06 15:33:12 +08:00
gazebo
a89928a366 - remove fuck 2019-09-06 15:11:36 +08:00
gazebo
2d06499663 - CreateConsumerFromOrders在限制并发数为1,以免出现主键重错误 2019-09-06 14:24:39 +08:00
gazebo
9e0ca4f185 + CreateConsumerFromOrders 2019-09-06 13:45:10 +08:00
gazebo
a393869612 + Store.SMSNotify 2019-09-06 09:07:27 +08:00
gazebo
522c9082ef - 修复dao.GetUserList的bug
- QueryActs添加参数syncStatus
2019-09-05 18:02:53 +08:00
gazebo
f5ec608a1c - 创建或更新京西门店,注册用户时,自动根据门店的tel1,tel2添加门店老板角色 2019-09-05 16:57:28 +08:00
gazebo
059e563f08 - HandleOrder4Consignee 2019-09-05 14:58:31 +08:00
gazebo
a0bb7d37f0 - 将IsMobileFake用IsStringLikeMobile替换
- 添加HandleOrder4Consignee, GetRealMobile4Order和GetAuthType4Vendor
- 添加GoodsOrder.VendorUserID
2019-09-04 18:50:25 +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
0bdcdde11c - 添加IStoreSkuSorter接口,但当前无实际平台支持 2019-09-04 11:42:58 +08:00
gazebo
e22a171176 - 去掉对于ebde_shops与jde_store的依赖 2019-09-03 15:58:26 +08:00
gazebo
dad8adc4bf + AuthBind中添加BindType
- 合并函数GetAuthBindsByAuthID2
- User中的mobile与email改为可为null
2019-09-03 15:35:54 +08:00
gazebo
23e9adc86e - 平台门店名存储原始全名 2019-09-03 11:22:16 +08:00
gazebo
14ce826e6e - 修复updateVendorStoreStatusBySnapshot中更新平台门店名的BUG 2019-09-03 10:21:47 +08:00
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