浏览代码

bug修改

wangfei 6 年前
父节点
当前提交
4b08016fc3
共有 7 个文件被更改,包括 26 次插入19 次删除
  1. 1
    1
      conf/db.conf
  2. 1
    1
      conf/log.conf
  3. 5
    0
      log/common.log
  4. 7
    5
      models/card/card.go
  5. 1
    1
      models/system/user.go
  6. 10
    10
      service/card/card.go
  7. 1
    1
      service/coupon/coupon.go

+ 1
- 1
conf/db.conf 查看文件

6
 
6
 
7
 ; 数据库地址,可以使用IP
7
 ; 数据库地址,可以使用IP
8
 # db_addr      = 192.168.0.122
8
 # db_addr      = 192.168.0.122
9
-db_addr      = 192.168.0.122
9
+db_addr      = localhost
10
 
10
 
11
 ; 端口
11
 ; 端口
12
 db_port      = 3306
12
 db_port      = 3306

+ 1
- 1
conf/log.conf 查看文件

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

+ 5
- 0
log/common.log 查看文件

4
 2018/09/14 16:20:29 [E] 获取人员信息失败: 获取人员信息失败
4
 2018/09/14 16:20:29 [E] 获取人员信息失败: 获取人员信息失败
5
 2018/09/14 16:21:28 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
5
 2018/09/14 16:21:28 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
6
 2018/09/14 16:21:28 [E] 获取人员信息失败: 获取人员信息失败
6
 2018/09/14 16:21:28 [E] 获取人员信息失败: 获取人员信息失败
7
+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
8
+			sys_user t
9
+		JOIN sys_user_type s ON t.user_id = s.user_id
10
+		JOIN td_use' at line 4
11
+2018/09/14 18:49:55 [E] 解析 Token 失败: token contains an invalid number of segments

+ 7
- 5
models/card/card.go 查看文件

10
 	"strings"
10
 	"strings"
11
 	"time"
11
 	"time"
12
 
12
 
13
+	"github.com/astaxie/beego"
14
+
13
 	"github.com/go-xorm/xorm"
15
 	"github.com/go-xorm/xorm"
14
 	"github.com/yl10/kit/guid"
16
 	"github.com/yl10/kit/guid"
15
 )
17
 )
108
 	return nil
110
 	return nil
109
 }
111
 }
110
 
112
 
111
-// UpdateCard 更新优惠券
113
+// UpdateCard 更新体验卡
112
 func (m *CardDAO) UpdateCard(card *model.TaCouponCard, cols []string) error {
114
 func (m *CardDAO) UpdateCard(card *model.TaCouponCard, cols []string) error {
113
 	if card.CardId == "" {
115
 	if card.CardId == "" {
114
 		return errors.New("无卡信息")
116
 		return errors.New("无卡信息")
222
 func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) ([]CaseUsableCard, error) {
224
 func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) ([]CaseUsableCard, error) {
223
 	var cards []CaseUsableCard
225
 	var cards []CaseUsableCard
224
 	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)
226
 	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)
227
+	beego.Error(sql)
225
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&cards)
228
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&cards)
226
 	if userid != "" {
229
 	if userid != "" {
227
 		for inx, card := range cards {
230
 		for inx, card := range cards {
240
 	var Coupons []CaseUsableCard
243
 	var Coupons []CaseUsableCard
241
 	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now()`
244
 	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now()`
242
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
245
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
243
-
244
 	return len(Coupons), err
246
 	return len(Coupons), err
245
 }
247
 }
246
 
248
 
284
 	return customerCards, err
286
 	return customerCards, err
285
 }
287
 }
286
 
288
 
287
-// GetCardWithCustomer 获取优惠券明细
289
+// GetCardWithCustomer 获取体验卡明细
288
 func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
290
 func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
289
 	var card = new(CaseUsableCard)
291
 	var card = new(CaseUsableCard)
290
 	sql := `select * from ta_card where coupin_id=?`
292
 	sql := `select * from ta_card where coupin_id=?`
293
 		return nil, err
295
 		return nil, err
294
 	}
296
 	}
295
 	if card == nil || card.CardId == "" {
297
 	if card == nil || card.CardId == "" {
296
-		return nil, errors.New("无优惠券信息")
298
+		return nil, errors.New("无体验卡信息")
297
 	}
299
 	}
298
 	var customerCopons []model.TaCustomerCard
300
 	var customerCopons []model.TaCustomerCard
299
 	sql = `select * from ta_customer_card where card_id = ? and status>?`
301
 	sql = `select * from ta_customer_card where card_id = ? and status>?`
333
 // GetCustomerCardByID 获取我的体验卡详情
335
 // GetCustomerCardByID 获取我的体验卡详情
334
 func (m *CardDAO) GetCustomerCardByID(id string) (*CustomerCardWithShare, error) {
336
 func (m *CardDAO) GetCustomerCardByID(id string) (*CustomerCardWithShare, error) {
335
 	if id == "" {
337
 	if id == "" {
336
-		return nil, errors.New("无优惠券信息")
338
+		return nil, errors.New("无体验卡信息")
337
 	}
339
 	}
338
 	var customerCard = new(CustomerCardWithShare)
340
 	var customerCard = new(CustomerCardWithShare)
339
 	sql := `select * from ta_customer_card where status>? and customer_card_id=?`
341
 	sql := `select * from ta_customer_card where status>? and customer_card_id=?`

+ 1
- 1
models/system/user.go 查看文件

412
 	query := `
412
 	query := `
413
 		SELECT
413
 		SELECT
414
 			t.*, m.type_id,
414
 			t.*, m.type_id,
415
-			m.type_name,
415
+			m.type_name
416
 		FROM
416
 		FROM
417
 			sys_user t
417
 			sys_user t
418
 		JOIN sys_user_type s ON t.user_id = s.user_id
418
 		JOIN sys_user_type s ON t.user_id = s.user_id

+ 10
- 10
service/card/card.go 查看文件

218
 	endDate := card.EndDate
218
 	endDate := card.EndDate
219
 
219
 
220
 	// 检查用户是否已经有了该券
220
 	// 检查用户是否已经有了该券
221
-	custcardS, err := s.dao.CheckCustCard(to.CustomerId, card.CardId, startDate, endDate)
222
-	if err != nil {
223
-		utils.LogError("校验客户卡失败: " + err.Error())
224
-		return errors.New("校验客户卡失败")
225
-	}
221
+	// custcardS, err := s.dao.CheckCustCard(to.CustomerId, card.CardId, startDate, endDate)
222
+	// if err != nil {
223
+	// 	utils.LogError("校验客户卡失败: " + err.Error())
224
+	// 	return errors.New("校验客户卡失败")
225
+	// }
226
 
226
 
227
-	if custcardS != nil && len(custcardS) > 0 {
228
-		return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
229
-	}
227
+	// if custcardS != nil && len(custcardS) > 0 {
228
+	// 	return errors.New("客户 " + to.CustomerName + " 已经拥有该券")
229
+	// }
230
 
230
 
231
 	// 放入我的卡券
231
 	// 放入我的卡券
232
 	custcard := model.TaCustomerCard{
232
 	custcard := model.TaCustomerCard{
323
 	if page == 0 {
323
 	if page == 0 {
324
 		page = 1
324
 		page = 1
325
 	}
325
 	}
326
-	customer := s.ctx.Get("Customer").(model.TaCustomer)
326
+	customer := s.ctx.Get("customer").(model.TaCustomer)
327
 	if customer.UserId == "" {
327
 	if customer.UserId == "" {
328
 		return nil, errors.New("您没有权限查看数据")
328
 		return nil, errors.New("您没有权限查看数据")
329
 	}
329
 	}
332
 		utils.LogError("获取用户信息失败: " + err.Error())
332
 		utils.LogError("获取用户信息失败: " + err.Error())
333
 		return nil, errors.New("获取用户信息失败")
333
 		return nil, errors.New("获取用户信息失败")
334
 	}
334
 	}
335
-	if len(userTypes) > 0 {
335
+	if len(userTypes) == 0 {
336
 		return nil, errors.New("您没有权限查看数据")
336
 		return nil, errors.New("您没有权限查看数据")
337
 	}
337
 	}
338
 	caseinfo, err := s.userDao.GetUserBelongCase(customer.UserId)
338
 	caseinfo, err := s.userDao.GetUserBelongCase(customer.UserId)

+ 1
- 1
service/coupon/coupon.go 查看文件

415
 	if page == 0 {
415
 	if page == 0 {
416
 		page = 1
416
 		page = 1
417
 	}
417
 	}
418
-	customer := s.ctx.Get("Customer").(model.TaCustomer)
418
+	customer := s.ctx.Get("customer").(model.TaCustomer)
419
 	if customer.UserId == "" {
419
 	if customer.UserId == "" {
420
 		return nil, errors.New("您没有权限查看数据")
420
 		return nil, errors.New("您没有权限查看数据")
421
 	}
421
 	}