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

conf/db.conf

@@ -5,9 +5,9 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-; db_addr      = 47.101.36.130
+db_addr      = 47.101.36.130
 # db_addr        = 192.168.0.122
-db_addr = localhost
+; db_addr = localhost
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
 
 ; 端口

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

models/card/card.go

@@ -481,7 +481,7 @@ func (m *CardDAO) GetCustomerCardByCustomerAndSaleCount(customerid, saleid strin
 // GetCustomerCardByCustomerAndSale 获取用户的领取记录
 func (m *CardDAO) GetCustomerCardByCustomerAndSale(customerid, saleid string, page, pageSize int) ([]model.TaCustomerCard, error) {
 	var customerCard []model.TaCustomerCard
-	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).Desc("status").Limit(pageSize, (page-1)*pageSize).Find(&customerCard)
+	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).OrderBy("status asc,receive_date desc").Limit(pageSize, (page-1)*pageSize).Find(&customerCard)
 	return customerCard, err
 }
 

models/coupon/coupon.go

@@ -542,7 +542,7 @@ func (m *CouponDAO) GetCustomerCouponByCustomerAndSaleCount(customerid, saleid s
 // GetCustomerCouponByCustomerAndSale 获取用户的领取记录
 func (m *CouponDAO) GetCustomerCouponByCustomerAndSale(customerid, saleid string, page, pageSize int) ([]model.TaCustomerCoupon, error) {
 	var customerCoupon []model.TaCustomerCoupon
-	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).Desc("status").Limit(pageSize, (page-1)*pageSize).Find(&customerCoupon)
+	err := m.db.Where("customer_id=?", customerid).And("sales_id=?", saleid).OrderBy("status asc,receive_date desc").Limit(pageSize, (page-1)*pageSize).Find(&customerCoupon)
 	return customerCoupon, err
 }
 

models/flashbuy/flashbuy.go

@@ -272,6 +272,10 @@ func (m *FlashbuyDAO) GetCustomerFlashBuy(id, customerid string) ([]model.TaCust
 func (m *FlashbuyDAO) UpdateFlashBuyJoin(id string) (int64, error) {
 	sql := `update ta_flash_buy set join_num = join_num + 1 where flash_buy_id=? and join_num < flash_buy_max_attendant`
 	result, err := m.db.Exec(sql, id)
+	if err != nil {
+		return 0, err
+	}
+
 	rowCount, err := result.RowsAffected()
 	return rowCount, err
 }

models/statistics/cardcoupon.go

@@ -278,8 +278,8 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 								INNER JOIN sys_case b ON a.case_id = b.case_id
 								INNER JOIN ta_customer cst ON a.customer_id = cst.customer_id
 								INNER JOIN ta_coupon cp ON a.coupon_id = cp.coupon_id
-								LEFT JOIN ta_goods_orders_coupon c ON a.coupon_id = c.coupon_id
-								LEFT JOIN ta_course_orders_coupon d ON a.coupon_id = d.coupon_id
+								LEFT JOIN ta_goods_orders_coupon c ON a.customer_coupon_id = c.customer_coupon_id
+								LEFT JOIN ta_course_orders_coupon d ON a.customer_coupon_id = d.customer_coupon_id
 								WHERE b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 
 	sql := "select * from (" + cardsql + " union " + couponsql + ") tab where (1=1)"
@@ -378,8 +378,8 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 								INNER JOIN sys_case b ON a.case_id = b.case_id
 								INNER JOIN ta_customer cst ON a.customer_id = cst.customer_id
 								INNER JOIN ta_coupon cp ON a.coupon_id = cp.coupon_id
-								LEFT JOIN ta_goods_orders_coupon c ON a.coupon_id = c.coupon_id
-								LEFT JOIN ta_course_orders_coupon d ON a.coupon_id = d.coupon_id
+								LEFT JOIN ta_goods_orders_coupon c ON a.customer_coupon_id = c.customer_coupon_id
+								LEFT JOIN ta_course_orders_coupon d ON a.customer_coupon_id = d.customer_coupon_id
 								WHERE b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 
 	sql := "select * from (" + cardsql + " union " + couponsql + ") tab where (1=1)"

models/sys.go

@@ -270,3 +270,11 @@ func GetAllCases() ([]model.SysCase, error) {
 	err := DBEngine.Where("status=?", STATUS_NORMAL).Asc("org_id").Find(&cases)
 	return cases, err
 }
+
+// GetCaseByID 获取案场
+func GetCaseByID(caseID string) (cs *model.SysCase, err error) {
+	cs = new(model.SysCase)
+
+	_, err = DBEngine.Where("case_id=?", caseID).Get(cs)
+	return
+}

service/course/order.go

@@ -175,6 +175,18 @@ func (s *CourseServ) ConfirmOrders(ordersID, customercouponid string) error {
 			utils.LogError("优惠券核销出错: " + err.Error())
 			return errors.New("优惠券核销出错")
 		}
+		// 券库存处理
+		var couponinfo = model.TaCoupon{
+			CouponId:  coupon.CouponId,
+			UsedCount: coupon.UsedCount + 1,
+		}
+		cols := []string{
+			"used_count",
+		}
+		if err := s.couponDAO.UpdateCoupon(&couponinfo, cols); err != nil {
+			utils.LogError("回填优惠券信息失败:", err)
+			return errors.New("回填优惠券信息失败！")
+		}
 	} else {
 		couseOrder.PayType = models.CONSUME_COINCHG
 		couseOrder.CouponAmount = "0.0"

service/events/events.go

@@ -42,6 +42,7 @@ func ListenAllEvent(orgID, caseID string) {
 	for evt, acts := range allEvts {
 		for _, actKey := range acts {
 			act, ok := EvtActions[actKey]
+
 			if ok {
 				evtEngine.ListenEvent(evt, act)
 			}
@@ -66,7 +67,11 @@ func getAllEvents(orgID, caseID string) (map[string][]string, error) {
 
 	res := make(map[string][]string)
 	for _, evtSetting := range evts {
-		res[evtSetting.ActivityType] = make([]string, 0)
+		tpEvts, ok := res[evtSetting.ActivityType]
+		if !ok {
+			tpEvts = make([]string, 0)
+		}
+
 		acts = make([]model.SysActivityAction, 0)
 
 		if err := db.Where("activity_id=?", evtSetting.ActivityId).Find(&acts); err != nil {
@@ -75,8 +80,13 @@ func getAllEvents(orgID, caseID string) (map[string][]string, error) {
 		}
 
 		for _, act := range acts {
-			res[evtSetting.ActivityType] = append(res[evtSetting.ActivityType], act.ActiveType)
+			// 加入 tpEvts 需要去重
+			if utils.StrSliceIndexOf(tpEvts, act.ActiveType) == -1 {
+				tpEvts = append(tpEvts, act.ActiveType)
+			}
 		}
+
+		res[evtSetting.ActivityType] = tpEvts
 	}
 
 	return res, nil

service/events/giveCard.go

@@ -18,8 +18,8 @@ var giveCard = func(e tinyevent.Event) error {
 	defer DestroyContext(ctx, false)
 
 	if e.Payload == nil {
-		utils.LogError("注册送券失败, 没有用户信息")
-		return errors.New("注册送券失败, 没有用户信息")
+		utils.LogError("注册送卡失败, 没有用户信息")
+		return errors.New("注册送卡失败, 没有用户信息")
 	}
 	cust := e.Payload.(model.TaCustomer)
 	caseID := cust.RecommendCase
@@ -67,12 +67,12 @@ var giveCard = func(e tinyevent.Event) error {
 
 			cp, err := cpServ.GetCardByID(cpID.(string))
 			if err != nil {
-				utils.LogError("获取优惠券失败: " + err.Error())
+				utils.LogError("获取体验卡失败: " + err.Error())
 				continue
 			}
 
 			if err := cpServ.GiveCardTo(&fromUser, &cust, cp); err != nil {
-				utils.LogError("送券失败: " + err.Error())
+				utils.LogError("送卡失败: " + err.Error())
 				continue
 			}
 		default:

service/events/giveCoupon.go

@@ -7,6 +7,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/coupon"
 	"spaceofcheng/services/utils"
+	"strings"
 
 	"github.com/zjxpcyc/tinyevent"
 )
@@ -61,7 +62,7 @@ var giveCoupon = func(e tinyevent.Event) error {
 		switch act.ActiveType {
 		case ActGiveCoupon:
 			res := make(map[string]interface{})
-			if err := json.Unmarshal([]byte(act.ResourceDesc), &res); err != nil {
+			if err := json.Unmarshal([]byte(strings.Replace(act.ResourceDesc, "\n", "\\n", -1)), &res); err != nil {
 				utils.LogError("解析优惠券赠送规则失败: " + err.Error())
 				continue
 			}

service/flashbuy/flashbuy.go

@@ -206,6 +206,7 @@ func (s *FlashBuyServ) GetCustomerFlashBuyId(customerFlashBuyId string) (*flashb
 // FlashBuy 抢购
 func (s *FlashBuyServ) FlashBuy(id string) error {
 	flashbuy, err := s.dao.GetFlashBuyById(id)
+	utils.LogError("-----------------抢购校验开始")
 	if err != nil {
 		utils.LogError("获取抢购活动信息失败: " + err.Error())
 		return errors.New("获取抢购活动信息失败！")
@@ -231,6 +232,7 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 	if len(buys) > 0 {
 		return errors.New("您已参与过该活动！")
 	}
+	utils.LogError("-----------------抢购------")
 	if flashbuy.JoinNum >= flashbuy.FlashBuyMaxAttendant {
 		err = s.dao.UpdateFlashBuy(flashbuy.FlashBuyId, models.FLASH_BUY_OVER)
 		if err != nil {
@@ -279,23 +281,21 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 		utils.LogError("插入中奖二维码失败: " + err.Error())
 		return errors.New("写入中奖二维码失败")
 	}
+	// ---------------推送消息
 
 	// 推送微信消息
 	userMap := s.ctx.Get("userMap").(model.TaUserMapping)
-	userCases := s.ctx.Get("cases").([]model.SysUserCase)
 	clienturl := s.ctx.Get("clienturl").(string)
 	tplID := s.ctx.Get("tplid").(string)
 
-	var caseName string
-	if userCases != nil && len(userCases) > 0 {
-		for _, cs := range userCases {
-			if cs.CaseId == recored.CaseId {
-				caseName = cs.CaseName
-				break
-			}
-		}
+	cs, err := models.GetCaseByID(recored.CaseId)
+	if err != nil {
+		utils.LogError("推送微信消息失败, 查询案场信息出错: " + err.Error())
+		// 但是不返回错误
+		return nil
 	}
 
+	caseName := cs.CaseName
 	remarkTpl := "请在%s日前, 前往%s兑换"
 
 	message := utils.Message{

service/goods/orders.go

@@ -94,7 +94,7 @@ func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) erro
 		info.Remark = remark
 	}
 
-	if info.PayType == "sales" {
+	if info.PayType == models.CONSUME_INNER {
 		// 内部人员, 可以直接购买
 		// TODO
 	} else {
@@ -189,6 +189,18 @@ func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) erro
 					utils.LogError("优惠券核销出错: " + err.Error())
 					return errors.New("优惠券核销出错")
 				}
+				// 券库存处理
+				var couponinfo = model.TaCoupon{
+					CouponId:  coupon.CouponId,
+					UsedCount: coupon.UsedCount + 1,
+				}
+				cols := []string{
+					"used_count",
+				}
+				if err := s.couponDAO.UpdateCoupon(&couponinfo, cols); err != nil {
+					utils.LogError("回填优惠券信息失败:", err)
+					return errors.New("回填优惠券信息失败！")
+				}
 			} else {
 				return errors.New("优惠券不可抵用商品")
 			}
@@ -270,7 +282,8 @@ func (s *GoodsServ) ConfirmOrder(ordersID, customercouponid, remark string) erro
 	if err := s.dao.UpdateOrders(&orders, []string{
 		"status", "is_pay", "coupon_amount", "actual_amount",
 	}); err != nil {
-		return nil
+		utils.LogError("修改订单状态失败：", err.Error())
+		return err
 	}
 
 	newOrder, err := s.GetNewGoods(info.OrdersId)

service/luckdraw/luckdraw.go

@@ -2,6 +2,7 @@ package luckdraw
 
 import (
 	"errors"
+	"fmt"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/luckdraw"
@@ -336,38 +337,36 @@ func (s *LuckdrawServ) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuc
 	}
 
 	// 推送微信消息
-	// userMap := s.ctx.Get("userMap").(model.TaUserMapping)
-	// userCases := s.ctx.Get("cases").([]model.SysUserCase)
-	// clienturl := s.ctx.Get("clienturl").(string)
-	// tplID := s.ctx.Get("tplid").(string)
-
-	// var caseName string
-	// if userCases != nil && len(userCases) > 0 {
-	// 	for _, cs := range userCases {
-	// 		if cs.CaseId == recored.CaseId {
-	// 			caseName = cs.CaseName
-	// 			break
-	// 		}
-	// 	}
-	// }
-
-	// remarkTpl := "请在%s日前, 前往%s兑换"
-
-	// message := utils.Message{
-	// 	To: utils.ClientID{ID: userMap.Openid},
-	// 	Data: map[string]interface{}{
-	// 		"orgid": recored.OrgId,
-	// 		"tplid": tplID,
-	// 		"link":  clienturl,
-	// 		"data": map[string]string{
-	// 			"first":    "抢券成功提醒",
-	// 			"keyword1": prize.PrizeName,
-	// 			"keyword2": time.Now().Local().Format("2006-01-02"),
-	// 			"remark":   fmt.Sprintf(remarkTpl, recored.VerificationEnd.Format("2006-01-02"), caseName),
-	// 		},
-	// 	},
-	// }
-	// go utils.SendWechat(message)
+	userMap := s.ctx.Get("userMap").(model.TaUserMapping)
+	clienturl := s.ctx.Get("clienturl").(string)
+	tplID := s.ctx.Get("tplid").(string)
+
+	cs, err := models.GetCaseByID(recored.CaseId)
+	if err != nil {
+		utils.LogError("推送微信消息失败, 查询案场信息出错: " + err.Error())
+		// 但是不返回错误
+		return nil, nil, nil
+	}
+
+	caseName := cs.CaseName
+	remarkTpl := "请在%s日前, 前往%s兑换"
+
+	message := utils.Message{
+		To: utils.ClientID{ID: userMap.Openid},
+		Data: map[string]interface{}{
+			"orgid": recored.OrgId,
+			"tplid": tplID,
+			"link":  clienturl,
+			"data": map[string]string{
+				"first":    "中奖成功提醒",
+				"keyword1": prize.PrizeName,
+				"keyword2": time.Now().Local().Format("2006-01-02"),
+				"remark":   fmt.Sprintf(remarkTpl, recored.VerificationEnd.Format("2006-01-02"), caseName),
+			},
+		},
+	}
+
+	go utils.SendWechat(message)
 
 	return prize, prizeDetail, nil
 }

service/marketing/marketing.go

@@ -12,6 +12,7 @@ import (
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/service/events"
 	"spaceofcheng/services/utils"
+	"strings"
 
 	"github.com/astaxie/beego"
 )
@@ -70,7 +71,7 @@ func (s *MarketingServ) GetMarketingList(caseids string, page int, pageSize int)
  */
 func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
 	res := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(resourceDesc), &res); err != nil {
+	if err := json.Unmarshal([]byte(strings.Replace(resourceDesc, "\n", "\\n", -1)), &res); err != nil {
 		utils.LogError("校验活动数据失败: " + err.Error())
 		return nil, nil, errors.New("校验活动数据失败")
 	}

service/sys.go

@@ -182,7 +182,6 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 
 		// 获取 token
 		token, err := s.getToken(gctx)
-		utils.LogError("token:", token)
 		if err != nil {
 			tokenStr := s.ctx.Get("token").(string)
 			if tokenStr != "" {