Merge branch 'master' of https://app.yhyue.com/moapp/jyPoints

entity/integral.go

@@ -8,12 +8,12 @@ var Engine *xorm.Engine
 //定义返回状态
 const (
 	SuccessCode int64 = 1
-	ErrorCode  int64 = 0
+	ErrorCode   int64 = 0
 )
 
 //流水类型1加-1减
 const (
-	AddCode  int64  = 1
+	AddCode    int64 = 1
 	ReduceCode int64 = -1
 )
 
@@ -22,14 +22,14 @@ type Balance struct {
 	Id          int64  `xorm:"pk autoincr id" form:"id" json:"id"`
 	UserId      string `xorm:"userId" form:"userId" json:"userId"`                //用户标识
 	CountPoints int64  `xorm:"countPoints" form:"countPoints" json:"countPoints"` //合计
-	AppId       int64    `xorm:"appId" form:"appId" json:"appId"`                   //剑鱼标识
+	AppId       int64  `xorm:"appId" form:"appId" json:"appId"`                   //剑鱼标识
 }
 
 //积分余额
 type BalanceUpdate struct {
 	UserId      string `xorm:"userId" form:"userId" json:"userId"`                //用户标识
 	CountPoints int64  `xorm:"countPoints" form:"countPoints" json:"countPoints"` //合计
-	AppId       int64    `xorm:"appId" form:"appId" json:"appId"`                   //剑鱼标识
+	AppId       int64  `xorm:"appId" form:"appId" json:"appId"`                   //剑鱼标识
 	Change      bool   `xorm:"change" form:"change" json:"change"`                //修改方式true新增 false消耗
 }
 
@@ -37,28 +37,28 @@ type BalanceUpdate struct {
 type Flow struct {
 	Id             int64  `xorm:"pk autoincr id" form:"id" json:"id"`
 	UserId         string `xorm:"userId" form:"userId" json:"userId"`                         //用户标识
-	PointType      int64    `xorm:"pointType" form:"pointType" json:"pointType"`                //积分类型
-	BusinessTypeId int64    `xorm:"businessTypeId" form:"businessTypeId" json:"businessTypeId"` //业务单据标识
+	PointType      int64  `xorm:"pointType" form:"pointType" json:"pointType"`                //积分类型
+	BusinessTypeId int64  `xorm:"businessTypeId" form:"businessTypeId" json:"businessTypeId"` //业务单据标识
 	BusinessType   string `xorm:"businessType" form:"businessType" json:"businessType"`       //业务类型
 	Point          int64  `xorm:"point" form:"point" json:"point"`                            //积分
 	CreateTime     string `xorm:"createTime" form:"createTime" json:"createTime"`             //创建时间
 	EndDate        string `xorm:"endDate" form:"endDate" json:"endDate"`                      //截止时间
-	AppId          int64    `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
-	Sort           int64    `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
+	AppId          int64  `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
+	Sort           int64  `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
 }
 
 //积分流水
 type FlowReq struct {
 	Id             int64  `xorm:"pk autoincr id" form:"id" json:"id"`
 	UserId         string `xorm:"userId" form:"userId" json:"userId"`                         //用户标识
-	PointType      int64    `xorm:"pointType" form:"pointType" json:"pointType"`                //积分类型
-	BusinessTypeId int64    `xorm:"businessTypeId" form:"businessTypeId" json:"businessTypeId"` //业务单据标识
+	PointType      int64  `xorm:"pointType" form:"pointType" json:"pointType"`                //积分类型
+	BusinessTypeId int64  `xorm:"businessTypeId" form:"businessTypeId" json:"businessTypeId"` //业务单据标识
 	BusinessType   string `xorm:"businessType" form:"businessType" json:"businessType"`       //业务类型
 	Point          int64  `xorm:"point" form:"point" json:"point"`                            //积分
 	CreateTime     string `xorm:"createTime" form:"createTime" json:"createTime"`             //创建时间
 	EndDate        string `xorm:"endDate" form:"endDate" json:"endDate"`                      //截止时间
-	AppId          int64    `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
-	Sort           int64    `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
+	AppId          int64  `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
+	Sort           int64  `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
 	Name           string `xorm:"name" form:"name" json:"name"`                               //积分类型名称
 }
 
@@ -69,29 +69,29 @@ type Solde struct {
 	UserId          string `xorm:"userId" form:"userId" json:"userId"`                            //用户标识
 	TimePoints      int64  `xorm:"timePoints" form:"timePoints" json:"timePoints"`                //时效积分
 	EndDate         string `xorm:"endDate" form:"endDate" json:"endDate"`                         //有效期止
-	AppId           int64    `xorm:"appId" form:"appId" json:"appId"`                               //剑鱼标识
+	AppId           int64  `xorm:"appId" form:"appId" json:"appId"`                               //剑鱼标识
 }
 
 //积分流水
 type FlowJSON struct {
 	UserId         string `xorm:"userId" form:"userId" json:"userId"`                         //用户标识
-	PointType      int64    `xorm:"pointType" form:"pointType" json:"pointType"`                //积分类型
-	BusinessTypeId int64    `xorm:"businessTypeId" form:"businessTypeId" json:"businessTypeId"` //业务单据标识
+	PointType      int64  `xorm:"pointType" form:"pointType" json:"pointType"`                //积分类型
+	BusinessTypeId int64  `xorm:"businessTypeId" form:"businessTypeId" json:"businessTypeId"` //业务单据标识
 	BusinessType   string `xorm:"businessType" form:"businessType" json:"businessType"`       //业务类型
 	Point          int64  `xorm:"point" form:"point" json:"point"`                            //积分
 	EndDate        string `xorm:"endDate" form:"endDate" json:"endDate"`                      //截止时间
-	AppId          int64    `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
+	AppId          int64  `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
 	OperationType  bool   `xorm:"operationType" form:"operationType" json:"operationType"`    //永久：true、时效：false
-	Sort           int64    `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
-	Page           int64    `xorm:"page" form:"page" json:"page"`                               //当前页数
-	PageSize       int64    `xorm:"pageSize" form:"pageSize" json:"pageSize"`                   //每页数量
+	Sort           int64  `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
+	Page           int64  `xorm:"page" form:"page" json:"page"`                               //当前页数
+	PageSize       int64  `xorm:"pageSize" form:"pageSize" json:"pageSize"`                   //每页数量
 }
 
 //到期积分查询
 type ExpireJSON struct {
-	UserId    string `xorm:"userId" form:"userId" json:"userId"`          //用户标识
-	EndDate   string `xorm:"endDate" form:"endDate" json:"endDate"`       //截止时间
-	AppId     int64    `xorm:"appId" form:"appId" json:"appId"`             //剑鱼标识
+	UserId  string `xorm:"userId" form:"userId" json:"userId"`    //用户标识
+	EndDate string `xorm:"endDate" form:"endDate" json:"endDate"` //截止时间
+	AppId   int64  `xorm:"appId" form:"appId" json:"appId"`       //剑鱼标识
 }
 
 //积分结存修改
@@ -101,13 +101,13 @@ type SoldeUpdate struct {
 	UserId     string `xorm:"userId" form:"userId" json:"userId"`             //用户标识
 	Points     int64  `xorm:"points" form:"points" json:"points"`             //积分
 	EndDate    string `xorm:"endDate" form:"endDate" json:"endDate"`          //有效期止
-	AppId      int64    `xorm:"appId" form:"appId" json:"appId"`                //剑鱼标识
+	AppId      int64  `xorm:"appId" form:"appId" json:"appId"`                //剑鱼标识
 }
 
 //积分守护
 type GuardJSON struct {
 	UserId    string `xorm:"userId" form:"userId" json:"userId"`          //用户标识
-	PointType int64    `xorm:"pointType" form:"pointType" json:"pointType"` //积分类型
+	PointType int64  `xorm:"pointType" form:"pointType" json:"pointType"` //积分类型
 	EndDate   string `xorm:"endDate" form:"endDate" json:"endDate"`       //截止时间
-	AppId     int64    `xorm:"appId" form:"appId" json:"appId"`             //剑鱼标识
+	AppId     int64  `xorm:"appId" form:"appId" json:"appId"`             //剑鱼标识
 }

service/integralService.go

@@ -19,6 +19,7 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int64,
 	flow.BusinessType = data.BusinessType
 	flow.PointType = data.PointType
 	flow.Point = data.Point
+	flow.EndDate=data.EndDate
 	flow.CreateTime = time.Now().Format("2006-01-02 15:04:05")
 	flow.AppId = data.AppId
 	flow.Sort = entity.AddCode
@@ -37,18 +38,18 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int64,
 		//永久积分
 		//先查看是否有EndDate的积分
 		soldelist := []entity.Solde{}
-		err = orm.Table("integral_solde").Where("appId=? and  userId=? and endDate=? and (perManEntPoints != 0 AND timePoints = 0) or (perManEntPoints = 0 AND timePoints = 0 ) ", data.AppId, data.UserId, data.EndDate).Find(&soldelist)
+		err = orm.Table("integral_solde").Where("appId=? and  userId=? and endDate='' and perManEntPoints != 0 AND timePoints = 0 ", data.AppId, data.UserId).Find(&soldelist)
 		if len(soldelist) > 0 {
 			soldelist[0].PerManEntPoints += data.Point
 			numb, err = orm.Table("integral_solde").ID(soldelist[0].Id).Cols("perManEntPoints").Update(soldelist[0])
-			if err != nil && numb == 0 {
+			if err != nil || numb == 0 {
 				log.Print("修改时效积分失败:", err)
 				return entity.ErrorCode, "修改时效积分失败"
 			}
 		} else {
 			solde.PerManEntPoints = data.Point
 			numb, err = orm.Table("integral_solde").Insert(&solde)
-			if err != nil && numb == 0 {
+			if err != nil || numb == 0 {
 				log.Print("新增永久积分失败")
 				return entity.ErrorCode, "新增永久积分失败"
 			}
@@ -62,7 +63,7 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int64,
 		if len(soldelist) > 0 {
 			soldelist[0].TimePoints += data.Point
 			numb, err = orm.Table("integral_solde").ID(soldelist[0].Id).Cols("timePoints").Update(soldelist[0])
-			if err != nil && numb == 0 {
+			if err != nil || numb == 0 {
 				log.Print("修改时效积分失败:", err)
 				return entity.ErrorCode, "修改时效积分失败"
 			}
@@ -85,7 +86,7 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int64,
 		balance.AppId = data.AppId
 		balance.CountPoints = data.Point
 		numb, err = entity.Engine.Table("integral_balance").Insert(&balance)
-		if err != nil && numb == 0 {
+		if err != nil || numb == 0 {
 			log.Print("新增余额失败:", err)
 			return entity.ErrorCode, "新增余额失败"
 		}
@@ -93,7 +94,7 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int64,
 		//修改余额
 		balanceList[0].CountPoints = balanceList[0].CountPoints + data.Point
 		numb, err = entity.Engine.Table("integral_balance").ID(balanceList[0].Id).Cols("countPoints").Update(balanceList[0])
-		if err != nil && numb == 0 {
+		if err != nil || numb == 0 {
 			log.Print("余额新增失败:", err)
 			return entity.ErrorCode, "余额新增失败"
 		}
@@ -145,7 +146,7 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 					ID(solde.Id).
 					Cols("perManEntPoints").
 					Update(solde)
-				if err != nil && af == 0 {
+				if err != nil || af == 0 {
 					log.Print("消耗永久积分失败:", err)
 					orm.Rollback()
 					return entity.ErrorCode, "消耗永久积分失败"
@@ -161,7 +162,7 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 					ID(solde.Id).
 					Cols("timePoints").
 					Update(solde)
-				if err != nil && af == 0 {
+				if err != nil || af == 0 {
 					log.Print("消耗时效积分失败:", err)
 					orm.Rollback()
 					return entity.ErrorCode, "消耗时效积分失败"
@@ -175,13 +176,12 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 				ID(solde.Id).
 				Cols("timePoints").
 				Update(solde)
-			if err != nil && af == 0 {
+			if err != nil || af == 0 {
 				log.Print("消耗时效积分失败:", err)
 				orm.Rollback()
 				return entity.ErrorCode, "消耗时效积分失败"
 			}
 		}
-
 	}
 
 	//余额消耗
@@ -190,7 +190,7 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 		ID(balance.Id).
 		Cols("countPoints").
 		Update(balance)
-	if err != nil && af == 0 {
+	if err != nil || af == 0 {
 		log.Print("余额扣除失败:", err)
 		orm.Rollback()
 		return entity.ErrorCode, "余额扣除失败"
@@ -208,11 +208,12 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 	flow.AppId = data.AppId
 	flow.Sort = entity.ReduceCode
 	af, err = orm.Table("integral_flow").Insert(&flow)
-	if err != nil && af == 0 {
+	if err != nil || af == 0{
 		log.Print("积分记录失败")
 		orm.Rollback()
 		return entity.ErrorCode, "积分记录失败"
 	}
+
 	err = orm.Commit()
 	if err != nil {
 		return entity.ErrorCode, "积分消耗失败"