From c0156ed2bcaa84a4af407682aa28627b45eb1503 Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 22 Dec 2023 17:26:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=AD=98=E8=AF=A6=E6=83=85=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0"=E4=BC=9A=E5=91=98=E4=BC=98=E6=83=A0"?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=202.=E9=9B=B6=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=95=86=E5=93=81=E8=A1=A8=E5=A2=9E=E5=8A=A0"?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=9E=E6=94=B6=E9=87=91=E9=A2=9D"?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=203.=E6=B2=B3=E9=A9=AC=E4=BB=98?= =?UTF-8?q?=E8=AF=B7=E6=B1=82ip=E6=94=B9=E5=8A=A8=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E4=BA=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9A=84ip=EF=BC=9B=204.?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=94=B9=E6=88=90=E7=A7=BB=E5=8A=A8=E4=BA=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=9C=B0=E5=9D=80=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/pay/wx_pay.go | 2 +- app/admin/apis/pay/wx_pay_test.go | 6 +++--- app/admin/models/commodity.go | 2 ++ app/admin/models/erp_order.go | 1 + config/settings.yml | 2 +- docs/docs.go | 8 ++++++++ docs/swagger.json | 8 ++++++++ docs/swagger.yaml | 6 ++++++ 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/admin/apis/pay/wx_pay.go b/app/admin/apis/pay/wx_pay.go index 6b17405..56e5ab1 100644 --- a/app/admin/apis/pay/wx_pay.go +++ b/app/admin/apis/pay/wx_pay.go @@ -84,7 +84,7 @@ const ( HmPubKey = `MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDzGVH0Fxpb2M48U1BWr6lpNs2W3VHqtjO8X5RqWjtTwpQVKo8dqaiAGxVbsdnefPpsbI5l9rKquRAOJhWFU07hxSUgXZOk55QQmll03MBgRDXLgxyKfycLLQwhsCJAzDIWC7IWgok/RHV9m9AV2GbQxWBl+7iDE4prcbpgG8Z0HwIDAQAB` HmPayMerchantId = "664403000030115" TimeFormat = "2006-01-02 15:04:05" - clientIp = "39.108.188.218" + clientIp = "112.33.14.191" ) const ( diff --git a/app/admin/apis/pay/wx_pay_test.go b/app/admin/apis/pay/wx_pay_test.go index e6c448f..9b09149 100644 --- a/app/admin/apis/pay/wx_pay_test.go +++ b/app/admin/apis/pay/wx_pay_test.go @@ -28,7 +28,7 @@ func TestHmJsPayBToCOrder(t *testing.T) { fmt.Println("orderId:", orderId) totalFee := 0.01 - authCode := "281830160266615739" + authCode := "6264900646139788518" notifyUrl := "https://dev.switch.deovo.com:8004/api/v1/wxpay/notice" order, err := HmJsPayBToCOrder(orderId, totalFee, authCode, notifyUrl) @@ -41,7 +41,7 @@ func TestHmJsPayBToCOrder(t *testing.T) { // 查询 func TestHmQueryOrder(t *testing.T) { - orderId := "sale2023122119561908" + orderId := "sale2023122225067733" order, err := HmQueryOrder(orderId) if err != nil { @@ -53,7 +53,7 @@ func TestHmQueryOrder(t *testing.T) { // 撤销 func TestHmCancelOrder(t *testing.T) { - orderId := "test20231220439" + orderId := "sale2023122225067733" order, err := HmCancelOrder(orderId) if err != nil { diff --git a/app/admin/models/commodity.go b/app/admin/models/commodity.go index 9fcf92b..6e5dafe 100644 --- a/app/admin/models/commodity.go +++ b/app/admin/models/commodity.go @@ -56,6 +56,7 @@ type ErpStockCommodity struct { MinRetailPrice uint32 `json:"min_retail_price"` // 最低零售价 StaffCostPrice uint32 `json:"staff_cost_price"` // 员工成本价加价 WholesalePrice uint32 `json:"wholesale_price"` // 指导采购价 + MemberDiscount float64 `json:"member_discount"` // 会员优惠 State uint32 `json:"state"` // 状态:1-在库 2-已售 3-采购退货 4-调拨中 Count uint32 `json:"count"` // 数量 StorageType uint32 `json:"storage_type"` // 入库方式：1-系统入库 2-采购入库 @@ -658,6 +659,7 @@ func (m *StockImporter) ImportStockData(colsMap []map[string]interface{}) error IMEIType: v2.IMEIType, IMEI: "", Remark: "", + MemberDiscount: v2.MemberDiscount, } if list[i].StockTime != "" { //导入时间不为空 diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index fb1124d..4ea7538 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -95,6 +95,7 @@ type ErpOrderCommodity struct { MemberDiscount float64 `json:"member_discount"` // 会员优惠 VmDiscount float64 `json:"vm_discount"` // 会员积分抵扣 Amount float64 `json:"amount"` // 实际零售价 + TotalAmount float64 `json:"total_amount"` // 商品实收金额 Remark string `json:"remark"` // 备注 Tel string `json:"tel" gorm:"index"` // 手机号 RejectedPrice float64 `json:"rejected_price"` // 退货单价 diff --git a/config/settings.yml b/config/settings.yml index f6ae407..dc732ad 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -40,7 +40,7 @@ settings: # 数据库类型 mysql，sqlite3， postgres driver: mysql # 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms - source: mh_dev:d9qy46ONI0ZTF9eH@tcp(39.108.188.218:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms + source: mh_dev:d9qy46ONI0ZTF9eH@tcp(112.33.14.191:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms # source: mh_pro:c5JBW3X6EEVQluYM@tcp(39.108.188.218:3306)/mh_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms gen: diff --git a/docs/docs.go b/docs/docs.go index 3fafd82..8c007e3 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -5311,6 +5311,10 @@ const docTemplate = `{ "description": "手机号", "type": "string" }, + "total_amount": { + "description": "商品实收金额", + "type": "number" + }, "vm_discount": { "description": "会员积分抵扣", "type": "number" @@ -5655,6 +5659,10 @@ const docTemplate = `{ "description": "是否串码：1-无串码 2-串码（系统生成） 3-串码（手动添加）", "type": "integer" }, + "member_discount": { + "description": "会员优惠", + "type": "number" + }, "min_retail_price": { "description": "最低零售价", "type": "integer" diff --git a/docs/swagger.json b/docs/swagger.json index f3f961a..bf9aca8 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -5300,6 +5300,10 @@ "description": "手机号", "type": "string" }, + "total_amount": { + "description": "商品实收金额", + "type": "number" + }, "vm_discount": { "description": "会员积分抵扣", "type": "number" @@ -5644,6 +5648,10 @@ "description": "是否串码：1-无串码 2-串码（系统生成） 3-串码（手动添加）", "type": "integer" }, + "member_discount": { + "description": "会员优惠", + "type": "number" + }, "min_retail_price": { "description": "最低零售价", "type": "integer" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index b049220..8a25603 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1078,6 +1078,9 @@ definitions: tel: description: 手机号 type: string + total_amount: + description: 商品实收金额 + type: number vm_discount: description: 会员积分抵扣 type: number @@ -1329,6 +1332,9 @@ definitions: imei_type: description: 是否串码：1-无串码 2-串码（系统生成） 3-串码（手动添加） type: integer + member_discount: + description: 会员优惠 + type: number min_retail_price: description: 最低零售价 type: integer