代码调整
This commit is contained in:
parent
ec03b1b37d
commit
76f67a41dc
|
@ -19,7 +19,14 @@ const (
|
||||||
// WeChatRedPackService @link https://pay.weixin.qq.com/docs/merchant/apis/batch-transfer-to-balance/transfer-batch/initiate-batch-transfer.html
|
// WeChatRedPackService @link https://pay.weixin.qq.com/docs/merchant/apis/batch-transfer-to-balance/transfer-batch/initiate-batch-transfer.html
|
||||||
type WeChatRedPackService struct{}
|
type WeChatRedPackService struct{}
|
||||||
|
|
||||||
func (p *WeChatRedPackService) Order(ctx context.Context, request *proto.OrderRequest) (*proto.OrderResponse, error) {
|
func (p *WeChatRedPackService) Order(ctx context.Context, request *proto.OrderRequest) (resp2 *proto.OrderResponse, respErr error) {
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
if err := recover(); err != nil {
|
||||||
|
respErr = fmt.Errorf("panic: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
config, err := transConfig(request.Config)
|
config, err := transConfig(request.Config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -45,7 +52,14 @@ func (p *WeChatRedPackService) Order(ctx context.Context, request *proto.OrderRe
|
||||||
return orderResp(request.GetOrder(), *resp.BatchId), nil
|
return orderResp(request.GetOrder(), *resp.BatchId), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *WeChatRedPackService) Query(ctx context.Context, request *proto.QueryRequest) (*proto.QueryResponse, error) {
|
func (p *WeChatRedPackService) Query(ctx context.Context, request *proto.QueryRequest) (resp2 *proto.QueryResponse, respErr error) {
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
if err := recover(); err != nil {
|
||||||
|
respErr = fmt.Errorf("panic: %v", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
config, err := transConfig(request.Config)
|
config, err := transConfig(request.Config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -33,7 +33,7 @@ func transConfig(config []byte) (*Config, error) {
|
||||||
var c Config
|
var c Config
|
||||||
|
|
||||||
if err := json.Unmarshal(config, &c); err != nil {
|
if err := json.Unmarshal(config, &c); err != nil {
|
||||||
return nil, proto.ErrorSignFail(fmt.Sprintf("配置参数解析失败: %v,参数:%s", err, string(config)))
|
return nil, proto.ErrorConfigFail(fmt.Sprintf("配置参数解析失败: %v,参数:%s", err, string(config)))
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := c.validate(); err != nil {
|
if err := c.validate(); err != nil {
|
||||||
|
|
Loading…
Reference in New Issue