tijiao

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, "积分消耗失败"