Merge branch 'dev_v1.1.2_wh' of moapp/jyPoints into feature/v1.1.2

service/integralService.go

@@ -321,7 +321,7 @@ func (service *IntegralService) IntegralBalanceCheckService(userId, appId string
 	//积分总余额
 	userBalance := entity.Balance{}
 	_, err = orm.Table("integral_flow").Select("sum(point)CountPoints").
-		Where("appId=? and  userId=? and sort=-1", appId, userId).
+		Where("appId=? and  userId=? and sort=-1 and pointType!=2004 ", appId, userId).
 		GroupBy("userId").Get(&userBalance)
 	if err != nil {
 		log.Println("积分查询出错")