Merge branch 'dev_v1.0.7_wh' of moapp/jyResourcesCenter into feature/v1.0.7

rpc/resourcesCenter.go

@@ -72,4 +72,5 @@ func init() {
 }
 func timeDask() {
 	balanceService.ExpireHandle()
+	balanceService.DataExpireHandle()
 }

service/balanceService.go

@@ -545,7 +545,7 @@ func (service *BalanceService) UpdateVipTime(data *resourcesCenter.VipReq, produ
 	return entity.SuccessCode, "超级订阅时间修改成功"
 }
 
-// 过期数据处理
+// 过期数据处理(附件下载包)
 func (service *BalanceService) ExpireHandle() {
 	orm := entity.Engine.NewSession()
 	endTime := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
@@ -601,7 +601,56 @@ func (service *BalanceService) ExpireHandle() {
 		if e != nil {
 			log.Println(e)
 		}
-		//jie结存清空
+		//结存清空
+		updataMap := map[string]interface{}{
+			"number": 0,
+		}
+		orm.Table(AccountResources).
+			Cols("number").Where("id =? ", resourcesId).
+			Update(&updataMap)
+	}
+}
+
+// 过期数据处理(数据流量包)
+func (service *BalanceService) DataExpireHandle() {
+	orm := entity.Engine.NewSession()
+	endTime := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
+	dataList := []map[string]interface{}{}
+	endTime = "2023-08-18"
+	orm.Table(AccountResources).Where(` resourceType like "%字段包%" and endTime=? and  number >0  `, endTime).Find(&dataList)
+	for _, m := range dataList {
+		//流水生成
+		var (
+			resourcesId  = gconv.Int64(m["id"])
+			resourceType = gconv.String(m["resourceType"])
+			name         = gconv.String(m["name"])
+		)
+		remarks := func() string {
+			remarksMap := map[string]interface{}{}
+			remarksMap["describe"] = "未使用权益到期失效"
+			jsonData, err := json.Marshal(remarksMap)
+			if err != nil {
+				fmt.Println(err)
+			}
+			return string(jsonData)
+		}()
+		detailed := entity.Detailed{
+			AccountId:    gconv.String(m["accountId"]),
+			CompanyId:    gconv.Int64(m["companyId"]),
+			DepartmentId: gconv.Int64(m["departmentId"]),
+			ResourceType: resourceType,
+			Number:       gconv.Int64(m["number"]),
+			CreateTime:   time.Now().Local(),
+			UserType:     5, //作废标识
+			Remarks:      remarks,
+			UserId:       gconv.String(m["userId"]),
+			Name:         name,
+		}
+		_, e := orm.Table(ConsumeRecord).Insert(&detailed)
+		if e != nil {
+			log.Println(e)
+		}
+		//结存清空
 		updataMap := map[string]interface{}{
 			"number": 0,
 		}