bug修改

models/luckdraw/luckdraw.go

@@ -514,7 +514,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 		prize, err = m.GetWinning(prizes)
 		if err != nil {
 			utils.LogError("获取奖项失败:", err)
-			return nil, nil, nil, errors.New("获取奖项失败！")
+			return nil, nil, nil, err
 		}
 	}
 

service/card/card.go

@@ -72,7 +72,7 @@ func (s *CardServ) GetCardList(caseID, sendtype, usetype string, pagenavi ...int
 		if usetype != "" {
 			switch usetype {
 			case models.COUPONCARD_USETYPE_LUCKDRAW:
-				filters = append(filters, "card_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCard+"') and used_count=0")
+				filters = append(filters, "card_id not in (select (case when resource_id is null then '' else resource_id end) from sys_activity_action where active_type='"+models.ActGiveCard+"') and used_count=0")
 				break
 			case models.COUPONCARD_USETYPE_SYS:
 				filters = append(filters, "card_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_CARD+"') and used_count=0")

service/coupon/coupon.go

@@ -67,7 +67,7 @@ func (s *CouponServ) GetCouponList(caseID, sendtype, usetype string, pagenavi ..
 		if usetype != "" {
 			switch usetype {
 			case models.COUPONCARD_USETYPE_LUCKDRAW:
-				filters = append(filters, "coupon_id not in (select resource_id from sys_activity_action where active_type='"+models.ActGiveCoupon+"') and used_count=0")
+				filters = append(filters, "coupon_id not in (select (case when resource_id is null then '' else resource_id end) from sys_activity_action where active_type='"+models.ActGiveCoupon+"') and used_count=0")
 				break
 			case models.COUPONCARD_USETYPE_SYS:
 				filters = append(filters, "coupon_id not in (select coupon_card_id from ta_luckdraw_record where coupon_card_type='"+models.PRIZE_TYPE_COUPON+"') and used_count=0")

service/customer/customer.go

@@ -181,88 +181,85 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, recom
 		utils.LogError(err.Error())
 		return nil, err
 	}
+	if cust != nil {
+		return nil, errors.New("当前手机号已被绑定或者注册")
+	}
 
 	// 用户不存在, 则新增
-	if cust == nil {
-		wxInfo := utils.WechatUser{}
-		if err := json.Unmarshal([]byte(userMap.AccountInfo), &wxInfo); err != nil {
-			utils.LogError("解析用户微信映射信息失败: " + err.Error())
-			return nil, errors.New("系统数据异常")
-		}
+	wxInfo := utils.WechatUser{}
+	if err := json.Unmarshal([]byte(userMap.AccountInfo), &wxInfo); err != nil {
+		utils.LogError("解析用户微信映射信息失败: " + err.Error())
+		return nil, errors.New("系统数据异常")
+	}
 
-		// 更新用户手机号码信息及userid信息
-		customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
-		newCust := model.TaCustomer{
-			CustomerId:  customer.CustomerId,
-			Phone:       phone,
-			BindingDate: time.Now(),
-		}
-		// 校验案场信息
-		if recommendCode != "" {
-			user, err := s.dao.GetSalesByRecommendCode(recommendCode)
-			if err != nil {
-				utils.LogError(err.Error())
-				return nil, err
-			}
-			userCase, err := s.dao.GetSalesCaseById(user.UserId)
-			cs, err := s.casedao.GetCaseByID(userCase.CaseId)
-			if err != nil {
-				utils.LogError(err.Error())
-				return nil, err
-			}
-
-			if cs == nil || cs.Status == models.STATUS_DEL {
-				return nil, errors.New("系统无该推荐案场")
-			}
-
-			newCust.OrgId = cs.OrgId
-			newCust.RecommendCase = cs.CaseId
-
-			if user == nil || user.Status == models.STATUS_DEL {
-				return nil, errors.New("系统无该推荐人")
-			}
-
-			newCust.OrgId = user.OrgId
-			newCust.RecommendId = user.UserId
-			newCust.RecommendName = user.RealName
+	// 更新用户手机号码信息及userid信息
+	customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
+	newCust := model.TaCustomer{
+		CustomerId:  customer.CustomerId,
+		Phone:       phone,
+		BindingDate: time.Now(),
+	}
+	// 校验案场信息
+	if recommendCode != "" {
+		user, err := s.dao.GetSalesByRecommendCode(recommendCode)
+		if err != nil {
+			utils.LogError(err.Error())
+			return nil, err
 		}
-
-		// 校验推荐人
-		// if userID != "" {
-		// 	ar, err := s.dao.GetUserByID(userID)
-		// 	if err != nil {
-		// 		utils.LogError(err.Error())
-		// 		return nil, err
-		// 	}
-
-		// 	if ar == nil || ar.Status == models.STATUS_DEL {
-		// 		return nil, errors.New("系统无该推荐人")
-		// 	}
-
-		// 	newCust.OrgId = ar.OrgId
-		// 	newCust.RecommendId = ar.UserId
-		// 	newCust.RecommendName = ar.RealName
-		// }
-
-		err = s.dao.UpdateCustomer(&newCust, []string{
-			"phone",
-			"recommend_id",
-			"recommend_case",
-			"recommend_name",
-			"binding_date",
-		})
+		userCase, err := s.dao.GetSalesCaseById(user.UserId)
+		cs, err := s.casedao.GetCaseByID(userCase.CaseId)
 		if err != nil {
 			utils.LogError(err.Error())
 			return nil, err
 		}
 
-		cust = &newCust
-	} else {
-		if cust.Status != models.STATUS_NORMAL {
-			return nil, errors.New("用户状态不正确")
+		if cs == nil || cs.Status == models.STATUS_DEL {
+			return nil, errors.New("系统无该推荐案场")
+		}
+
+		newCust.OrgId = cs.OrgId
+		newCust.RecommendCase = cs.CaseId
+
+		if user == nil || user.Status == models.STATUS_DEL {
+			return nil, errors.New("系统无该推荐人")
 		}
+
+		newCust.OrgId = user.OrgId
+		newCust.RecommendId = user.UserId
+		newCust.RecommendName = user.RealName
 	}
 
+	// 校验推荐人
+	// if userID != "" {
+	// 	ar, err := s.dao.GetUserByID(userID)
+	// 	if err != nil {
+	// 		utils.LogError(err.Error())
+	// 		return nil, err
+	// 	}
+
+	// 	if ar == nil || ar.Status == models.STATUS_DEL {
+	// 		return nil, errors.New("系统无该推荐人")
+	// 	}
+
+	// 	newCust.OrgId = ar.OrgId
+	// 	newCust.RecommendId = ar.UserId
+	// 	newCust.RecommendName = ar.RealName
+	// }
+
+	err = s.dao.UpdateCustomer(&newCust, []string{
+		"phone",
+		"recommend_id",
+		"recommend_case",
+		"recommend_name",
+		"binding_date",
+	})
+	if err != nil {
+		utils.LogError(err.Error())
+		return nil, err
+	}
+
+	cust = &newCust
+
 	// triggerRegiteEvent 触发注册事件
 	if cust.RecommendCase != "" {
 		evtEngID := utils.EngineIDBy(cust.OrgId, cust.RecommendCase)