From 4ae75be0d6699339ce31311739beaa09ae07be6c Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 9 Sep 2021 17:49:45 +0800
Subject: [PATCH] a

---
 business/jxstore/secretNumber/secretNum.go | 40 ++++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/secretNumber/secretNum.go b/business/jxstore/secretNumber/secretNum.go
index 963b4fba7..781eedd3c 100644
--- a/business/jxstore/secretNumber/secretNum.go
+++ b/business/jxstore/secretNumber/secretNum.go
@@ -153,6 +153,33 @@ func QuerySubscriptionDetail(poolKey, phoneNoX string) (querySubscriptionDetailR
 	return querySubscriptionDetailResult, err
 }
 
+//查询号码的绑定关系2
+func QuerySubscriptionDetail2(poolKey, subsId, phoneNoX string) (querySubscriptionDetailResult *QuerySubscriptionDetailResult, err error) {
+	result, err2 := api.SecretNumClient.QuerySubscriptionDetail(&client.QuerySubscriptionDetailRequest{
+		PoolKey:  tea.String(poolKey),
+		SubsId:   tea.String(subsId),
+		PhoneNoX: tea.String(phoneNoX),
+	})
+	if err2 != nil {
+		return nil, err2
+	}
+	if tea.StringValue(result.Body.Code) != "OK" {
+		err = fmt.Errorf(tea.StringValue(result.Body.Message))
+	}
+	dto := result.Body.SecretBindDetailDTO
+	r := &QuerySubscriptionDetailResult{
+		Status:     int(tea.Int64Value(dto.Status)),
+		NumberA:    tea.StringValue(dto.PhoneNoA),
+		NumberB:    tea.StringValue(dto.PhoneNoB),
+		NumberX:    tea.StringValue(dto.PhoneNoX),
+		GmtCreate:  tea.StringValue(dto.GmtCreate),
+		ExpireDate: tea.StringValue(dto.ExpireDate),
+		SubsID:     subsId,
+		PoolKey:    poolKey,
+	}
+	return r, err
+}
+
 //修改绑定关系
 //修改哪个字段就传哪个字段
 //updateNoA：修改A号码。
@@ -164,18 +191,19 @@ func UpdateSubscription(poolKey, subsId, phoneNoX, phoneNoA, phoneNoB, expiratio
 		SubsId:   tea.String(subsId),
 		PhoneNoX: tea.String(phoneNoX),
 	}
-	if phoneNoA != "" {
+	bindResult, _ := QuerySubscriptionDetail2(poolKey, subsId, phoneNoX)
+	if bindResult.NumberA != phoneNoA {
 		params.OperateType = tea.String("updateNoA")
 		params.PhoneNoA = tea.String(phoneNoA)
 	}
-	if phoneNoB != "" {
-		params.OperateType = tea.String("updateNoB")
-		params.PhoneNoB = tea.String(phoneNoB)
-	}
-	if expiration != "" {
+	if bindResult.ExpireDate != expiration {
 		params.OperateType = tea.String("updateExpire")
 		params.Expiration = tea.String(expiration)
 	}
+	if bindResult.NumberB != phoneNoB {
+		params.OperateType = tea.String("updateNoB")
+		params.PhoneNoB = tea.String(phoneNoB)
+	}
 	result, err := api.SecretNumClient.UpdateSubscription(params)
 	if err != nil {
 		return err