fix: cancel merchant transfer request body

go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/take_cash_controller.go

@@ -118,7 +118,7 @@ func railsadminCancelTakeCashMerchantTransfer(order *balance_model.TakeCashOrder
 	switch ret.State {
 	case wx_mp.MerchantTransferSuccess:
 		return ret, fmt.Errorf("商家转账已成功，不能撤销")
-	case wx_mp.MerchantTransferFail, wx_mp.MerchantTransferCancelled:
+	case wx_mp.MerchantTransferFail, wx_mp.MerchantTransferCancelled, wx_mp.MerchantTransferCanceling:
 		return ret, nil
 	}
 

go/gopath/src/fohow.com/libs/wx_mp/mch_transfer.go

@@ -95,11 +95,7 @@ func QueryMerchantTransferByOutBillNo(outBillNo, payCode string) (*MerchantTrans
 func CancelMerchantTransferByOutBillNo(outBillNo, payCode string) (*MerchantTransferResponse, error) {
 	mechantInfo := GetMechantInfo(payCode)
 	path := "/v3/fund-app/mch-transfer/transfer-bills/out-bill-no/" + url.PathEscape(outBillNo) + "/cancel"
-	body, err := json.Marshal(map[string]string{"out_bill_no": outBillNo})
-	if err != nil {
-		return nil, err
-	}
-	return doMerchantTransferRequest("POST", path, body, mechantInfo)
+	return doMerchantTransferRequest("POST", path, nil, mechantInfo)
 }
 
 func MerchantTransferStatePending(state string) bool {