merge

entity/integral.go

@@ -81,8 +81,8 @@ type FlowJSON struct {
 	Point          int64  `xorm:"point" form:"point" json:"point"`                            //积分
 	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减
 	OperationType  bool   `xorm:"operationType" form:"operationType" json:"operationType"`    //永久：true、时效：false
+	Sort           int    `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
 }
 
 //到期积分查询

rpc/test/consume_test.go

@@ -21,7 +21,7 @@ import (
 //创建orm引擎
 func init() {
 	var  err  error
-	entity.Engine, err = xorm.NewEngine("mysql", "admin:123456@tcp(192.168.3.14:3306)/jyintegral?charset=utf8")
+	entity.Engine, err = xorm.NewEngine("mysql", "root:root@tcp(127.0.0.1:3306)/jyintegral?charset=utf8")
 	entity.Engine.ShowSQL(true)
 	if err != nil {
 		log.Fatal("数据库连接失败:", err)

service/integralService.go

@@ -103,6 +103,7 @@ func (service *IntegralService) IntegralAddService(data entity.FlowJSON) (int, s
 
 //消耗积分流水
 func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (int, string) {
+	var af = int64(0)
 	orm := entity.Engine
 	flow := entity.Flow{}
 	flow.UserId = data.UserId
@@ -114,7 +115,6 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 	flow.EndDate = data.EndDate
 	flow.AppId = data.AppId
 	flow.Sort = entity.ReduceCode
-	//判断是否为消耗积分：false
 	balance := entity.Balance{}
 	//查询积分余额是否充足
 	b, err := orm.Table("integral_balance").Select("countPoints,id").
@@ -127,15 +127,13 @@ func (service *IntegralService) IntegralConsumeService(data entity.FlowJSON) (in
 	if balance.CountPoints < data.Point {
 		return entity.ErrorCode, "积分余额不足"
 	}
-	af, err := orm.Table("integral_flow").Insert(&flow)
-	if err != nil && af==0{
-		log.Print("积分记录失败")
-		return entity.ErrorCode, "积分记录失败"
-	}
 
 	//结存消耗
 	soldelist := []entity.Solde{}
-	err = entity.Engine.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, time.Now().Format("2006-01-02")).Desc("endDate").Desc("timePoints").Find(&soldelist)
+	err = entity.Engine.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, time.Now().Format("2006-01-02")).
+		Desc("endDate").
+		Desc("timePoints").Find(&soldelist)
 	if len(soldelist) == 0 {
 		return entity.ErrorCode, "没有结存可以消耗"
 	}