Merge branch 'dev4.6.2.17' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.17

src/jfw/modules/subscribepay/src/baseApi.json

@@ -6,6 +6,7 @@
     "findPreview": "http://127.0.0.1:8124/resources/findPreview",
     "findBalance": "http://127.0.0.1:8124/resources/findBalance",
     "findRecord": "http://127.0.0.1:8124/resources/findRecord",
-    "entdedupUrl": "http://127.0.0.1:8888/data/deduplication"
+    "entdedupUrl": "http://127.0.0.1:8888/data/deduplication",
+    "updateVipTime":"http://127.0.0.1:8124/resources/updateVipTime"
   }
 }

src/jfw/modules/subscribepay/src/config/config.go

@@ -253,12 +253,13 @@ var JyApiConfig *ApiConfig
 type ApiConfig struct {
 	AppId   string `json:"appId"`
 	ApiList struct {
-		BuyBalance  string `json:"buyBalance"`  //购买资源
-		UseBalance  string `json:"useBalance"`  //使用资源
-		FindBalance string `json:"findBalance"` //查询账户余额接口
-		FindRecord  string `json:"findRecord"`  //查询流水账接口
-		FindPreview string `json:"findPreview"` //数据导出去重查询
-		EntDedupUrl string `json:"entdedupUrl"` //企业去重
+		BuyBalance    string `json:"buyBalance"`    //购买资源
+		UseBalance    string `json:"useBalance"`    //使用资源
+		FindBalance   string `json:"findBalance"`   //查询账户余额接口
+		FindRecord    string `json:"findRecord"`    //查询流水账接口
+		FindPreview   string `json:"findPreview"`   //数据导出去重查询
+		EntDedupUrl   string `json:"entdedupUrl"`   //企业去重
+		UpdateVipTime string `json:"updateVipTime"` //更新超级订阅到期时间接口
 	} `json:"apiList"`
 }
 

src/jfw/modules/subscribepay/src/entity/commonApi.go

@@ -186,3 +186,26 @@ func (this *FindRecordStruct) FindBalance() ([]interface{}, int, error) {
 	list, _ := resMap["data"].([]interface{})
 	return list, total, err
 }
+
+//
+
+type UpdateVipTimeStruct struct {
+	AccountId string //账户标识
+	VipTime   int64  //结束时间时间戳
+}
+
+// @Summary 更新超级订阅到期时间
+// @Param  &UpdateVipTimeStruct
+// @return list列表 , int数量 , error
+func (this *UpdateVipTimeStruct) UpdateVipEndTime() (bool, error) {
+	resMap, err := commonPost(config.JyApiConfig.ApiList.UpdateVipTime, url.Values{
+		"accountId": []string{this.AccountId},                  //账户标识
+		"vipTime":   []string{fmt.Sprintf("%v", this.VipTime)}, //到期时间戳
+	})
+	if err != nil {
+		return false, err
+	}
+	ok := qu.IntAll(resMap["code"]) == 1
+	log.Println(resMap)
+	return ok, nil
+}

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -200,6 +200,16 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]))
 	} else if vmsg.OrderType == 5 { //续费(可升降级)
 		flag = JyVipSubStruct.WillNew(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]))
+
+	}
+	if vmsg.OrderType == 2 || vmsg.OrderType == 5 {
+		//延长【附件下载包】到期时间
+		etm, _ := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*orderdata)["vip_endtime"]), time.Local)
+		updateT := &UpdateVipTimeStruct{
+			AccountId: userid,
+			VipTime:   etm.Unix(),
+		}
+		updateT.UpdateVipEndTime()
 	}
 	//支付成功后
 	if flag {

src/jfw/modules/subscribepay/src/service/resourcePack.go

@@ -31,6 +31,14 @@ const (
 
 func (this *ResourcePack) Tes() {
 	userId := qu.ObjToString(this.GetSession("userId"))
+
+	etm, _ := time.ParseInLocation(qu.Date_Full_Layout, "2022-12-12 23:59:59", time.Local)
+	updateT := &entity.UpdateVipTimeStruct{
+		AccountId: userId,
+		VipTime:   etm.Unix(),
+	}
+	updateT.UpdateVipEndTime()
+	return
 	a, b, c := entity.InitFindRecord(userId, entity.ATTACHMENT, "2022-01", 10, 1, 0).FindBalance()
 	this.ServeJson(map[string]interface{}{
 		"a": a,