浏览代码

2.1.0 bug fix

胡轶钦 6 年前
父节点
当前提交
5d4079aafc
共有 4 个文件被更改,包括 13 次插入6 次删除
  1. 1
    1
      models/channel/channel.go
  2. 2
    2
      models/customerremark/customerremark.go
  3. 3
    3
      models/flashbuy/flashbuy.go
  4. 7
    0
      models/system/user.go

+ 1
- 1
models/channel/channel.go 查看文件

46
 	from ta_channel a 
46
 	from ta_channel a 
47
 	inner join sys_case b on a.case_id = b.case_id 
47
 	inner join sys_case b on a.case_id = b.case_id 
48
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
48
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
49
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
49
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
50
 	err := m.db.Sql(sql).Find(&channels)
50
 	err := m.db.Sql(sql).Find(&channels)
51
 	return channels, err
51
 	return channels, err
52
 }
52
 }

+ 2
- 2
models/customerremark/customerremark.go 查看文件

47
 WHERE
47
 WHERE
48
 	a.sales_id = '` + salesId + `'
48
 	a.sales_id = '` + salesId + `'
49
 	and a.customer_id = '` + customerId + `'
49
 	and a.customer_id = '` + customerId + `'
50
-	order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
50
+	order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
51
 	err := m.db.Sql(sql).Find(&remark)
51
 	err := m.db.Sql(sql).Find(&remark)
52
 	return remark, err
52
 	return remark, err
53
 }
53
 }
107
 	ta_customer_coupon
107
 	ta_customer_coupon
108
 	Where customer_id = '` + customerId + `'
108
 	Where customer_id = '` + customerId + `'
109
 	and sales_id = '` + salesId + `'
109
 	and sales_id = '` + salesId + `'
110
-	order by receive_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
110
+	order by receive_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
111
 	err := m.db.Sql(sql).Find(&customerReceive)
111
 	err := m.db.Sql(sql).Find(&customerReceive)
112
 	return customerReceive, err
112
 	return customerReceive, err
113
 
113
 

+ 3
- 3
models/flashbuy/flashbuy.go 查看文件

63
 	if flashBuyStatus != "" {
63
 	if flashBuyStatus != "" {
64
 		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
64
 		sql += ` and a.flash_buy_status ='` + flashBuyStatus + `'`
65
 	}
65
 	}
66
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
66
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
67
 	err := m.db.Sql(sql).Find(&flashBuy)
67
 	err := m.db.Sql(sql).Find(&flashBuy)
68
 	return flashBuy, err
68
 	return flashBuy, err
69
 }
69
 }
171
 	if phone != "" {
171
 	if phone != "" {
172
 		sql += ` and b.phone like '%` + phone + `%'`
172
 		sql += ` and b.phone like '%` + phone + `%'`
173
 	}
173
 	}
174
-	sql += ` order by a.create_date desc  limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
174
+	sql += ` order by a.create_date desc  limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
175
 	err := m.db.Sql(sql).Find(&customerFlashBuy)
175
 	err := m.db.Sql(sql).Find(&customerFlashBuy)
176
 	return customerFlashBuy, err
176
 	return customerFlashBuy, err
177
 
177
 
227
 	 inner join ta_flash_buy b 
227
 	 inner join ta_flash_buy b 
228
 	 on a.flash_buy_id = b.flash_buy_id
228
 	 on a.flash_buy_id = b.flash_buy_id
229
 	 where a.customer_id = '` + customerId + `'`
229
 	 where a.customer_id = '` + customerId + `'`
230
-	sql += ` order by a.validate_start desc  limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
230
+	sql += ` order by a.validate_start desc  limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
231
 	err := m.db.Sql(sql).Find(&customerResult)
231
 	err := m.db.Sql(sql).Find(&customerResult)
232
 	return customerResult, err
232
 	return customerResult, err
233
 
233
 

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

179
 func (m *UserDAO) GenerateRecommendCode() string {
179
 func (m *UserDAO) GenerateRecommendCode() string {
180
 	var temp1 int = rand.Intn(9) * 87
180
 	var temp1 int = rand.Intn(9) * 87
181
 	var temp2 int = rand.Intn(9)
181
 	var temp2 int = rand.Intn(9)
182
+	var temp3 int = rand.Intn(9) * 7
182
 	var code string = strconv.Itoa(temp1) + strconv.Itoa(temp2)
183
 	var code string = strconv.Itoa(temp1) + strconv.Itoa(temp2)
184
+	if len(code) < 4 {
185
+		code += strconv.Itoa(temp3)
186
+	}
187
+	if len(code) > 4 {
188
+		code = code[0:4]
189
+	}
183
 	return code
190
 	return code
184
 }
191
 }
185
 func (m *UserDAO) IsCodeExist(code string) (int, error) {
192
 func (m *UserDAO) IsCodeExist(code string) (int, error) {