fix:修改

internal/controller/invoiceUpload.go

@@ -47,6 +47,9 @@ func InvoiceUpload(r *ghttp.Request) {
 		data["taxpayer_identnum"] = param.TaxpayerIdentnum
 		data["delivery_address"] = param.DeliveryAddress
 		data["phone"] = param.Phone
+		data["bank_name"] = param.BankName
+		data["bank_account"] = param.BankAccount
+		data["remark"] = param.Remark
 		data["operator"] = jyutil.GetUserMsgFromCtx(r.Context()).EntUserId
 		data["source"] = 3
 		data["invoice_status"] = 1

internal/controller/orderTransferAccounts.go

@@ -27,6 +27,5 @@ func TransferAccounts(r *ghttp.Request) {
 	if err != nil {
 		g.Log().Errorf(r.Context(), "订单上传协议异常 %v", err)
 	}
-	r.Header.Set("content-type", "text/plain")
 	r.Response.WriteJson(NewResult(rData, err))
 }

internal/logic/user/getService.go

@@ -71,7 +71,7 @@ WHERE b.phone = '%s' and a.name = '%s'`, param.Phone, param.EntName))
 		} else {
 			whereSql = fmt.Sprintf("dor.user_phone = '%s' and dor.buy_subject =2 and dor.company_name ='%s'  ", param.Phone, param.EntName)
 		}
-		if param.ServiceType != 1 && param.ServiceType != 4 {
+		if param.ServiceType == 3 {
 			whereSql += fmt.Sprintf(" and jod.service_starttime<'%s'  and jod.service_endtime > '%s' and jod.product_type = '%s' ", time.Now().Format("2006-01-02 15:04:05"), time.Now().Format("2006-01-02 15:04:05"), param.ProductType)
 		}
 		orderDetailType, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT DISTINCT(jod.product_type)  FROM jy_order_detail jod

internal/model/orderParams.go

@@ -266,10 +266,13 @@ type (
 		InvoiceVariety   string `json:"invoice_variety"`
 		InvoiceContent   string `json:"invoice_content"`
 		InvoiceType      string `json:"invoice_type"`
-		CompanyName      string `json:"company_name"`
-		TaxpayerIdentnum string `json:"taxpayer_identnum"`
+		CompanyName      string `json:"company_name,omitempty"`
+		TaxpayerIdentnum string `json:"taxpayer_identnum,omitempty"`
 		DeliveryAddress  string `json:"delivery_address,omitempty"`
 		Phone            string `json:"phone,omitempty"`
+		BankName         string `json:"bank_name,omitempty"`
+		BankAccount      string `json:"bank_account,omitempty"`
+		Remark           string `json:"remark,omitempty"`
 	}
 )