Merge branch 'fix/release' into dev

# Conflicts:
#	cmd/build.sh
dev
mofangmin 1 year ago
commit de53be8019
  1. 3
      cmd/build.sh
  2. 8
      modules/pay/eanipay/base.go

@ -8,5 +8,4 @@ cd pb/proto
# go generate
cd ../..
#go build main.go
#CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o gameserver main.go
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o indiaprovider main.go
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o gameserver main.go

@ -98,6 +98,10 @@ func (s *Sub) GetResp() (proto.Message, error) {
func (s *Sub) PackPayReq() interface{} {
r := s.Base.PayReq
r.Amount /= 100
if len(r.Phone) == 12 {
r.Phone = r.Phone[2:]
}
send := &PayReq{
MerchantTradeNo: r.OrderID,
Amount: fmt.Sprintf("%d", r.Amount),
@ -119,6 +123,10 @@ func (s *Sub) PackPayReq() interface{} {
func (s *Sub) PackWithdrawReq() interface{} {
r := s.Base.WithdrawReq
r.Amount /= 100
if len(r.Phone) == 12 {
r.Phone = r.Phone[2:]
}
send := &WithdrawReq{
MerchantTradeNo: r.OrderID,
Amount: fmt.Sprintf("%d", r.Amount),

Loading…
Cancel
Save