commit

entity/integral.go

@@ -87,7 +87,6 @@ type FlowJSON struct {
 //到期积分查询
 type ExpireJSON struct {
 	UserId    string `xorm:"userId" form:"userId" json:"userId"`          //用户标识
-	PointType int    `xorm:"pointType" form:"pointType" json:"pointType"` //积分类型
 	EndDate   string `xorm:"endDate" form:"endDate" json:"endDate"`       //截止时间
 	AppId     int    `xorm:"appId" form:"appId" json:"appId"`             //剑鱼标识
 }

rpc/internal/logic/integralconsumelogic.go

@@ -35,15 +35,13 @@ func (l *IntegralConsumeLogic) IntegralConsume(in *integral.AddReq) (*integral.A
 	// todo: add your logic here and delete this line
 	dat := entity.FlowJSON{}
 	dat.UserId = in.UserId
-	dat.PointType = 1
+	dat.PointType = 2003
 	dat.BusinessTypeId = 1
 	dat.BusinessType = "1"
 	dat.Point = in.CountPoints
-	dat.EndDate = "2021-03-10"
+	dat.EndDate = "2021-03-11"
 	dat.AppId = 10000
-	dat.Sort = entity.ReduceCode
 	fmt.Println(integralService.IntegralConsumeService(dat))
-	//integralService.IntegralConsumeService(dat)
 	return &integral.AddResp{
 		Status: true,
 	},nil

rpc/internal/logic/integraldetailedchecklogic.go

@@ -2,7 +2,6 @@ package logic
 
 import (
 	"context"
-	"fmt"
 	"points_service/entity"
 
 	"points_service/rpc/integral"
@@ -32,7 +31,7 @@ func (l *IntegralDetailedCheckLogic) IntegralDetailedCheck(in *integral.AddReq)
 	dat.UserId = in.UserId
 	dat.EndDate = "2021-03"
 	dat.AppId = 10000
-	data := integralService.IntegralExpireCheckService(dat)
-	fmt.Println(data)
+	/*data := integralService.IntegralExpireCheckService(dat)
+	fmt.Println(data)*/
 	return &integral.AddResp{}, nil
 }

rpc/internal/logic/integralexpirechecklogic.go

@@ -30,17 +30,15 @@ func (l *IntegralExpireCheckLogic) IntegralExpireCheck(in *integral.AddReq) (*in
 	// todo: add your logic here and delete this line
 	result := &integral.AddResp{}
 	dat := entity.ExpireJSON{}
-	dat.UserId = "ABC"
-	dat.PointType = 1
+	dat.UserId = in.UserId
 	dat.EndDate = "2021-03-16"
 	dat.AppId = 10000
-	data := integralService.IntegralExpireCheckService(dat)
+	dataType,points := integralService.IntegralExpireCheckService(dat)
 	res := make(map[string]interface{})
-	res["data"] = data
+	res["code"] = dataType
+	res["data"] = points
+	res["msg"] = "到期积分查询成功"
 	fmt.Println(res)
 	result.Status = true
-	/*result.Code = -1
-	result.Data = res
-	result.Msg = "查询列表失败"*/
 	return result,nil
 }

rpc/internal/logic/integralguardlogic.go

@@ -26,6 +26,6 @@ func NewIntegralGuardLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Int
 // 积分守护
 func (l *IntegralGuardLogic) IntegralGuard(in *integral.AddReq) (*integral.AddResp, error) {
 	// todo: add your logic here and delete this line
-	integralService.IntegralGuardService("2021-03-10 23:59:59")
+	integralService.IntegralGuardService("2021-03-13 23:59:59")
 	return &integral.AddResp{}, nil
 }

rpc/internal/logic/integralharvestlogic.go

@@ -35,7 +35,6 @@ func (l *IntegralHarvestLogic) IntegralHarvest(in *integral.AddReq) (*integral.A
 	dat.OperationType = false
 	dat.UserId=in.UserId
 	dat.Point=in.CountPoints
-	dat.Sort=entity.AddCode
 	code, msg := integralService.IntegralAddService(dat)
 	fmt.Println(code,msg)
 	if (code == 1) {

rpc/test/consume_test.go

@@ -31,7 +31,7 @@ func init() {
 func  Test_Consume(t *testing.T)  {
 	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
 	FileSystem :=integralclient.NewIntegral(zrpc.MustNewClient(c.FileSystemConf))
-	req := &integral.AddReq{UserId: "xzh", CountPoints: 123}
+	req := &integral.AddReq{UserId: "ABC", CountPoints: 24}
 	res, err := FileSystem.IntegralConsume(ctx, req)
 	log.Println("err ", err)
 	log.Println("req ", res)
@@ -77,7 +77,7 @@ func  Test_Delete(t *testing.T)  {
 func  Test_Expire(t *testing.T)  {
 	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
 	FileSystem :=integralclient.NewIntegral(zrpc.MustNewClient(c.FileSystemConf))
-	req := &integral.AddReq{UserId: "xzh", CountPoints: 123}
+	req := &integral.AddReq{UserId: "ABC", CountPoints: 123}
 	res, err := FileSystem.IntegralExpireCheck(ctx, req)
 	log.Println("err ", err)
 	log.Println("req ", res)

service/integralService.go

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"fmt"
 	"log"
 	"points_service/entity"
 	"time"
@@ -21,7 +20,7 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int, s
 	flow.CreateTime = time.Now().Format("2006-01-02 15:04:05")
 	flow.EndDate = data.EndDate
 	flow.AppId = data.AppId
-	flow.Sort = entity.AddCode;
+	flow.Sort = entity.AddCode
 	var err error
 	var numb = int64(0)
 	numb, err = orm.Table("integral_flow").Insert(flow)
@@ -34,7 +33,7 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int, s
 	solde.AppId = data.AppId
 	solde.UserId = data.UserId
 	solde.EndDate = data.EndDate
-	if (data.OperationType) {
+	if data.OperationType {
 		//永久积分
 		//先查看是否有EndDate的积分
 		soldelist := []entity.Solde{}
@@ -148,13 +147,16 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 		if point == 0 {
 			break
 		}
-		if (solde.TimePoints == 0) {
+		if solde.TimePoints == 0 {
 			//消耗永久积分
-			if (solde.PerManEntPoints >= point) {
+			if solde.PerManEntPoints >= point {
 				//够消耗
 				solde.PerManEntPoints = solde.PerManEntPoints - point
 				point = 0
-				af, err = entity.Engine.Table("integral_solde").ID(solde.Id).Cols("perManEntPoints").Update(solde)
+				af, err = entity.Engine.Table("integral_solde").
+					ID(solde.Id).
+					Cols("perManEntPoints").
+					Update(solde)
 				if err != nil && af == 0 {
 					log.Print("消耗永久积分失败")
 					return entity.ErrorCode, "消耗永久积分失败"
@@ -162,12 +164,14 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 			}
 		} else {
 			//消耗时效积分
-			if (solde.TimePoints > point) {
-
+			if solde.TimePoints > point {
 				solde.TimePoints = solde.TimePoints - point
 				//够消耗
 				point = 0
-				af, err = entity.Engine.Table("integral_solde").ID(solde.Id).Cols("timePoints").Update(solde)
+				af, err = entity.Engine.Table("integral_solde").
+					ID(solde.Id).
+					Cols("timePoints").
+					Update(solde)
 				if err != nil && af == 0 {
 					log.Print("消耗时效积分失败")
 					return entity.ErrorCode, "消耗时效积分失败"
@@ -177,7 +181,10 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 			//不够消耗
 			point = point - solde.TimePoints
 			solde.TimePoints = 0
-			af, err = entity.Engine.Table("integral_solde").ID(solde.Id).Cols("timePoints").Update(solde)
+			af, err = entity.Engine.Table("integral_solde").
+				ID(solde.Id).
+				Cols("timePoints").
+				Update(solde)
 			if err != nil && af == 0 {
 				log.Print("消耗时效积分失败")
 				return entity.ErrorCode, "消耗时效积分失败"
@@ -185,9 +192,13 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 		}
 
 	}
+
 	//余额消耗
 	balance.CountPoints = balance.CountPoints - data.Point
-	af, err = entity.Engine.Table("integral_balance").ID(balance.Id).Cols("countPoints").Update(balance)
+	af, err = entity.Engine.Table("integral_balance").
+		ID(balance.Id).
+		Cols("countPoints").
+		Update(balance)
 	if err != nil && af == 0 {
 		log.Print("余额扣除失败")
 		return entity.ErrorCode, "余额扣除失败"
@@ -196,24 +207,19 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 }
 
 //到期积分查询
-func (service *IntegralService) IntegralExpireCheckService(data entity.ExpireJSON) []entity.Flow {
+func (service *IntegralService) IntegralExpireCheckService(data entity.ExpireJSON) (int,int64) {
 	orm := entity.Engine
-	var flow []entity.Flow
+	var solde entity.Solde
 	var err error
-	point := ""
-	if data.PointType != 0 {
-		point = "AND pointType = " + fmt.Sprint(data.PointType) + ""
-	}
-	err = orm.Table("integral_flow").
-		Select("id,pointType,SUM(point) AS point").
-		Where("userId = ? AND appId = ? AND endDate < ? "+point+"", data.UserId, data.AppId, data.EndDate).
-		GroupBy("pointType").
-		Find(&flow)
-	if err != nil {
+	af,err := orm.Table("integral_solde").
+		Select("SUM( timePoints ) AS timePoints").
+		Where("userId = ? AND appId = ? AND endDate < ? ", data.UserId, data.AppId, data.EndDate).
+		Get(&solde)
+	if !af || err != nil {
 		log.Println(err)
-		return nil
+		return entity.ErrorCode,0
 	}
-	return flow
+	return entity.SuccessCode,solde.TimePoints
 }
 
 /*//结存新增
@@ -398,7 +404,7 @@ func (service *IntegralService) IntegralGuardService(endDate string) bool {
 		flow.EndDate = solde.EndDate
 		flow.AppId = solde.AppId
 		af, err := orm.Table("integral_flow").Insert(&flow)
-		if err != nil && af==0{
+		if err != nil && af == 0 {
 			log.Print("积分记录失败")
 			return false
 		}
@@ -419,17 +425,17 @@ func (service *IntegralService) IntegralGuardService(endDate string) bool {
 }
 
 //积分余额查询
-func (service *IntegralService) IntegralBalanceCheckService(userId,appId string) (bool,int64) {
+func (service *IntegralService) IntegralBalanceCheckService(userId, appId string) (bool, int64) {
 	orm := entity.Engine
 	balance := entity.Balance{}
-	b,err := orm.Table("integral_balance").
-		Where("userId = ? AND appId = ?", userId,appId).
+	b, err := orm.Table("integral_balance").
+		Where("userId = ? AND appId = ?", userId, appId).
 		Get(&balance)
 	if !b || err != nil {
 		log.Println("积分余额查询失败")
-		return false,0
+		return false, 0
 	}
-	return true,balance.CountPoints
+	return true, balance.CountPoints
 }
 
 //按月查询积分使用情况