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

订单打款修改

Browse Source
This commit is contained in:
苏尹岚
2020-02-12 17:24:57 +08:00
parent 7c3a2ae059
commit 4ea62cb945
5 changed files with 122 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,6 @@ import (
"sync"
"time"
"git.rosy.net.cn/baseapi/platformapi/wxpayapi"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
"git.rosy.net.cn/jx-callback/globals/api/apimanager"
@@ -201,17 +199,6 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri
user.Avatar = inAuthInfo.GetAvatar()
}
}
//注册时默认商城用户就加入分账接收方
if strings.Contains(ctx.GetRequest().Referer(), "wx4b5930c13f8b1170") {
param := &wxpayapi.ProfitSharingReceiverParam{
Receiver: wxpayapi.CData(`{
"type":"` + wxpayapi.AccountTypeOpen + `",
"account":"` + inAuthInfo.GetAuthID() + `",
"relation_type":" ` + wxpayapi.Relation + `"
}`),
}
_, err = api.WxpayAPI.AddProfitSharingReceiver(param)
}
if err = CreateUser(user, utils.LimitUTF8StringLen(createName, 32)); err == nil {
userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP())
TryAddStoreBossRole4User(ctx, user)
@@ -1005,61 +992,61 @@ func UpdateUserWxNoAndPercent(user *model.User, isReceiver bool) (num int64, err
dao.Rollback(db)
}
if isReceiver {
param := &wxpayapi.ProfitSharingReceiverParam{
Receiver: wxpayapi.CData(`{
"type":"` + wxpayapi.AccountTypeOpen + `",
"account":"` + auth[0].AuthID + `",
"relation_type":" ` + wxpayapi.Relation + `"
}`),
}
_, err := api.WxpayAPI.AddProfitSharingReceiver(param)
if err != nil {
return 0, err
} else {
user2.IsReceiver = 1
num3, err := dao.UpdateEntity(db, user2, "IsReceiver")
num += num3
if err != nil {
dao.Rollback(db)
}
}
// param := &wxpayapi.ProfitSharingReceiverParam{
// Receiver: wxpayapi.CData(`{
// "type":"` + wxpayapi.AccountTypeOpen + `",
// "account":"` + auth[0].AuthID + `",
// "relation_type":" ` + wxpayapi.Relation + `"
// }`),
// }
// _, err := api.WxpayAPI.AddProfitSharingReceiver(param)
// if err != nil {
// return 0, err
// } else {
// user2.IsReceiver = 1
// num3, err := dao.UpdateEntity(db, user2, "IsReceiver")
// num += num3
// if err != nil {
// dao.Rollback(db)
// }
// }
}
dao.Commit(db)
return num, err
}
func DeleteProfitSharingReceiver(ctx *jxcontext.Context, userID string) (err error) {
db := dao.GetDB()
auth, err := dao.GetUserBindAuthInfo(db, userID, model.AuthBindTypeAuth, []string{"weixinmini"}, "", "")
if len(auth) == 0 {
return fmt.Errorf("未找到此用户的微信验证方式！用户ID：[%v]\n", userID)
}
dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db)
if r != nil {
panic(r)
}
}
}()
param := &wxpayapi.ProfitSharingReceiverParam{
Receiver: wxpayapi.CData(`{
"type":"` + wxpayapi.AccountTypeOpen + `",
"account":"` + auth[0].AuthID + `"
}`),
}
_, err = api.WxpayAPI.DeleteProfitSharingReceiver(param)
if err != nil {
return err
} else {
user2, err := dao.GetUserByID(db, "user_id", userID)
user2.IsReceiver = 0
_, err = dao.UpdateEntity(db, user2, "IsReceiver")
if err != nil {
dao.Rollback(db)
}
}
dao.Commit(db)
// db := dao.GetDB()
// auth, err := dao.GetUserBindAuthInfo(db, userID, model.AuthBindTypeAuth, []string{"weixinmini"}, "", "")
// if len(auth) == 0 {
// return fmt.Errorf("未找到此用户的微信验证方式！用户ID：[%v]\n", userID)
// }
// dao.Begin(db)
// defer func() {
// if r := recover(); r != nil || err != nil {
// dao.Rollback(db)
// if r != nil {
// panic(r)
// }
// }
// }()
// param := &wxpayapi.ProfitSharingReceiverParam{
// Receiver: wxpayapi.CData(`{
// "type":"` + wxpayapi.AccountTypeOpen + `",
// "account":"` + auth[0].AuthID + `"
// }`),
// }
// _, err = api.WxpayAPI.DeleteProfitSharingReceiver(param)
// if err != nil {
// return err
// } else {
// user2, err := dao.GetUserByID(db, "user_id", userID)
// user2.IsReceiver = 0
// _, err = dao.UpdateEntity(db, user2, "IsReceiver")
// if err != nil {
// dao.Rollback(db)
// }
// }
// dao.Commit(db)
return err
}