Compare commits
6 Commits
b5e41d6fef
...
af3a8435b9
| Author | SHA1 | Date |
|---|---|---|
|
|
af3a8435b9 | |
|
|
79dd16de58 | |
|
|
587e29ccd9 | |
|
|
7ca2710e16 | |
|
|
4642e7e686 | |
|
|
00f3429c84 |
|
|
@ -24,6 +24,7 @@ type Form struct {
|
||||||
Name string `json:"name"` //表单名称
|
Name string `json:"name"` //表单名称
|
||||||
Key string `json:"key"` //表单KEY
|
Key string `json:"key"` //表单KEY
|
||||||
Value interface{} `json:"value"` //表单值
|
Value interface{} `json:"value"` //表单值
|
||||||
|
Default interface{} `json:"default"` //默认值
|
||||||
Disable bool `json:"disable,omitempty"` //是否禁用
|
Disable bool `json:"disable,omitempty"` //是否禁用
|
||||||
Tips string `json:"tips"` //表单提示
|
Tips string `json:"tips"` //表单提示
|
||||||
Option []*FormOption `json:"option"` //表单选项,radio和checkbox需要
|
Option []*FormOption `json:"option"` //表单选项,radio和checkbox需要
|
||||||
|
|
@ -50,6 +51,8 @@ func NewFroms(tplConfig, saveConfig string) ([]*Form, error) {
|
||||||
for _, form := range forms {
|
for _, form := range forms {
|
||||||
if _, ok := cfg[form.Key]; ok {
|
if _, ok := cfg[form.Key]; ok {
|
||||||
form.Value = cfg[form.Key]
|
form.Value = cfg[form.Key]
|
||||||
|
} else {
|
||||||
|
form.Value = form.Default
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return forms, err
|
return forms, err
|
||||||
|
|
|
||||||
30
unify/pay.go
30
unify/pay.go
|
|
@ -4,8 +4,10 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"git.u8t.cn/open/gosdk/util"
|
|
||||||
"net/url"
|
"net/url"
|
||||||
|
|
||||||
|
"git.u8t.cn/open/gosdk/util"
|
||||||
|
"git.u8t.cn/open/goutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
@ -177,7 +179,7 @@ func (p *Pay) RefundOrder(req *RefundOrderReq) error {
|
||||||
errors.New("outTradeNo is nil")
|
errors.New("outTradeNo is nil")
|
||||||
}
|
}
|
||||||
|
|
||||||
reqUrl := fmt.Sprintf("%s/api/pay/order?outTradeNo=%s&reason=%s&refundFee=%d", p.address, req.OutTradeNo, url.QueryEscape(req.Reason), req.RefundFee)
|
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)
|
||||||
result, err := util.HttpDelete(reqUrl, map[string]string{
|
result, err := util.HttpDelete(reqUrl, map[string]string{
|
||||||
"x-token": p.token,
|
"x-token": p.token,
|
||||||
})
|
})
|
||||||
|
|
@ -219,3 +221,27 @@ func (p *Pay) RefundPartnerOrder(req *RefundOrderReq) error {
|
||||||
|
|
||||||
return nil
|
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
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
package unify
|
package unify
|
||||||
|
|
||||||
|
import "errors"
|
||||||
|
|
||||||
type OrderUser struct {
|
type OrderUser struct {
|
||||||
UserId string `json:"userId"`
|
UserId string `json:"userId"`
|
||||||
UserName string `json:"userName"`
|
UserName string `json:"userName"`
|
||||||
|
|
@ -46,9 +48,19 @@ type CreatePartnerOrderReq struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type RefundOrderReq 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"`
|
OutTradeNo string `json:"outTradeNo"`
|
||||||
Reason string `json:"reason,omitempty"`
|
|
||||||
RefundFee int64 `json:"refundFee,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type CommonResponse struct {
|
type CommonResponse struct {
|
||||||
|
|
@ -56,3 +68,19 @@ type CommonResponse struct {
|
||||||
Message string `json:"message"`
|
Message string `json:"message"`
|
||||||
Data map[string]interface{} `json:"data"`
|
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
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue