fix:修改

config.yaml

@@ -87,13 +87,13 @@ autoReturnTaskTime: "0 */3 * * * ?"
 
 examine:
   - name: 部门经理
-    userid: [30190,37,170,30183,55]
+    userid: [30190,37,170,30183,55,96334]
     equity: 1
   - name: 销管
-    userid: [152,39,30199]
+    userid: [152,39,30199,96334]
     equity: 2
   - name: 管理层
-    userid: [56]
+    userid: [56,96334]
     equity: 5
 
 specialService: ["市场分析定制报告下载包","企业中标分析报告下载包","业主采购分析报告下载包"]
@@ -118,3 +118,5 @@ copyHref:
   VIP订阅: "https://jybx2-webtest.jydev.jianyu360.com/weixin/frontPage/vipIntro/free/order_detail"
 
 request_auth: [1,2]
+
+paymentAddress: "172.31.31.205:8170"

internal/jyutil/equityOpen.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"net/rpc"
+	"strings"
 	"time"
 )
 
@@ -81,7 +82,7 @@ func EntLicense(ctx context.Context, entId, empowerCount, provinceCount, orderId
 		user, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT * FROM entniche_order WHERE phone = '%s' and ent_id = '%d'`, phone, entId))
 		data, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT id,empower_count FROM entniche_wait_empower WHERE product_type = '%s' and ent_id = '%d' and province_count =%d`, productType, entId, provinceCount))
 		t := date.NowFormat(date.Date_Full_Layout)
-		if !data.IsEmpty() {
+		if !data.IsEmpty() && !strings.Contains(productType, "自定义") {
 			empower_count := gconv.Int(data.Map()["empower_count"])
 			count := empower_count + empowerCount
 			id := common.IntAll(data.Map()["id"])

internal/logic/order/detail.go

@@ -100,7 +100,7 @@ INNER JOIN jy_product_class jpc on jpi.product_class_id = jpc.id WHERE jpi.code
 					}
 				}
 				if len(supBigServiceNames) > 0 {
-					m["bigServiceNames"] = fmt.Sprintf("[补充服务]: %s ;[原已购服务]:%s", strings.Join(supBigServiceNames, "、"), strings.Join(bigServiceNames, "、"))
+					m["bigServiceNames"] = fmt.Sprintf("[补充权益]: %s ;[原已购权益]:%s", strings.Join(supBigServiceNames, "、"), strings.Join(bigServiceNames, "、"))
 				} else {
 					m["bigServiceNames"] = strings.Join(bigServiceNames, "、")
 				}

internal/model/commonFilter.go

@@ -13,17 +13,20 @@ type (
 		FinalAccountCount int `json:"finalAccountCount"` //当前套餐最终
 		FinalAreaCount    int `json:"finalAreaCount"`
 
-		Supplement string `json:"supplement" doc:"补充服务"`
+		Supplement     string `json:"supplement" doc:"补充服务"`
+		SupExplanation string `json:"supExplanation,omitempty"` //补充服务说明
 	}
 	DataPackFilter struct {
-		PackType  int   `json:"pType"`                //数据包类型 1标准，2高级，3自定义包
-		PackNum   int64 `json:"pNum"`                 //数据包数量
-		GiveCycle int64 `json:"give_cycle,omitempty"` //赠送条数
-		ValidYear int   `json:"validYear,omitempty"`  //有效年份 「账户合并过来的资源为-1」
+		PackType       int    `json:"pType"`                    //数据包类型 1标准，2高级，3自定义包
+		PackNum        int64  `json:"pNum"`                     //数据包数量
+		GiveCycle      int64  `json:"give_cycle,omitempty"`     //赠送条数
+		ValidYear      int    `json:"validYear,omitempty"`      //有效年份 「账户合并过来的资源为-1」
+		SupExplanation string `json:"supExplanation,omitempty"` //补充服务说明
 	}
 
 	Simple struct {
-		Source string `json:"source"`
-		Num    int64  `json:"num"`
+		Source         string `json:"source"`
+		Num            int64  `json:"num"`
+		SupExplanation string `json:"supExplanation,omitempty"` //补充服务说明
 	}
 )