merge & bug fix

models/card/card.go

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

models/customer/customer.go

@@ -8,8 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego"
-
 	"github.com/yl10/kit/guid"
 
 	"github.com/go-xorm/xorm"
@@ -88,7 +86,6 @@ func (m *CustomerDAO) CustWithWXList(phone, username, recommendname, begindate,
 	query = query + ` ORDER BY
 			t.create_date DESC
 	`
-	beego.Error(query)
 	var cust []CustWithWX
 
 	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&cust, query, []int{pageNum, offset}, models.STATUS_DEL)

models/luckdraw/luckdraw.go

@@ -296,7 +296,7 @@ func (m *LuckDrawDao) SaveRecord(record model.TaLuckdrawRecord) (*model.TaLuckdr
 // GetUserByTel 根据电话获取用户信息
 func (m *LuckDrawDao) GetUserByTel(tel string) (*model.SysUser, error) {
 	var user = model.SysUser{}
-	_, err := m.db.Where("phone=?", tel).Get(&user)
+	_, err := m.db.Where("phone=?", tel).And("status>?", models.STATUS_DEL).Get(&user)
 	return &user, err
 }
 

models/system/user.go

@@ -501,7 +501,7 @@ func (m *UserDAO) CheckUserPhone(userid, phone, orgid string) (bool, error) {
 // CheckUserName 用户账户名重复校验
 func (m *UserDAO) CheckUserName(userid, username, orgid string) (bool, error) {
 	var users []model.SysUser
-	dao := m.db.Where("user_name=?", username).And("org_id=?", orgid)
+	dao := m.db.Where("user_name=?", username).And("org_id=?", orgid).And("status>?", models.STATUS_DEL)
 	if userid != "" {
 		dao.And("user_id <> '" + userid + "'")
 	}

models/verify/verify.go

@@ -148,6 +148,7 @@ func (m *VerifyDAO) UpdateCustomerCard(customerCard *model.TaCustomerCard) error
 	var cols = []string{
 		"verify_date",
 		"verify_status",
+		"status",
 	}
 	_, err := m.db.Cols(cols...).Where("customer_card_id=?", customerCard.CustomerCardId).Update(customerCard)
 	return err

service/bodycheck/bodycheck.go

@@ -38,7 +38,8 @@ func (s *BodyCheckServ) GetCheckByUser() (map[string]interface{}, error) {
 		return nil, err
 	}
 	if len(bodyCheck) == 0 {
-		return nil, errors.New("没有查询到数据")
+		utils.LogError("没有查询到数据:" + err.Error())
+		return nil, errors.New("log-error-没有查询到数据")
 	}
 	presentations, err := s.dao.GetPresentationByCheckID(bodyCheck[0].Id)
 	if err != nil {
@@ -90,6 +91,9 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 	if customer == nil || customer.CustomerId == "" {
 		return errors.New("没有当前用户信息！")
 	}
+	beego.Error("—————————————————————————用户——————————————————————————")
+	beego.Error(customer)
+	beego.Error("+++++++++++++++++++++++++++++++++++++++++++++++++++++++")
 	userid := customer.CustomerId
 	checkinfo, err := s.dao.GetCheckByUserAndEquipmentID(userid, result.EquipmentId)
 	if err != nil {
@@ -106,6 +110,9 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		if caseEquipment == nil || caseEquipment.EquipmentId == "" {
 			return errors.New("设备未维护！")
 		}
+		beego.Error("___________________设备——————————————————————————")
+		beego.Error(caseEquipment)
+		beego.Error("________________________________________________")
 
 		var checkNew = model.TaBodyCheck{}
 		checkNew.CaseId = caseEquipment.CaseId
@@ -113,12 +120,20 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		checkNew.UserId = userid
 		checkNew.ReportUrl = result.HMSReportUrl
 		checkNew.CreateDate = result.CheckDate
+		beego.Error("______checkNew___________________")
+		beego.Error(checkNew)
+		beego.Error("+++++++++++++++++++++++++++++++++")
 		checkinfo, err = s.dao.SaveBodyCheckInfo(checkNew)
-
+		beego.Error("____________checkInfo____________")
+		beego.Error(checkinfo)
+		beego.Error("__________________________________")
 		wxconf, _ := config.NewConfig("ini", "conf/wechat.conf")
 		messageTplID := wxconf.String("messageTplID")
 
 		org := s.ctx.Get("org").(model.SysOrg)
+		beego.Error("***************ORG******************")
+		beego.Error(org)
+		beego.Error("************************************")
 
 		utils.WxClientFor(org.OrgId).SendTplMessage(result.WechatAccount, messageTplID, beego.AppConfig.String("resultURL"), map[string]wx.TplMessageData{
 			"first": wx.TplMessageData{
@@ -141,7 +156,10 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		utils.LogError("获取报告明细失败：", err)
 		return errors.New("获取报告明细失败")
 	}
-	if presentation == nil || presentation.Id != "" {
+	beego.Error("________________presentation___________")
+	beego.Error(presentation)
+	beego.Error("_______________________________________")
+	if presentation == nil || presentation.Id == "" {
 		// 新增
 		var preNew = model.TaPresentation{}
 		preNew.CheckId = checkinfo.Id
@@ -177,6 +195,9 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		utils.LogError("获取spec信息失败：", err)
 		return errors.New("获取spec信息失败")
 	}
+	beego.Error("_________checkSpec___________")
+	beego.Error(specs)
+	beego.Error("____________________________")
 
 	if len(formVal) > 0 {
 		var details []model.TaPresentationDetail

service/card/card.go

@@ -148,7 +148,7 @@ func (s *CardServ) UpdateCard(cd *card.CardInfo) error {
 
 	// 更新主信息
 	cardMain := cd.TaCouponCard
-	if err := s.dao.UpdateCard(&cardMain, []string{"card_name", "video_url"}); err != nil {
+	if err := s.dao.UpdateCard(&cardMain, []string{"card_name", "video_url", "cover_url"}); err != nil {
 		utils.LogError("更新卡失败: " + err.Error())
 		return errors.New("更新卡失败")
 	}

service/coupon/coupon.go

@@ -150,7 +150,7 @@ func (s *CouponServ) UpdateCoupon(cp *coupon.CouponInfo) error {
 
 	// 更新主信息
 	cpMain := cp.TaCoupon
-	if err := s.dao.UpdateCoupon(&cpMain, []string{"coupon_name", "cover_url"}); err != nil {
+	if err := s.dao.UpdateCoupon(&cpMain, []string{"coupon_name", "cover_url", "video_url"}); err != nil {
 		utils.LogError("更新优惠券失败: " + err.Error())
 		return errors.New("更新优惠券失败")
 	}

service/goods/orders.go

@@ -21,6 +21,7 @@ func (s *GoodsServ) Orders(
 	info *model.TaGoodsOrders,
 	details []model.TaGoodsOrdersDetail,
 	customercouponid string) error {
+
 	// org := s.ctx.Get("org").(model.SysOrg)
 	cust := s.ctx.Get("customer").(model.TaCustomer)
 
@@ -194,6 +195,8 @@ func (s *GoodsServ) Orders(
 	// }
 	newOrder, err := s.GetNewGoods(info.OrdersId)
 	if err != nil {
+		// 下单流程已经结束, 不反馈错误
+		utils.LogError("获取数据失败：", err.Error())
 		return nil
 	}
 
@@ -206,6 +209,8 @@ func (s *GoodsServ) Orders(
 		},
 	}
 
+	utils.LogError("调用下单 Websocket ")
+
 	utils.SendMessage(msg, utils.WsMessage)
 
 	return nil

service/user.go

@@ -170,6 +170,9 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 	userInfo.Phone = user.Phone
 	userInfo.Headimgurl = user.Headimgurl
 
+	org := s.ctx.Get("org").(model.SysOrg)
+	user.OrgId = org.OrgId
+	userInfo.OrgId = user.OrgId
 	var err error
 	var newUSer *model.SysUser
 

service/verify/verify.go

@@ -139,6 +139,7 @@ func (s *VerifyServ) UpdateCustomerCourseDetail(customerDetail *model.TaCustomer
 func (s *VerifyServ) UpdateCustomerCard(customerCard *model.TaCustomerCard) error {
 	var err error
 	customerCard.VerifyDate = time.Now()
+	customerCard.Status = models.STATUS_USED
 	err = s.dao.UpdateCustomerCard(customerCard)
 	if err != nil {
 		utils.LogError("更新记录失败: " + err.Error())