config/form.go

@@ -24,7 +24,6 @@ type Form struct {
 	Name    string        `json:"name"`              //表单名称
 	Key     string        `json:"key"`               //表单KEY
 	Value   interface{}   `json:"value"`             //表单值
-	Default interface{}   `json:"default"`           //默认值
 	Disable bool          `json:"disable,omitempty"` //是否禁用
 	Tips    string        `json:"tips"`              //表单提示
 	Option  []*FormOption `json:"option"`            //表单选项，radio和checkbox需要
@@ -51,8 +50,6 @@ func NewFroms(tplConfig, saveConfig string) ([]*Form, error) {
 	for _, form := range forms {
 		if _, ok := cfg[form.Key]; ok {
 			form.Value = cfg[form.Key]
-		} else {
-			form.Value = form.Default
 		}
 	}
 	return forms, err

unify/pay.go

@@ -4,10 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/url"
-
 	"git.u8t.cn/open/gosdk/util"
-	"git.u8t.cn/open/goutil"
+	"net/url"
 )
 
 var (
@@ -179,7 +177,7 @@ func (p *Pay) RefundOrder(req *RefundOrderReq) error {
 		errors.New("outTradeNo is nil")
 	}
 
-	reqUrl := fmt.Sprintf("%s/api/pay/order?outTradeNo=%s&reason=%s&refundFee=%d&refundTarget=%s", p.address, req.OutTradeNo, url.QueryEscape(req.Reason), req.RefundFee, req.RefundTarget)
+	reqUrl := fmt.Sprintf("%s/api/pay/order?outTradeNo=%s&reason=%s&refundFee=%d", p.address, req.OutTradeNo, url.QueryEscape(req.Reason), req.RefundFee)
 	result, err := util.HttpDelete(reqUrl, map[string]string{
 		"x-token": p.token,
 	})
@@ -221,27 +219,3 @@ func (p *Pay) RefundPartnerOrder(req *RefundOrderReq) error {
 
 	return nil
 }
-
-func (p *Pay) Transfer(req *TransferReq) error {
-	if err := req.Check(); err != nil {
-		return err
-	}
-
-	reqUrl := fmt.Sprintf("%s/api/pay/transfer?", p.address)
-	result, err := util.HttpPostJson(reqUrl, map[string]string{
-		"x-token": p.token,
-	}, []byte(goutil.EncodeJSON(req)))
-
-	if err != nil {
-		return err
-	}
-	var rsp CommonResponse
-	if err := json.Unmarshal([]byte(result), &rsp); err != nil {
-		return err
-	}
-	if rsp.Code != 0 {
-		return fmt.Errorf("%d:%s", rsp.Code, rsp.Message)
-	}
-
-	return nil
-}

unify/pay_type.go

@@ -1,7 +1,5 @@
 package unify
 
-import "errors"
-
 type OrderUser struct {
 	UserId      string `json:"userId"`
 	UserName    string `json:"userName"`
@@ -48,19 +46,9 @@ type CreatePartnerOrderReq struct {
 }
 
 type RefundOrderReq struct {
-	OutTradeNo   string `json:"outTradeNo"`
-	Reason       string `json:"reason,omitempty"`
-	RefundFee    int64  `json:"refundFee,omitempty"`
-	RefundTarget string `json:"refundTarget,omitempty"`
-}
-
-type TransferReq struct {
-	PayAmount  int64  `json:"payAmount"`
-	PayType    string `json:"payType"`
-	PayTitle   string `json:"payTitle"`
-	PayChannel string `json:"payChannel"`
-	UserId     string `json:"userId"`
 	OutTradeNo string `json:"outTradeNo"`
+	Reason     string `json:"reason,omitempty"`
+	RefundFee  int64  `json:"refundFee,omitempty"`
 }
 
 type CommonResponse struct {
@@ -68,19 +56,3 @@ type CommonResponse struct {
 	Message string                 `json:"message"`
 	Data    map[string]interface{} `json:"data"`
 }
-
-func (r *TransferReq) Check() error {
-	if r.PayTitle == "" {
-		return errors.New("PayTitle is nil")
-	}
-	if r.PayType == "" {
-		return errors.New("PayType is nil")
-	}
-	if r.UserId == "" {
-		return errors.New("UserId is nil")
-	}
-	if r.PayAmount < 0 {
-		return errors.New("PayAmount is nil")
-	}
-	return nil
-}