From 71412710d4f289e0390820da9bdb88f96407987a Mon Sep 17 00:00:00 2001
From: wangp <wangpei@gmail.com>
Date: Fri, 21 Jul 2023 13:53:07 +0800
Subject: [PATCH] lakala
---
controller/api/v1/pay/notice.go | 2 +-
controller/api/v1/pay/pay.go | 4 ++--
docs/docs.go | 8 ++++----
docs/swagger.json | 8 ++++----
docs/swagger.yaml | 8 ++++----
i18n/bp.toml | 31 -------------------------------
repository/pay/pay.go | 18 +++++++++---------
7 files changed, 24 insertions(+), 55 deletions(-)
delete mode 100755 i18n/bp.toml
diff --git a/controller/api/v1/pay/notice.go b/controller/api/v1/pay/notice.go
index d90d7fc..ed15b93 100755
--- a/controller/api/v1/pay/notice.go
+++ b/controller/api/v1/pay/notice.go
@@ -30,7 +30,7 @@ type NoticeController struct {
// @Accept application/json
// @Produce application/json
// @Param body body models.WxNoticeInput true "鍙傛暟"
-// @Param language header string ture "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃"
+// @Param language header string ture "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃"
// @Success 200
// @router /api/v1/pay/wx_notice [post]
func (l *PayController) WxNotice(c *gin.Context) {
diff --git a/controller/api/v1/pay/pay.go b/controller/api/v1/pay/pay.go
index 1214860..8b660d9 100755
--- a/controller/api/v1/pay/pay.go
+++ b/controller/api/v1/pay/pay.go
@@ -20,7 +20,7 @@ type PayController struct {
// @Accept application/json
// @Produce application/json
// @Param body body models.PlaceAnOrderParamInput true "鍙傛暟"
-// @Param language header string ture "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃"
+// @Param language header string ture "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃"
// @Success 200
// @router /api/v1/pay/unified_order [post]
func (l *PayController) UnifiedOrder(c *gin.Context) {
@@ -57,7 +57,7 @@ func (l *PayController) UnifiedOrder(c *gin.Context) {
// @Accept application/json
// @Produce application/json
// @Param body body models.RefundParamInput true "鍙傛暟"
-// @Param language header string ture "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃"
+// @Param language header string ture "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃"
// @Success 200
// @router /api/v1/pay/unified_refund [post]
func (l *PayController) UnifiedRefund(c *gin.Context) {
diff --git a/docs/docs.go b/docs/docs.go
index cdf4cfa..49bd7b6 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -48,7 +48,7 @@ var doc = `{
},
{
"type": "string",
- "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃",
+ "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃",
"name": "language",
"in": "header"
}
@@ -85,7 +85,7 @@ var doc = `{
},
{
"type": "string",
- "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃",
+ "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃",
"name": "language",
"in": "header"
}
@@ -122,7 +122,7 @@ var doc = `{
},
{
"type": "string",
- "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃",
+ "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃",
"name": "language",
"in": "header"
}
@@ -252,7 +252,7 @@ var doc = `{
"type": "string"
},
"total_amount": {
- "type": "number"
+ "type": "integer"
},
"trans_merchant_no": {
"type": "string"
diff --git a/docs/swagger.json b/docs/swagger.json
index bc74b3c..8a391ab 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -32,7 +32,7 @@
},
{
"type": "string",
- "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃",
+ "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃",
"name": "language",
"in": "header"
}
@@ -69,7 +69,7 @@
},
{
"type": "string",
- "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃",
+ "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃",
"name": "language",
"in": "header"
}
@@ -106,7 +106,7 @@
},
{
"type": "string",
- "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃",
+ "description": "璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃",
"name": "language",
"in": "header"
}
@@ -236,7 +236,7 @@
"type": "string"
},
"total_amount": {
- "type": "number"
+ "type": "integer"
},
"trans_merchant_no": {
"type": "string"
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 710938d..80a9bc7 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -76,7 +76,7 @@ definitions:
term_no:
type: string
total_amount:
- type: number
+ type: integer
trans_merchant_no:
type: string
trans_term_no:
@@ -100,7 +100,7 @@ paths:
required: true
schema:
$ref: '#/definitions/models.PlaceAnOrderParamInput'
- - description: 璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃
+ - description: 璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃
in: header
name: language
type: string
@@ -124,7 +124,7 @@ paths:
required: true
schema:
$ref: '#/definitions/models.RefundParamInput'
- - description: 璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃
+ - description: 璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃
in: header
name: language
type: string
@@ -148,7 +148,7 @@ paths:
required: true
schema:
$ref: '#/definitions/models.WxNoticeInput'
- - description: 璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja 鏃ユ枃 榛樿涓枃
+ - description: 璇█绫诲瀷 zh-CN绠€浣撲腑鏂� en-US鑻辨枃 ja-JP鏃ユ枃 榛樿涓枃
in: header
name: language
type: string
diff --git a/i18n/bp.toml b/i18n/bp.toml
deleted file mode 100755
index 1e6bd45..0000000
--- a/i18n/bp.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-# 鏁版嵁鍒嗘瀽
-# 9000 = ""
-# 9001 = "鏁版嵁姒傝"
-# 9002 = "椤惧鍒嗘瀽"
-# 9003 = "浼氬憳鍗″垎鏋�"
-# 9004 = "娆″崱鍒嗘瀽"
-# 9005 = "鐥呭巻閲忓垎鏋�"
-# 9006 = "鍖荤枟娑堣垂鍒嗘瀽"
-# 9007 = "鍟嗗搧鍒嗘瀽"
-# 9008 = "鍛樺伐鍒嗘瀽"
-#
-# 9100 = ""
-# 9101 = "鏂板鐢ㄦ埛"
-# 9102 = "鍒板簵娑堣垂"
-# 9103 = "鏂板娑堣垂"
-# 9104 = "鑰佸娑堣垂"
-# 9105 = "鏂板鍔炲崱鏁�"
-# 9106 = "浼氬憳鍗″厖鍊奸搴�"
-# 9107 = "璧犻鍏呭€奸搴�"
-# 9108 = "浼氬憳鍗℃秷璐规鏁�"
-# 9109 = "浼氬憳鍗℃秷璐归噾棰�"
-# 9110 = "灏辫瘖閲�"
-# 9111 = "鏂板鎴峰垵璇�"
-# 9112 = "鑰佸鎴峰垵璇�"
-# 9113 = "鏂板鎴峰璇�"
-# 9114 = "鑰佸鎴峰璇�"
-# 9115 = "閿€閲忎笅璺�"
-# 9116 = "婊為攢鍟嗗搧"
-
-
-
diff --git a/repository/pay/pay.go b/repository/pay/pay.go
index 89245c6..9a44837 100755
--- a/repository/pay/pay.go
+++ b/repository/pay/pay.go
@@ -134,11 +134,11 @@ func UnifiedOrder(input *models.PlaceAnOrderParamInput, ip string) (interface{},
}
data2["order_efficient_time"] = date_time2 //璁㈠崟鏈夋晥鏈� 鏍煎紡yyyyMMddHHmmss,鏈€澶ф敮鎸佷笅鍗曟椂闂�+2澶�
- data2["notify_url"] = input.NoticeURL //璁㈠崟鏀粯鎴愬姛鍚庡晢鎴锋帴鏀惰鍗曢€氱煡鐨勫湴鍧€ http://xxx.xxx.com
- data2["callback_url"] = input.ReturnURL //瀹㈡埛绔笅鍗曞畬鎴愭敮浠樺悗杩斿洖鐨勫晢鎴风綉椤佃烦杞湴鍧€
- data2["order_info"] = "蹇呭悍娴嬭瘯璁㈠崟鏍囬2" //璁㈠崟鏍囬锛屽湪浣跨敤鏀堕摱鍙版壂鐮佹敮浠樻椂蹇呰緭鍏ワ紝浜ゆ槗鏃堕€佸線璐︽埛绔�
- //data2["goods_mark"] = input.AttachInfo //鍟嗗搧淇℃伅鏍囪瘑 锛�1:鍚晢鍝佷俊鎭紝涓嶅～榛樿涓嶅惈鍟嗗搧淇℃伅锛�
- data2["support_refund"] = 1 //鏄惁鏀寔閫€娆� 榛樿0 涓嶆敮鎸�
+ data2["notify_url"] = input.NoticeURL //璁㈠崟鏀粯鎴愬姛鍚庡晢鎴锋帴鏀惰鍗曢€氱煡鐨勫湴鍧€ http://xxx.xxx.com
+ data2["callback_url"] = input.ReturnURL //瀹㈡埛绔笅鍗曞畬鎴愭敮浠樺悗杩斿洖鐨勫晢鎴风綉椤佃烦杞湴鍧€
+ data2["order_info"] = input.PlatformInfo //璁㈠崟鏍囬锛屽湪浣跨敤鏀堕摱鍙版壂鐮佹敮浠樻椂蹇呰緭鍏ワ紝浜ゆ槗鏃堕€佸線璐︽埛绔�
+ //data2["goods_mark"] = input.AttachInfo //鍟嗗搧淇℃伅鏍囪瘑 锛�1:鍚晢鍝佷俊鎭紝涓嶅～榛樿涓嶅惈鍟嗗搧淇℃伅锛�
+ data2["support_refund"] = 1 //鏄惁鏀寔閫€娆� 榛樿0 涓嶆敮鎸�
data["req_data"] = make(map[string]interface{})
data["req_data"] = data2
@@ -166,10 +166,10 @@ func UnifiedOrder(input *models.PlaceAnOrderParamInput, ip string) (interface{},
data2["out_trade_no"] = orderID //闅忔満鐢熸垚鐨勮鍗曞彿 //鍟嗘埛浜ゆ槗娴佹按鍙�
data2["order_efficient_time"] = date_time2 //璁㈠崟鏈夋晥鏈� 鏍煎紡yyyyMMddHHmmss,鏈€澶ф敮鎸佷笅鍗曟椂闂�+2澶�
- data2["notify_url"] = input.NoticeURL //璁㈠崟鏀粯鎴愬姛鍚庡晢鎴锋帴鏀惰鍗曢€氱煡鐨勫湴鍧€ http://xxx.xxx.com
- data2["callback_url"] = input.ReturnURL //瀹㈡埛绔笅鍗曞畬鎴愭敮浠樺悗杩斿洖鐨勫晢鎴风綉椤佃烦杞湴鍧€
- data2["order_info"] = "蹇呭悍娴嬭瘯璁㈠崟鏍囬2" //璁㈠崟鏍囬锛屽湪浣跨敤鏀堕摱鍙版壂鐮佹敮浠樻椂蹇呰緭鍏ワ紝浜ゆ槗鏃堕€佸線璐︽埛绔�
- //data2["goods_mark"] = input.AttachInfo //鍟嗗搧淇℃伅鏍囪瘑 锛�1:鍚晢鍝佷俊鎭紝涓嶅～榛樿涓嶅惈鍟嗗搧淇℃伅锛�
+ data2["notify_url"] = input.NoticeURL //璁㈠崟鏀粯鎴愬姛鍚庡晢鎴锋帴鏀惰鍗曢€氱煡鐨勫湴鍧€ http://xxx.xxx.com
+ data2["callback_url"] = input.ReturnURL //瀹㈡埛绔笅鍗曞畬鎴愭敮浠樺悗杩斿洖鐨勫晢鎴风綉椤佃烦杞湴鍧€
+ data2["order_info"] = input.PlatformInfo //璁㈠崟鏍囬锛屽湪浣跨敤鏀堕摱鍙版壂鐮佹敮浠樻椂蹇呰緭鍏ワ紝浜ゆ槗鏃堕€佸線璐︽埛绔�
+ //data2["goods_mark"] = input.AttachInfo //鍟嗗搧淇℃伅鏍囪瘑 锛�1:鍚晢鍝佷俊鎭紝涓嶅～榛樿涓嶅惈鍟嗗搧淇℃伅锛�
//寰俊JSAPI銆佸井淇″皬绋嬪簭
//data2["counter_param"] = "{\"pay_mode\":\"WECHAT\"}"
--
2.18.1