merge

entity/integral.go

@@ -59,7 +59,7 @@ type FlowReq struct {
 	EndDate        string `xorm:"endDate" form:"endDate" json:"endDate"`                      //截止时间
 	AppId          int    `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
 	Sort           int    `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
-	name           string `xorm:"name" form:"name" json:"name"`                               //积分类型名称
+	Name           string `xorm:"name" form:"name" json:"name"`                               //积分类型名称
 }
 
 //积分结存

rpc/internal/logic/integraldetailedchecklogic.go

@@ -32,7 +32,7 @@ func (l *IntegralDetailedCheckLogic) IntegralDetailedCheck(in *integral.AddReq)
 	dat.UserId = in.UserId
 	dat.EndDate = "2021-03"
 	dat.AppId = 10000
-	data := integralService.IntegralExpireCheckService(dat)
+	data := integralService.IntegralDetailedCheck(dat)
 	fmt.Println(data)
 	return &integral.AddResp{}, nil
 }

service/integralService.go

@@ -427,15 +427,15 @@ func (service *IntegralService) IntegralBalanceCheckService(userId,appId string)
 }
 
 //按月查询积分使用情况
-func (service *IntegralService) IntegralExpireCheck(data entity.ExpireJSON) []entity.FlowReq {
+func (service *IntegralService) IntegralDetailedCheck(data entity.ExpireJSON) []entity.FlowReq {
 	orm := entity.Engine
 	var err error
 	flowReq := []entity.FlowReq{}
 	err = orm.Table("integral_flow").Alias("flow").
 		Select("flow.*,pt.name").
 		Join("left", "point_type pt", "flow.pointType=pt.code").
-		Where("userId = ? AND appId = ? AND DATE_FORMAT(createTime,'%Y-%m') ", data.UserId, data.AppId, data.EndDate).
-		GroupBy("pointType").
+		Where("flow.userId = ? AND flow.appId = ? AND DATE_FORMAT(flow.createTime,'%Y-%m')=? ", data.UserId, data.AppId, data.EndDate).
+		Desc("flow.createTime").
 		Find(&flowReq)
 	if err != nil {
 		log.Println(err)