gdxz/hepa-calc-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2

Browse Source
This commit is contained in:
wucongxing8150 2024-07-31 18:30:05 +08:00
parent 642dd8bb0d
commit 9d17c26ef5
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/controller/OrderSingle.go
View File

@ -254,7 +254,7 @@ func (b *OrderSingle) GetOrderSinglePay(c *gin.Context) {
orderSingleService := service.OrderSingleService{} orderSingleService := service.OrderSingleService{}
prepay, err := orderSingleService.GetJsapiPrepay(orderSingle) prepay, err := orderSingleService.GetJsapiPrepay(orderSingle)
if err != nil { if err != nil {
//responses.FailWithMessage("发起支付失败", c) //responses.FailWithMessage("发起支付失败1", c)
responses.FailWithMessage(err.Error(), c) responses.FailWithMessage(err.Error(), c)
return return
} }

4
api/service/OrderSingle.go
View File

@ -312,7 +312,7 @@ func (r *OrderSingleService) GetJsapiPrepay(m *model.OrderSingle) (prepay *jsapi
return nil, errors.New("用户错误") return nil, errors.New("用户错误")
} }
if user.OpenId != "" { if user.OpenId == "" {
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }
@ -346,7 +346,7 @@ func (r *OrderSingleService) GetAppPrepay(m *model.OrderSingle) (prepay *app.Pre
return nil, errors.New("用户错误") return nil, errors.New("用户错误")
} }
if user.OpenId != "" { if user.OpenId == "" {
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }

16
extend/weChat/prepay.go
View File

@ -77,10 +77,6 @@ func (r JsapiRequest) GetJsapiPrepay() (prepay *jsapi.PrepayWithRequestPaymentRe
}, },
) )
if err != nil {
return nil, err
}
if result.Response.StatusCode != 200 { if result.Response.StatusCode != 200 {
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }
@ -89,6 +85,10 @@ func (r JsapiRequest) GetJsapiPrepay() (prepay *jsapi.PrepayWithRequestPaymentRe
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }
if err != nil {
return nil, err
}
return resp, nil return resp, nil
} }
@ -116,10 +116,6 @@ func (r AppRequest) GetAppPrepay() (prepay *app.PrepayWithRequestPaymentResponse
}, },
) )
if err != nil {
return nil, err
}
if result.Response.StatusCode != 200 { if result.Response.StatusCode != 200 {
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }
@ -128,5 +124,9 @@ func (r AppRequest) GetAppPrepay() (prepay *app.PrepayWithRequestPaymentResponse
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }
if err != nil {
return nil, err
}
return resp, nil return resp, nil
} }

2
extend/weChat/userInfo.go
View File

@ -72,5 +72,5 @@ func GetUserInfo(accessToken, openId string) (r *GetUserInfoResponse, err error)
} }
} }
return &response, err return &response, nil
} }

2
extend/weChat/webAccessToken.go
View File

@ -64,5 +64,5 @@ func GetWebAccessToken(code string) (r *GetWebAccessTokenResponse, err error) {
} }
} }
return &response, err return &response, nil
} }