Commit Graph

2912 Commits

Author SHA1 Message Date
gazebo
f3a99cf2cd - GoodsOrder添加DiscountMoney 2019-09-06 17:25:36 +08:00
gazebo
b10ed6d97d - 从订单来创建的用户Remark都标记为fromOrder 2019-09-06 16:39:13 +08:00
gazebo
f28af0e190 - AuthBind.UserID加索引 2019-09-06 16:31:56 +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
898955729e - SendSMSMsg中处理重复号码的情况 2019-09-06 13:37:47 +08:00
gazebo
5bc792f337 - 修改NotifyNewOrder 2019-09-06 10:45:44 +08:00
gazebo
e52f0e260a - 发送短信时判断EnableStoreWrite 2019-09-06 10:18:09 +08:00
gazebo
0fbe4d7024 - 新订单时,发送短信消息 2019-09-06 10:16:09 +08:00
gazebo
a393869612 + Store.SMSNotify 2019-09-06 09:07:27 +08:00
gazebo
f3d496ec60 - 查询订单运费与发三方运单时,自提单报错 2019-09-05 18:44:08 +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
c98745ce59 - 饿百转自送时,如果错误是已经是自送状态,则返回成功
- CreateWaybillOnProviders中部分失败时,输出出错日志
2019-09-05 16:09:00 +08:00
gazebo
059e563f08 - HandleOrder4Consignee 2019-09-05 14:58:31 +08:00
gazebo
6efdcdf692 - GetOrderStatusList中的排序规则 2019-09-05 09:34:48 +08:00
gazebo
a0bb7d37f0 - 将IsMobileFake用IsStringLikeMobile替换
- 添加HandleOrder4Consignee, GetRealMobile4Order和GetAuthType4Vendor
- 添加GoodsOrder.VendorUserID
2019-09-04 18:50:25 +08:00
gazebo
f50fdf2bab - 不注册京西到PurchaseHandlers 2019-09-04 17:54:35 +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
8067c8f3de - up 2019-09-04 16:30:50 +08:00
gazebo
e7b4352789 - mtwm.onNumberDowngrade优化 2019-09-04 15:17:19 +08:00
gazebo
f55a744570 - 处理美团外卖隐私号降级的情况 2019-09-04 15:13:27 +08:00
gazebo
0bdcdde11c - 添加IStoreSkuSorter接口,但当前无实际平台支持 2019-09-04 11:42:58 +08:00
gazebo
4be654fc3e - 修改一下BaseScheduler.ConfirmSelfTake在不能自动取得自提货码时报错。 2019-09-04 08:46:06 +08:00
gazebo
3eb83f4dfc + TestGetSelfTakeCode 2019-09-03 18:28:06 +08:00
gazebo
d54a4f569a - 京东到家自提单支持,新增API:ConfirmSelfTake, GoodsOrder新增字段DeliveryType 2019-09-03 18:18:54 +08:00
gazebo
d3a549a085 - fk 2019-09-03 16:55:01 +08:00
gazebo
44bc47b05e - 去掉对于ede_skus与jde_sku_infos的依赖 2019-09-03 16:01:48 +08:00
gazebo
e22a171176 - 去掉对于ebde_shops与jde_store的依赖 2019-09-03 15:58:26 +08:00
gazebo
9bff8840e5 - User.GetMobile and User.GetEmail bug修改 2019-09-03 15:51:15 +08:00
gazebo
dad8adc4bf + AuthBind中添加BindType
- 合并函数GetAuthBindsByAuthID2
- User中的mobile与email改为可为null
2019-09-03 15:35:54 +08:00
gazebo
73c5656be2 - ActStoreSku2添加Type,活动类型 2019-09-03 14:45:07 +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
7ca4429e43 - remove globals.ReallyReplyComment 2019-09-02 16:53:22 +08:00
gazebo
e4f1812337 - 绑定认证方式前,先删除可能的相同的认证方式 2019-09-02 14:53:18 +08:00
gazebo
c0c79c368d - 用户已经存在,自动继承时,正确更新当前认证方式 2019-09-02 14:27:34 +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
gazebo
de6c5de6df - SkuCategoryMap 2019-09-02 10:42:38 +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