fix:发票修改

config.yaml

@@ -153,10 +153,15 @@ stampedInterest: ["刘亚丽"]
 saleChangeReason: ["客户退款","销售撞单"]
 
 userRightsGroup:
-  pinTube: []
-  supAdmin: []
-  cSId: []
+  pinTube: [94316]
+  supAdmin: [29240]
+  cSId: [92299]
   administration: []
-  finance: []
+  finance: [100094]
 
-entPrice: 2000
+entPrice: 2000
+
+esAddress: "http://172.20.45.129:9206,http://172.20.45.130:9306"
+esSize: 30
+esUserName: ""
+esPassword: ""

internal/cmd/cmd.go

@@ -38,6 +38,7 @@ var (
 					group.POST("/userService", controller.GetUserService)                     //获取账户大会员服务
 					group.POST("/userChangePhone", controller.UserChangePhone)                //用户编辑手机号个人权益
 					group.GET("/getSalesChannelItem", controller.GetSalesChannelItem)         //销售区点&0原订单类型
+					group.GET("/search/ent/association", controller.GetSalesChannelItem)      //中标企业名称联想
 				})
 
 				//产品相关

internal/controller/association.go

@@ -0,0 +1,54 @@
+package controller
+
+import (
+	. "app.yhyue.com/moapp/jybase/api"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/pkg/errors"
+	"jyOrderManager/internal/model"
+	"time"
+)
+
+const queryFullEntName = `{"query":{"function_score":{"query":{"bool":{"must":[{"range":{"company_type_int":{"to":"22"}}},{"multi_match":{"query":"%s","type":"phrase","fields":["name","history_name"]}}]}},"field_value_factor":{"field":"company_type_int","modifier":"reciprocal","factor":2}}},"_source":["name","history_name","company_type_int","_id","company_area","company_city","establish_date","capital","company_phone","legal_person","tax_code","credit_no","nseo_id"],"size":%d}`
+
+// EntAssociation 销售区点&0原订单类型
+func EntAssociation(r *ghttp.Request) {
+	rData, err := func() (interface{}, error) {
+		var param model.EntAssociationParams
+		err := gconv.Struct(r.GetBody(), &param)
+		if err != nil {
+			return nil, errors.Wrap(err, "数据校验异常")
+		}
+		r := elastic.Get("qyxy", "qyxy", fmt.Sprintf(queryFullEntName, param.Name, param.Num))
+		var list []map[string]interface{}
+		if r != nil {
+			for _, v := range *r {
+				tmp := map[string]interface{}{
+					"name":           v["name"],
+					"entId":          encrypt.EncodeArticleId2ByCheck(gconv.String(v["_id"])),
+					"company_area":   gconv.String(v["company_area"]),  //地区
+					"company_city":   gconv.String(v["company_city"]),  //城市
+					"establish_date": gconv.Int64(v["establish_date"]), //注册日期
+					"capital":        gconv.Float64(v["capital"]),      //注册资本
+					"company_phone":  gconv.String(v["company_phone"]), //企业联系方式
+					"legal_person":   gconv.String(v["legal_person"]),  //企业法人
+					"taxCode":        gconv.String(v["credit_no"]),
+					"nseo_id":        gconv.String(v["nseo_id"]),
+				}
+				if timestamp := gconv.Int64(v["establish_date"]); timestamp > 0 {
+					tmp["establish_date"] = time.Unix(timestamp, 0).Format("2006-01-02")
+				}
+				list = append(list, tmp)
+			}
+		}
+		return list, nil
+	}()
+	if err != nil {
+		g.Log().Errorf(r.Context(), "销售区点&0原订单类型异常 %v", err)
+	}
+	r.Response.WriteJson(NewResult(rData, err))
+}

internal/controller/invoiceUpload.go

@@ -52,7 +52,9 @@ func InvoiceUpload(r *ghttp.Request) {
 		data["bank_name"] = param.BankName
 		data["bank_account"] = param.BankAccount
 		data["remark"] = param.Remark
-		data["operator"] = jyutil.GetUserMsgFromCtx(r.Context()).EntUserId
+		data["mail"] = param.Email
+		data["company_phone"] = param.CompanyPhone
+		data["operator"] = jyutil.GetUserMsgFromCtx(r.Context()).EntUserName
 		data["source"] = 3
 		data["invoice_status"] = 1
 		log.Println("发票上传参数", data, param.Id)

internal/logic/middleware/middleware.go

@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	elastic "app.yhyue.com/moapp/jybase/es"
 	//. "app.yhyue.com/moapp/jybase/api"
 	"context"
 	"fmt"
@@ -30,6 +31,7 @@ var (
 
 func init() {
 	logSaveCount = g.Cfg().MustGet(context.Background(), "logger.logSaveCount", 500).Int()
+	elastic.NewEs("v7", g.Cfg().MustGet(context.Background(), "esAddress").String(), g.Cfg().MustGet(context.Background(), "esSize").Int(), g.Cfg().MustGet(context.Background(), "esUserName").String(), g.Cfg().MustGet(context.Background(), "esPassword").String())
 	service.RegisterMiddleware(&sMiddleware{})
 }
 

internal/logic/product/bigmember/BigMemberRenew.go

@@ -18,7 +18,7 @@ import (
 )
 
 // BigMemberExtend 大会员延长服务
-func (p jyBigProduct) BigMemberExtend(ctx context.Context, startTime, endTime time.Time, bigMemberStatus int, effectState bool) error {
+func (p jyBigProduct) BigMemberExtend(ctx context.Context, startTime, endTime time.Time, userData map[string]interface{}, effectState bool) error {
 	effectiveDate, _ := time.ParseInLocation("2006-01-02 15:04:05", strings.Split(endTime.Format(date.Date_Full_Layout), " ")[0]+" 23:59:59", time.Local)
 	setMap := map[string]interface{}{}
 	if effectState {
@@ -27,9 +27,9 @@ func (p jyBigProduct) BigMemberExtend(ctx context.Context, startTime, endTime ti
 		setMap = map[string]interface{}{
 			"i_member_endtime":   effectiveDate.Unix(),
 			"i_member_starttime": startTime.Unix(),
-			"i_member_status":    -bigMemberStatus,
+			"i_member_status":    -gconv.Int(userData["i_member_status"]),
 		}
-		if p.param.Filter.FinalAccountCount > 1 {
+		if p.param.Filter.FinalAccountCount > 1 && gconv.Int(userData["i_pay_sub_num"]) == 0 {
 			setMap["i_pay_sub_num"] = p.param.Filter.FinalAccountCount - 1
 		}
 	}
@@ -137,7 +137,7 @@ func (p jyBigProduct) BigMemberRenew(ctx context.Context, orderData, userData ma
 		//newEndTime = jyutil.GetDATE(p.param.Filter.BuyCycle, p.param.Filter.BuyType, newStartTime.Unix())
 		updateOrder["service_starttime"] = newStartTime.Format(date.Date_Full_Layout)
 		updateOrder["service_endtime"] = newEndTime.Format(date.Date_Full_Layout)
-		return p.BigMemberExtend(ctx, newStartTime, newEndTime, common.IntAll(userData["i_member_status"]), effectState)
+		return p.BigMemberExtend(ctx, newStartTime, newEndTime, userData, effectState)
 	case "2":
 		var (
 			newStartTime, newEndTime time.Time

internal/model/orderParams.go

@@ -273,6 +273,12 @@ type (
 		BankName         string `json:"bank_name,omitempty"`
 		BankAccount      string `json:"bank_account,omitempty"`
 		Remark           string `json:"remark,omitempty"`
+		CompanyPhone     string `json:"company_phone,omitempty"`
+		Email            string `json:"email,omitempty"`
+	}
+	EntAssociationParams struct {
+		Name string `json:"name"`
+		Num  int64  `json:"num"`
 	}
 )