liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-08-27 18:13:52 +08:00
parent a4de571a19 c8926056fb
commit 09298ad560
5 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxstore/cms/authz.go
View File

@@ -115,7 +115,14 @@ func TransferLegacyWeixins(mobile string) (err error) {
} }
} else { } else {
if mobile != "" { if mobile != "" {
api2.RoleMan.DeleteRole4User(user.GetID(), autils.NewRole(authz.StoreRoleBoss, v.JxStoreID)) rList, err2 := api2.RoleMan.GetUserRoleList(user.GetID())
if err = err2; err == nil {
for _, role := range rList {
if role.StoreID > 0 {
api2.RoleMan.DeleteRole4User(user.GetID(), autils.NewRole(authz.StoreRoleBoss, role.StoreID))
}
}
}
} }
} }
} }

6
business/jxstore/cms/user2.go
View File

@@ -87,11 +87,13 @@ func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.A
mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.Mobile, auth2.UserIDMobile, mobileVerifyCode) mobileAuth, err2 := auth2.Login(auth2.AuthTypeMobile, user.Mobile, auth2.UserIDMobile, mobileVerifyCode)
if err = err2; err == nil { if err = err2; err == nil {
if !mobileAuth.IsUserEmpty() { if !mobileAuth.IsUserEmpty() {
return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonActSkuConflict) return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist)
} }
user.Type = model.UserTypeConsumer | model.UserTypeBoss user.Type = model.UserTypeConsumer
if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff { if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
user.Type |= model.UserTypeOperator user.Type |= model.UserTypeOperator
} else {
user.Type |= model.UserTypeStoreBoss
} }
if err = CreateUser(user, "RegisterUser"); err == nil { if err = CreateUser(user, "RegisterUser"); err == nil {
if outAuthInfo, err = auth2.BindUser(mobileAuth, user); err == nil && inAuthInfo != nil { if outAuthInfo, err = auth2.BindUser(mobileAuth, user); err == nil && inAuthInfo != nil {

44
business/model/const.go
View File

@@ -172,17 +172,17 @@ var (
}, },
} }
AfsReasonTypeName = map[int]string{ AfsReasonTypeName = map[int]string{
AfsReasonTypeGoodsQuality: "商品质量", AfsReasonTypeGoodsQuality: "商品质量",
AfsReasonTypeWrongGoods: "错误的商品", AfsReasonTypeWrongGoods: "错误的商品",
AfsReasonTypeMissingGoods: "缺少部分商品", AfsReasonTypeMissingGoods: "缺少部分商品",
AfsReasonTypeNoGoods: "全部商品未收到", AfsReasonTypeNoGoods: "全部商品未收到",
AfsReasonTypeDamagedGoods: "商品有损伤", AfsReasonTypeDamagedGoods: "商品有损伤",
AfsReasonTypeGoodsQuantity: "缺斤少两", AfsReasonTypeGoodsQuantity: "缺斤少两",
AfsReasonTypeAgreedByMerchant: "与商家协商一致", AfsReasonTypeGoodsAbsent: "商家通知我缺货",
AfsReasonTypeGoodsNoSame: "商品与描述不符", AfsReasonTypeGoodsNoSame: "商品与描述不符",
AfsReasonWrongPurchase: "误购", AfsReasonWrongPurchase: "误购",
AfsReasonNotReceivedIntime: "未在时效内送达", AfsReasonNotReceivedIntime: "未在时效内送达",
AfsReasonNotOthers: "其它", AfsReasonNotOthers: "其它",
} }
AfsAppealTypeName = map[int]string{ AfsAppealTypeName = map[int]string{
AfsAppealTypeRefund: "仅退款", AfsAppealTypeRefund: "仅退款",
@@ -342,17 +342,17 @@ const (
) )
const ( const (
AfsReasonTypeGoodsQuality = 1 // 商品质量 AfsReasonTypeGoodsQuality = 1 // 商品质量
AfsReasonTypeWrongGoods = 2 // 错误的商品 AfsReasonTypeWrongGoods = 2 // 错误的商品
AfsReasonTypeMissingGoods = 3 // 缺少部分商品 AfsReasonTypeMissingGoods = 3 // 缺少部分商品
AfsReasonTypeNoGoods = 4 // 全部商品未收到 AfsReasonTypeNoGoods = 4 // 全部商品未收到
AfsReasonTypeDamagedGoods = 5 // 商品有损伤 AfsReasonTypeDamagedGoods = 5 // 商品有损伤
AfsReasonTypeGoodsQuantity = 6 // 缺斤少两 AfsReasonTypeGoodsQuantity = 6 // 缺斤少两
AfsReasonTypeAgreedByMerchant = 7 // 与商家协商一致 AfsReasonTypeGoodsAbsent = 7 // 商家通知缺货
AfsReasonTypeGoodsNoSame = 8 // 商品与描述不符 AfsReasonTypeGoodsNoSame = 8 // 商品与描述不符
AfsReasonWrongPurchase = 9 // 误购 AfsReasonWrongPurchase = 9 // 误购
AfsReasonNotReceivedIntime = 10 // 未在时效内送达 AfsReasonNotReceivedIntime = 10 // 未在时效内送达
AfsReasonNotOthers = 0 // 其它 AfsReasonNotOthers = 0 // 其它
) )
const ( const (

1
business/partner/purchase/ebai/waybill.go
View File

@@ -22,6 +22,7 @@ var (
ebaiapi.WaybillStatusSelfDelivery: model.WaybillStatusUnknown, ebaiapi.WaybillStatusSelfDelivery: model.WaybillStatusUnknown,
ebaiapi.WaybillStatusDontDeliver: model.WaybillStatusCanceled, ebaiapi.WaybillStatusDontDeliver: model.WaybillStatusCanceled,
ebaiapi.WaybillStatusDeliveryRejected: model.WaybillStatusCanceled, ebaiapi.WaybillStatusDeliveryRejected: model.WaybillStatusCanceled,
ebaiapi.WaybillStatusCourierArrived: model.WaybillStatusCourierArrived,
} }
) )

4
business/partner/purchase/jd/order_afs.go
View File

@@ -41,7 +41,7 @@ var (
jdapi.AfsReasonTypeNoGoods: model.AfsReasonTypeNoGoods, jdapi.AfsReasonTypeNoGoods: model.AfsReasonTypeNoGoods,
jdapi.AfsReasonTypeDamagedGoods: model.AfsReasonTypeDamagedGoods, jdapi.AfsReasonTypeDamagedGoods: model.AfsReasonTypeDamagedGoods,
jdapi.AfsReasonTypeGoodsQuantity: model.AfsReasonTypeGoodsQuantity, jdapi.AfsReasonTypeGoodsQuantity: model.AfsReasonTypeGoodsQuantity,
jdapi.AfsReasonTypeAgreedByMerchant: model.AfsReasonTypeAgreedByMerchant, jdapi.AfsReasonTypeGoodsAbsent: model.AfsReasonTypeGoodsAbsent,
jdapi.AfsReasonTypeGoodsSizeNoSame: model.AfsReasonTypeGoodsNoSame, jdapi.AfsReasonTypeGoodsSizeNoSame: model.AfsReasonTypeGoodsNoSame,
jdapi.AfsReasonTypeGoodsColorNoSame: model.AfsReasonTypeGoodsNoSame, jdapi.AfsReasonTypeGoodsColorNoSame: model.AfsReasonTypeGoodsNoSame,
jdapi.AfsReasonWrongPurchase: model.AfsReasonWrongPurchase, jdapi.AfsReasonWrongPurchase: model.AfsReasonWrongPurchase,
@@ -218,7 +218,7 @@ func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.Goods
// 发起部分退款 // 发起部分退款
func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) { func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) {
if globals.EnableJdStoreWrite { if globals.EnableJdStoreWrite {
_, err = api.JdAPI.AfsSubmit(order.VendorOrderID, ctx.GetUserName(), utils.Int2Str(jdapi.AfsReasonTypeAgreedByMerchant), reason, "", order.ConsigneeName, order.ConsigneeMobile, order.ConsigneeAddress, orderSkus2AfsSkus(refundSkuList)) _, err = api.JdAPI.AfsSubmit(order.VendorOrderID, ctx.GetUserName(), utils.Int2Str(jdapi.AfsReasonWrongPurchase), reason, "", order.ConsigneeName, order.ConsigneeMobile, order.ConsigneeAddress, orderSkus2AfsSkus(refundSkuList))
} }
return err return err
} }