bug修改

log/common.log

@@ -328,3 +328,32 @@ SELECT
 2018/09/20 19:53:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
 2018/09/20 19:53:30 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
 2018/09/20 19:53:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:58:19 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:58:20 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:58:20 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 19:58:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:42 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:47 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:47 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:48 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:04:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:05:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:05:05 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:06:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:06:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:06:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:06:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:06:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:06:19 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:19 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:19 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 20:09:29 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36

models/card/card.go

@@ -161,6 +161,7 @@ func (m *CardDAO) SaveCustomerCard(card *model.TaCustomerCard) error {
 	}
 
 	card.Status = models.STATUS_NORMAL
+	card.ReceiveDate = time.Now().Local()
 
 	if _, err := m.db.Insert(card); err != nil {
 		return err
@@ -177,6 +178,7 @@ func (m *CardDAO) SaveCustomerCards(cards []model.TaCustomerCard) error {
 		}
 
 		cards[i].Status = models.STATUS_USED
+		cards[i].ReceiveDate = time.Now()
 	}
 
 	if _, err := m.db.Insert(cards); err != nil {

models/coupon/coupon.go

@@ -209,6 +209,7 @@ func (m *CouponDAO) SaveCustomerCoupon(cp *model.TaCustomerCoupon) error {
 	}
 
 	cp.Status = models.STATUS_NORMAL
+	cp.ReceiveDate = time.Now().Local()
 
 	if _, err := m.db.Insert(cp); err != nil {
 		return err
@@ -225,6 +226,7 @@ func (m *CouponDAO) SaveCustomerCoupons(cps []model.TaCustomerCoupon) error {
 		}
 
 		cps[i].Status = models.STATUS_NORMAL
+		cps[i].ReceiveDate = time.Now().Local()
 	}
 
 	if _, err := m.db.Insert(cps); err != nil {

models/system/user.go

@@ -342,14 +342,15 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 // GetUserCustomer 获取我的推荐客户
 func (m *UserDAO) GetUserCustomer(userid, isrecommend, key string, page int, pageSize int) ([]model.TaCustomer, error) {
 	var customers []model.TaCustomer
-	sql := `select * from ta_customer where recommend_id='` + userid + `'`
+	sql := `select * from ta_customer where (recommend_id='` + userid + `'`
 	if isrecommend == "" || isrecommend == "false" {
-		sql += ` and customer_id in (
+		sql += ` or customer_id in (
 			select customer_id from ta_customer_coupon where sales_id='` + userid + `'
 			union 
 			select customer_id from ta_customer_card where sales_id='` + userid + `'
 		)`
 	}
+	sql += ")"
 	if key != "" {
 		sql += ` and (customer_name like '%` + key + `%' or phone like '%` + key + `%' or name like '%` + key + `%')`
 	}