diff --git a/cmd/main.go b/cmd/main.go index dbb2689..da14a1c 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -3,7 +3,7 @@ package main // main 这只是一个演示 func main() { //alipayOrderRedPack() - wechatRedPackOrder() + wechatOrderCpn() //wechatRedPackQuery() //alipayNotifyRedPack() } diff --git a/cmd/wechat_cpn.go b/cmd/wechat_cpn.go index 7b282a2..d018ccf 100644 --- a/cmd/wechat_cpn.go +++ b/cmd/wechat_cpn.go @@ -27,7 +27,32 @@ func getWechatCpnConf() []byte { return marshal } -func wechatCpn() { +func wechatOrderCpn() { + err := manage.Add(wechatCpnConf) + if err != nil { + log.Fatalln(err) + } + defer manage.Close() + request := &proto.OrderRequest{ + Config: getWechatCpnConf(), + Order: &proto.OrderRequest_Order{ + OrderNo: "240403164049635931", + Account: "oO3vO5AxRWgTjmMD38FTvnB5Rq6o", + Extra: []byte(`{"app_id":"13100720242","stock_creator_mchid":"1605446142"}`), + }, + Product: &proto.OrderRequest_Product{ + ProductNo: "3102024032977191_11", + Extra: []byte(`{}`), + }, + } + res, err := instance.Order(context.Background(), alpayRedConf.Tag, request) + if err != nil { + log.Fatalln(err) + } + log.Printf("Order res:%+v", res) +} + +func wechatQueryCpn() { err := manage.Add(wechatCpnConf) if err != nil { log.Fatalln(err) diff --git a/plugins/alipay_cpn/internal/alipay_cpn.go b/plugins/alipay_cpn/internal/alipay_cpn.go index 1412a7a..7512a45 100644 --- a/plugins/alipay_cpn/internal/alipay_cpn.go +++ b/plugins/alipay_cpn/internal/alipay_cpn.go @@ -47,11 +47,13 @@ func (s *AlipayCpnService) Order(ctx context.Context, request *proto.OrderReques var sp string err = requests.URL(baseUri).Post().BodyForm(uv).ToString(&sp).Fetch(ctx) - + if err != nil { + return nil, fmt.Errorf("请求异常,msg:" + err.Error()) + } var response *po.OrderResp sp = helper.ToChinese(sp) if err = json.Unmarshal([]byte(sp), &response); err != nil { - return nil, fmt.Errorf("请求异常,msg:" + err.Error()) + return nil, fmt.Errorf("请求解析异常,msg:" + err.Error()) } return orderResp(request, response), nil @@ -84,7 +86,7 @@ func (s *AlipayCpnService) Query(ctx context.Context, request *proto.QueryReques var response po.QueryResp sp = helper.ToChinese(sp) if err = json.Unmarshal([]byte(sp), &response); err != nil { - return nil, fmt.Errorf("请求异常,msg:" + err.Error()) + return nil, fmt.Errorf("请求解析异常,msg:" + err.Error()) } return queryResp(request, response), nil diff --git a/plugins/alipay_cpn/internal/alipay_test.go b/plugins/alipay_cpn/internal/alipay_test.go index 4376bc8..ade425d 100644 --- a/plugins/alipay_cpn/internal/alipay_test.go +++ b/plugins/alipay_cpn/internal/alipay_test.go @@ -38,7 +38,7 @@ func TestOrder(t *testing.T) { Extra: []byte(`{"logon_id":"13100720242"}`), }, Product: &proto.OrderRequest_Product{ - ProductNo: "3102024032977191", + ProductNo: "3102024032977191_11", Extra: []byte(`{}`), }, } diff --git a/plugins/alipay_cpn/internal/po/order.go b/plugins/alipay_cpn/internal/po/order.go index d43a577..f535ddd 100644 --- a/plugins/alipay_cpn/internal/po/order.go +++ b/plugins/alipay_cpn/internal/po/order.go @@ -1,7 +1,6 @@ package po import ( - "fmt" "gitea.cdlsxd.cn/sdk/plugin/proto" "plugins/alipay_cpn/internal/vo" ) @@ -38,10 +37,7 @@ func (o *OrderResp) GetMsg() string { if o.Response.Code.IsSuccess() { return o.Response.Msg } - return fmt.Sprintf( - "code:[%s],msg:[%s],subCode:[%s],subMsg[%s]", - o.Response.Code, o.Response.Msg, o.Response.SubCode, o.Response.SubMsg, - ) + return o.Response.SubMsg } func (o *OrderResp) GetOrderStatus() proto.Status { diff --git a/plugins/alipay_redpack/internal/alipay_redpack.go b/plugins/alipay_redpack/internal/alipay_redpack.go index dab2586..6a872d1 100644 --- a/plugins/alipay_redpack/internal/alipay_redpack.go +++ b/plugins/alipay_redpack/internal/alipay_redpack.go @@ -53,7 +53,7 @@ func (s *AlipayRedPackService) Order(ctx context.Context, request *proto.OrderRe var response *po.OrderResp sp = helper.ToChinese(sp) if err = json.Unmarshal([]byte(sp), &response); err != nil { - return nil, fmt.Errorf("请求异常,msg:" + err.Error()) + return nil, fmt.Errorf("请求解析异常,msg:" + err.Error()) } return orderResp(request, response), nil @@ -86,7 +86,7 @@ func (s *AlipayRedPackService) Query(ctx context.Context, request *proto.QueryRe var response po.QueryResp sp = helper.ToChinese(sp) if err = json.Unmarshal([]byte(sp), &response); err != nil { - return nil, fmt.Errorf("请求异常,msg:" + err.Error()) + return nil, fmt.Errorf("请求解析异常,msg:" + err.Error()) } return queryResp(request, response), nil diff --git a/plugins/wechat_cpn/internal/transform.go b/plugins/wechat_cpn/internal/transform.go index c4dace0..245b2f0 100644 --- a/plugins/wechat_cpn/internal/transform.go +++ b/plugins/wechat_cpn/internal/transform.go @@ -27,8 +27,7 @@ func orderReq(order *proto.OrderRequest_Order, product *proto.OrderRequest_Produ } var extra Extra if order.Extra != nil { - err := json.Unmarshal(order.Extra, &extra) - if err != nil { + if err := json.Unmarshal(order.Extra, &extra); err != nil { return cashcoupons.SendCouponRequest{}, fmt.Errorf("order拓展参数 json unmarshal error: %v", err) } } diff --git a/plugins/wechat_cpn/internal/wechat_cpn_test.go b/plugins/wechat_cpn/internal/wechat_cpn_test.go index 75626ae..07431f4 100644 --- a/plugins/wechat_cpn/internal/wechat_cpn_test.go +++ b/plugins/wechat_cpn/internal/wechat_cpn_test.go @@ -35,10 +35,10 @@ func TestOrder(t *testing.T) { Order: &proto.OrderRequest_Order{ OrderNo: "240403164049635931", Account: "oO3vO5AxRWgTjmMD38FTvnB5Rq6o", - Extra: []byte(`{"app_id":"13100720242","stock_creator_mchid":"1605446142"`), + Extra: []byte(`{"app_id":"13100720242","stock_creator_mchid":"1605446142"}`), }, Product: &proto.OrderRequest_Product{ - ProductNo: "3102024032977191", + ProductNo: "3102024032977191_11", Extra: []byte(`{}`), }, }