Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

conf/app.conf

@@ -12,7 +12,6 @@ qrcodePrefix = bodycheck_
 followText = 您正在使用悦琦设备进行体检~
 resultURL = http://spaceofcheng.ycjcjy.com/wechat/bodyCheck.html
 
-clientShareURL = http://spaceofcheng.ycjcjy.com/wechat/user.html
 defaultShareUserID = 1
 
 [cros]

models/coupon/coupon.go

@@ -313,7 +313,7 @@ func (m *CouponDAO) GetCouponBySendType(caseids, sendtype string) ([]model.TaCou
 // GetCaseUsableCoupon 获取案场可用优惠券信息
 func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseCouponDetail, error) {
 	var Coupons []CaseCouponDetail
-	sql := `select * from ta_coupon where case_id=? and status=? and DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=? order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql := `select * from ta_coupon where case_id=? and status=? and (DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') or valid_days>0) and send_type=? order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 	for inx, coupon := range Coupons {
 		if userid != "" {
@@ -342,7 +342,7 @@ func (m *CouponDAO) GetCouponShareByCouponID(couponid string) (*model.TaCouponSh
 // GetCaseUsableCouponCount 获取案场可用优惠券数量
 func (m *CouponDAO) GetCaseUsableCouponCount(caseid, userid string) (int, error) {
 	var Coupons []CaseCouponDetail
-	sql := `select * from ta_coupon where case_id=? and status=? and DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') and send_type=?`
+	sql := `select * from ta_coupon where case_id=? and status=? and (DATE_FORMAT(end_date, '%Y-%m-%d')>=DATE_FORMAT(NOW(), '%Y-%m-%d') or valid_days>0) and send_type=?`
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 
 	return len(Coupons), err

models/luckdraw/luckdraw.go

@@ -318,7 +318,7 @@ func (m *LuckDrawDao) SavePrizeDetail(prize model.TaLuckdrawPrize) error {
 			var d = model.TaPrizeDetail{
 				Id:      utils.GetGUID(),
 				PrizeId: prize.Id,
-				Url:     beego.AppConfig.String("clientShareURL") + url,
+				Url:     url,
 				Status:  models.STATUS_NORMAL,
 			}
 			details = append(details, d)
@@ -431,7 +431,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 			if err != nil {
 				return nil, nil, nil, errors.New("获取信息失败！")
 			}
-			if sysuser != nil {
+			if sysuser != nil && sysuser.UserId != "" {
 				return nil, nil, nil, errors.New("内部人员不允许进行抽奖！")
 			}
 		}
@@ -618,8 +618,8 @@ type PrizeWithDefault struct {
 // GetPrizeDefaultByUser 获取默认用户
 func (m *LuckDrawDao) GetPrizeDefaultByUser(id string, customer *model.TaCustomer) (*PrizeWithDefault, error) {
 	var prize = PrizeWithDefault{}
-	sql := `select a.default_id,b.* from ta_prize_default a inner join ta_prize_default b on a.prize_id=b.id where a.luckdraw_id=? and a.tel=? and is_receive=?`
-	_, err := m.db.Sql(sql, id, customer.Phone, models.BOOL_FALSE).Get(prize)
+	sql := `select a.default_id,b.* from ta_prize_default a inner join ta_luckdraw_prize b on a.prize_id=b.id where a.luckdraw_id=? and a.tel=? and a.is_receive=?`
+	_, err := m.db.Sql(sql, id, customer.Phone, models.BOOL_FALSE).Get(&prize)
 	return &prize, err
 }
 
@@ -636,7 +636,7 @@ func (m *LuckDrawDao) UpdatePrizeDefault(id, recordid string) error {
 		"receive_date",
 		"is_receive",
 	}
-	_, err := m.db.Cols(cols...).Where("id=?", prizeDefault.DefaultId).Update(prizeDefault)
+	_, err := m.db.Cols(cols...).Where("default_id=?", prizeDefault.DefaultId).Update(prizeDefault)
 	return err
 }
 
@@ -797,7 +797,7 @@ func (m *LuckDrawDao) GetPrizeStock(luckdrawid string) ([]model.TaLuckdrawPrize,
 	a.* from ta_luckdraw_prize a 
 	left join (select prize_id,count(1) as default_num from ta_prize_default where luckdraw_id) b 
 	on a.id=b.prize_id where a.luckdraw_id=? and a.status=? and (a.remainder-(case when b.default_num is null then 0 else b.default_num end)>0 or is_reality=0)`
-	err := m.db.Sql(sql).Find(&prizes)
+	err := m.db.Sql(sql, luckdrawid, models.STATUS_NORMAL).Find(&prizes)
 	// err := m.db.Where("luckdraw_id=?", luckdrawid).And("status=?", models.STATUS_NORMAL).And("(remainder>0 or is_reality=0)").Find(&prizes)
 	return prizes, err
 }
@@ -876,7 +876,7 @@ func (m *LuckDrawDao) GetUserRecordByLuckDraw(userid string, luckdrawid string)
 // GetUserLuckDrawSet 获取用户抽奖设置
 func (m *LuckDrawDao) GetUserLuckDrawSet(customer model.TaCustomer, luckdrawid string) (*model.TaLuckdrawCustomer, error) {
 	var cstluckdraw = model.TaLuckdrawCustomer{}
-	_, err := m.db.Where("customer_id=?").And("luckdraw_id=?", luckdrawid).Get(&cstluckdraw)
+	_, err := m.db.Where("customer_id=?", customer.CustomerId).And("luckdraw_id=?", luckdrawid).Get(&cstluckdraw)
 	if err != nil {
 		return nil, err
 	}