bug修改

conf/db.conf

@@ -6,7 +6,7 @@ con_protocol = tcp
 
 ; 数据库地址，可以使用IP
 # db_addr      = 192.168.0.122
-db_addr      = 192.168.0.122
+db_addr      = localhost
 
 ; 端口
 db_port      = 3306

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

log/common.log

@@ -4,3 +4,8 @@
 2018/09/14 16:20:29 [E] 获取人员信息失败: 获取人员信息失败
 2018/09/14 16:21:28 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
 2018/09/14 16:21:28 [E] 获取人员信息失败: 获取人员信息失败
+2018/09/14 17:38:13 [E] 获取用户信息失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FROM
+			sys_user t
+		JOIN sys_user_type s ON t.user_id = s.user_id
+		JOIN td_use' at line 4
+2018/09/14 18:49:55 [E] 解析 Token 失败: token contains an invalid number of segments

models/card/card.go

@@ -10,6 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 	"github.com/yl10/kit/guid"
 )
@@ -108,7 +110,7 @@ func (m *CardDAO) AddCard(card *model.TaCouponCard) error {
 	return nil
 }
 
-// UpdateCard 更新优惠券
+// UpdateCard 更新体验卡
 func (m *CardDAO) UpdateCard(card *model.TaCouponCard, cols []string) error {
 	if card.CardId == "" {
 		return errors.New("无卡信息")
@@ -222,6 +224,7 @@ type CaseUsableCard struct {
 func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) ([]CaseUsableCard, error) {
 	var cards []CaseUsableCard
 	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	beego.Error(sql)
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&cards)
 	if userid != "" {
 		for inx, card := range cards {
@@ -240,7 +243,6 @@ func (m *CardDAO) GetCaseUsableCardCount(caseid, userid string) (int, error) {
 	var Coupons []CaseUsableCard
 	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now()`
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
-
 	return len(Coupons), err
 }
 
@@ -284,7 +286,7 @@ func (m *CardDAO) GetCustomerCardByUser(caseid, userid string) ([]model.TaCustom
 	return customerCards, err
 }
 
-// GetCardWithCustomer 获取优惠券明细
+// GetCardWithCustomer 获取体验卡明细
 func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
 	var card = new(CaseUsableCard)
 	sql := `select * from ta_card where coupin_id=?`
@@ -293,7 +295,7 @@ func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
 		return nil, err
 	}
 	if card == nil || card.CardId == "" {
-		return nil, errors.New("无优惠券信息")
+		return nil, errors.New("无体验卡信息")
 	}
 	var customerCopons []model.TaCustomerCard
 	sql = `select * from ta_customer_card where card_id = ? and status>?`
@@ -333,7 +335,7 @@ func (m *CardDAO) GetCardByCustomer(orgid, customerid string) ([]CustomerCardWit
 // GetCustomerCardByID 获取我的体验卡详情
 func (m *CardDAO) GetCustomerCardByID(id string) (*CustomerCardWithShare, error) {
 	if id == "" {
-		return nil, errors.New("无优惠券信息")
+		return nil, errors.New("无体验卡信息")
 	}
 	var customerCard = new(CustomerCardWithShare)
 	sql := `select * from ta_customer_card where status>? and customer_card_id=?`

models/system/user.go

@@ -412,7 +412,7 @@ func (m *UserDAO) GetUserWithTypeByID(userID string) ([]UserWithType, error) {
 	query := `
 		SELECT
 			t.*, m.type_id,
-			m.type_name,
+			m.type_name
 		FROM
 			sys_user t
 		JOIN sys_user_type s ON t.user_id = s.user_id

service/card/card.go

@@ -218,15 +218,15 @@ func (s *CardServ) GiveCardTo(from *model.SysUser, to *model.TaCustomer, card *c
 	endDate := card.EndDate
 
 	// 检查用户是否已经有了该券
-	custcardS, err := s.dao.CheckCustCard(to.CustomerId, card.CardId, startDate, endDate)
-	if err != nil {
-		utils.LogError("校验客户卡失败: " + err.Error())
-		return errors.New("校验客户卡失败")
-	}
+	// custcardS, err := s.dao.CheckCustCard(to.CustomerId, card.CardId, startDate, endDate)
+	// if err != nil {
+	// 	utils.LogError("校验客户卡失败: " + err.Error())
+	// 	return errors.New("校验客户卡失败")
+	// }
 
-	if custcardS != nil && len(custcardS) > 0 {
-		return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
-	}
+	// if custcardS != nil && len(custcardS) > 0 {
+	// 	return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
+	// }
 
 	// 放入我的卡券
 	custcard := model.TaCustomerCard{
@@ -323,7 +323,7 @@ func (s *CardServ) GetCaseUsableCard(page, pageSize int) (map[string]interface{}
 	if page == 0 {
 		page = 1
 	}
-	customer := s.ctx.Get("Customer").(model.TaCustomer)
+	customer := s.ctx.Get("customer").(model.TaCustomer)
 	if customer.UserId == "" {
 		return nil, errors.New("您没有权限查看数据")
 	}
@@ -332,7 +332,7 @@ func (s *CardServ) GetCaseUsableCard(page, pageSize int) (map[string]interface{}
 		utils.LogError("获取用户信息失败: " + err.Error())
 		return nil, errors.New("获取用户信息失败")
 	}
-	if len(userTypes) > 0 {
+	if len(userTypes) == 0 {
 		return nil, errors.New("您没有权限查看数据")
 	}
 	caseinfo, err := s.userDao.GetUserBelongCase(customer.UserId)

service/coupon/coupon.go

@@ -415,7 +415,7 @@ func (s *CouponServ) GetCaseUsableCoupon(page, pageSize int) (map[string]interfa
 	if page == 0 {
 		page = 1
 	}
-	customer := s.ctx.Get("Customer").(model.TaCustomer)
+	customer := s.ctx.Get("customer").(model.TaCustomer)
 	if customer.UserId == "" {
 		return nil, errors.New("您没有权限查看数据")
 	}