Merge branch 'featrue/hcgyl'

upstream/hcw/hcw.go

@@ -211,35 +211,3 @@ func (s *HcwClient) get(ctx context.Context, method string, req interface{}) (re
 	res = resp.ReadAllString()
 	return
 }
-
-func (s *HcwClient) patch(ctx context.Context, method string, req interface{}) (res string, err error) {
-	Start := gtime.TimestampMilli()
-
-	reqMap := gconv.Map(req)
-	param := gjson.New(reqMap)
-
-	signature, err := s.EncryptWithSignature(reqMap)
-	if nil != err {
-		return
-	}
-
-	Url := s.Config.ApiUrl + method
-	Request := g.Client()
-	Request.SetHeader("Content-Type", "application/json;charset=UTF-8")
-	Request.SetHeader("signature", signature)
-	Request.SetHeader("appid", s.Config.AppId)
-
-	resp, err := Request.Timeout(time.Second*10).Patch(Url, param.MustToJsonString())
-	defer func() {
-		_ = resp.Close()
-		ctx = context.WithValue(ctx, "Method", "Patch")
-		ctx = context.WithValue(ctx, "URI", Url)
-		if err != nil {
-			g.Log().Ctx(ctx).Cat(pkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v ms】", param.MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start)
-		} else {
-			g.Log().Ctx(ctx).Cat(pkgName).Infof("参数【%v】响应【%v】响应时间【%v ms】", param.MustToJsonString(), res, gtime.TimestampMilli()-Start)
-		}
-	}()
-	res = resp.ReadAllString()
-	return
-}

upstream/hcw/hcw_refund.go

@@ -97,13 +97,19 @@ func (s *HcwClient) OrderRefundDetail(ctx context.Context, req *OrderRefundDetai
 	return
 }
 
+type OrderRefundDeliveryNoticeRes struct {
+	Code    int         `json:"code"`
+	Message string      `json:"message"`
+	Data    interface{} `json:"data"`
+}
+
 /*
 *物流回传
  */
-func (s *HcwClient) OrderRefundDeliveryNotice(ctx context.Context, req *OrderRefundDetailReq) (res *OrderRefundDetailRes, err error) {
+func (s *HcwClient) OrderRefundDeliveryNotice(ctx context.Context, req *OrderRefundDetailReq) (res *OrderRefundDeliveryNoticeRes, err error) {
 
 	var method = "/api/v1/orderRefund/delivery/" + req.RefundNo + "/" + req.Source
-	result, err := s.get(ctx, method, req)
+	result, err := s.post(ctx, method, req)
 	if nil != err {
 		return
 	}