Commit Graph

1071 Commits

Author SHA1 Message Date
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
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
zhudan
a32c805785 Accept Merge Request #1: (don -> mark)
Merge Request: 打开刷新假开店开关
Created By: @zhudan
Accepted By: @zhudan
URL: https://rosydev.coding.net/p/jx-callback/git/merge/1
2019-09-02 10:23:45 +08:00
gazebo
9307114a7a + sync2.go 2019-09-02 09:31:26 +08:00
Rosy-zhudan
bb7a2ce37b 打开刷新假开店开关 2019-09-02 08:58:58 +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
4ad77227d6 - fk 2019-08-29 10:39:40 +08:00
gazebo
f25beafb9e - fk 2019-08-29 10:13:36 +08:00
gazebo
ab8b25e60a - 去掉秒杀,直降折扣限制 2019-08-28 18:44:51 +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