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

bootstrap/bootstrap.go

@@ -0,0 +1,25 @@
+package bootstrap
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/service/events"
+	"spaceofcheng/services/utils"
+)
+
+// SystemInit 系统初始化
+func SystemInit() {
+	// 数据库连接
+	models.InitDB()
+
+	// 系统日志
+	utils.LogInit()
+
+	// 微信系统
+	utils.WechatInit()
+
+	// 消息系统
+	utils.MessageInit()
+
+	// 事件系统
+	events.EventInit()
+}

controllers/base.go

@@ -97,27 +97,6 @@ func (c *BaseController) ResponseData(data interface{}, msg interface{}, code in
 	c.StopRun()
 }
 
-// Options 解决跨域先发送 options
-func (c *BaseController) Options() {
-	c.ResponseJSON("")
-}
-
-// crosPolicy 跨域策略
-func (c *BaseController) crosPolicy() {
-	runMode := beego.AppConfig.String("runmode")
-	allowMode := beego.AppConfig.String("cros::allowMode")
-	allowMethods := beego.AppConfig.String("cros::allowMethods")
-	allowOrigin := beego.AppConfig.String("cros::allowOrigin")
-	allowCredentials := beego.AppConfig.String("cros::allowCredentials")
-
-	if runMode == allowMode {
-		c.Ctx.Output.Header("Access-Control-Allow-Origin", allowOrigin)
-		c.Ctx.Output.Header("Access-Control-Allow-Methods", allowMethods)
-		c.Ctx.Output.Header("Access-Control-Allow-Credentials", allowCredentials)
-		c.Ctx.Output.Header("Access-Control-Allow-Headers", "X-Token,Authorization")
-	}
-}
-
 // initAppController 执行当前路由请求对应的 Controller 初始化
 func (c *BaseController) initController() {
 	if ctrl, ok := c.AppController.(ControllerInterface); ok {

controllers/bodycheck/bodycheck.go

@@ -14,9 +14,9 @@ import (
 
 // 二维码不多次获取, 只获取一次即可
 // 临时的解决方案是放到全局单例对象中
-var qrCodes map[string]string
+var qrCodes = make(map[string]string)
 
-var mtx *sync.Mutex
+var mtx = new(sync.Mutex)
 
 // BodyCheckController 商品
 type BodyCheckController struct {
@@ -105,8 +105,3 @@ func (c *BodyCheckController) PostCheckResult() {
 		"Message": "",
 	})
 }
-
-func init() {
-	qrCodes = make(map[string]string)
-	mtx = new(sync.Mutex)
-}

controllers/config.go

@@ -3,44 +3,42 @@ package controllers
 import (
 	"spaceofcheng/services/utils"
 
-	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/config"
 )
 
 // 配置文件列表
 const (
+	AppConf    = "app"
 	AliYunConf = "aliyun"
 	WeChatConf = "wechat"
 	SMSConf    = "sms"
 )
 
 func (c *BaseController) initConfig() {
-	c.RunMode = beego.AppConfig.String("runmode")
+	// c.RunMode = beego.AppConfig.String("runmode")
 
 	if c.Configer == nil {
 		c.Configer = make(map[string]config.Configer)
 	}
 
+	// 系统
+	appConf, _ := utils.GetConfiger("conf/app.conf")
+	if appConf != nil {
+		c.Configer[AppConf] = appConf
+	}
+
+	c.RunMode = appConf.String("runmode")
+
 	// 阿里云
-	aliConf := c.getConfig("conf/aliyun.conf")
+	aliConf, _ := utils.GetConfiger("conf/aliyun.conf")
 	if aliConf != nil {
 		c.Configer[AliYunConf] = aliConf
 	}
 
 	// 短信
-	smsConf := c.getConfig("conf/sms.conf")
+	smsConf, _ := utils.GetConfiger("conf/sms.conf")
 	if smsConf != nil {
 		c.Configer[SMSConf] = smsConf
 	}
 	utils.ResetSMSEngine(smsConf)
 }
-
-func (c *BaseController) getConfig(confPath string) config.Configer {
-	aliConf, err := config.NewConfig("ini", confPath)
-	if err != nil {
-		utils.LogError("读取配置文件失败: " + err.Error())
-		return nil
-	}
-
-	return aliConf
-}

controllers/cros.go

@@ -0,0 +1,25 @@
+package controllers
+
+// Options 解决跨域先发送 options
+func (c *BaseController) Options() {
+	c.ResponseJSON("")
+}
+
+// crosPolicy 跨域策略
+func (c *BaseController) crosPolicy() {
+	appConf, ok := c.Configer[AppConf]
+	if ok {
+		runMode := appConf.String("runmode")
+		allowMode := appConf.String("cros::allowMode")
+		allowMethods := appConf.String("cros::allowMethods")
+		allowOrigin := appConf.String("cros::allowOrigin")
+		allowCredentials := appConf.String("cros::allowCredentials")
+
+		if runMode == allowMode {
+			c.Ctx.Output.Header("Access-Control-Allow-Origin", allowOrigin)
+			c.Ctx.Output.Header("Access-Control-Allow-Methods", allowMethods)
+			c.Ctx.Output.Header("Access-Control-Allow-Credentials", allowCredentials)
+			c.Ctx.Output.Header("Access-Control-Allow-Headers", "X-Token,Authorization")
+		}
+	}
+}

controllers/goods/order.go

@@ -12,7 +12,7 @@ import (
 	"time"
 )
 
-var mtx *sync.Mutex
+var mtx = new(sync.Mutex)
 
 // GetOrderList 获取商品订单
 // 管理端 - 统计查询
@@ -140,7 +140,7 @@ func (c *GoodsController) PostOrder() {
 		)
 	}
 
-	if err := c.serv.Orders(&orderInfo, orderDetail, customercouponid, innerUser); err != nil {
+	if err := c.serv.PreOrders(&orderInfo, orderDetail, customercouponid, innerUser); err != nil {
 		c.ResponseError(err)
 	}
 
@@ -298,7 +298,3 @@ func (c *GoodsController) UpdateOrdersIntimidate() {
 	}
 	c.ResponseJSON("操作成功！")
 }
-
-func init() {
-	mtx = new(sync.Mutex)
-}

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"spaceofcheng/services/bootstrap"
 	_ "spaceofcheng/services/routers"
 
 	"github.com/astaxie/beego"
@@ -11,5 +12,8 @@ func main() {
 		beego.BConfig.WebConfig.DirectoryIndex = true
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
+
+	bootstrap.SystemInit()
+
 	beego.Run()
 }

models/coupon/coupon.go

@@ -236,6 +236,18 @@ func (m *CouponDAO) SaveCustomerCoupons(cps []model.TaCustomerCoupon) error {
 	return nil
 }
 
+// IncreseCouponUsedNum 增加优惠券使用数量
+func (m *CouponDAO) IncreseCouponUsedNum(cpID string, num ...int) error {
+	sql := `update ta_coupon set used_count=used_count+? where coupon_id=?`
+	numAdd := 1
+	if len(num) > 0 && num[0] != 0 {
+		numAdd = num[0]
+	}
+
+	_, err := m.db.Exec(sql, numAdd, cpID)
+	return err
+}
+
 // CheckCustCoupon 检查客户是否已经有了该卡券
 // 如果用户有了卡券, 但是用过了，或者卡券过期了，仍然可以再次拥有
 func (m *CouponDAO) CheckCustCoupon(custID, couponID string, startDate, endDate time.Time) ([]model.TaCustomerCoupon, error) {

models/course/order.go

@@ -62,12 +62,6 @@ func (m *CourseDAO) SaveOrdersCoupon(coupon *model.TaCourseOrdersCoupon, order *
 	coupon.OrdersCouponId = utils.GetGUID()
 	coupon.Status = models.STATUS_NORMAL
 	coupon.CreateDate = time.Now().Local()
-	if _, err := m.db.Insert(coupon); err != nil {
-		return err
-	}
-
-	// 更新优惠券已使用信息
-	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
-	_, err := m.db.Exec(sql)
+	_, err := m.db.Insert(coupon)
 	return err
 }

models/goods/orders.go

@@ -47,7 +47,7 @@ func (m *GoodsDAO) SaveOrders(order *model.TaGoodsOrders) error {
 	// order.OrdersId = guid.NewGUIDString()
 	order.OrgId = caseInfo.OrgId
 	order.CreateDate = now
-	order.Status = models.STATUS_NORMAL
+	order.Status = models.STATUS_READY
 	order.IsPay = models.BOOL_TRUE // 默认已支付
 	order.CouponAmount = "0"
 	order.IsIntimidate = INTIMIDATE_NO
@@ -77,6 +77,12 @@ func (m *GoodsDAO) UpdateOrdersIntimidate(id string) error {
 		"orders_id",
 		"is_intimidate",
 	}
+
+	return m.UpdateOrders(&orders, cols)
+}
+
+// UpdateOrders  更新订单
+func (m *GoodsDAO) UpdateOrders(orders *model.TaGoodsOrders, cols []string) error {
 	_, err := m.db.Cols(cols...).Where("orders_id=?", orders.OrdersId).Update(orders)
 	return err
 }
@@ -101,53 +107,29 @@ func (m *GoodsDAO) SaveOrdersDetail(list []model.TaGoodsOrdersDetail, ordersID s
 // SaveOrdersCoupon 保存订单优惠券
 func (m *GoodsDAO) SaveOrdersCoupon(coupon *model.TaGoodsOrdersCoupon, order *model.TaGoodsOrders) error {
 	if order.OrdersId == "" {
-		return errors.New("内部错误, 订单事务顺序出错")
+		return errors.New("保存订单券失败, 订单不存在")
 	}
 	coupon.OrdersCouponId = utils.GetGUID()
 	coupon.Status = models.STATUS_NORMAL
 	coupon.CreateDate = time.Now().Local()
-	if _, err := m.db.Insert(coupon); err != nil {
-		return err
-	}
+	_, err := m.db.Insert(coupon)
 
-	// 更新优惠券已使用信息
-	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
-	_, err := m.db.Exec(sql)
 	return err
+}
 
-	// var couponAmount float64 = 0
-
-	// // 补充优惠券表字段
-	// for inx := range coupons {
-	// 	coupons[inx].OrdersCouponId = guid.NewGUIDString()
-	// 	coupons[inx].OrdersId = order.OrdersId
-	// 	coupons[inx].OrdersNo = order.OrdersNo
-	// 	coupons[inx].OrgId = order.OrgId
-	// 	coupons[inx].Status = models.STATUS_NORMAL
-	// 	coupons[inx].CreateDate = time.Now().Local()
-
-	// 	userAmount, _ := strconv.ParseFloat(coupons[inx].UsedAmount, 64)
-	// 	couponAmount += userAmount
-	// }
-
-	// // 反向更新 订单主表
-	// totalAmount, _ := strconv.ParseFloat(order.Amount, 64)
-
-	// order.CouponAmount = strconv.FormatFloat(couponAmount, 'f', -1, 32)
-	// order.ActualAmount = strconv.FormatFloat((totalAmount - couponAmount), 'f', -1, 32)
-
-	// if _, err := m.db.Insert(&coupons); err != nil {
-	// 	return err
-	// }
-
-	// if _, err := m.db.
-	// 	Where("orders_id=?", order.OrdersId).
-	// 	Cols([]string{"coupon_amount", "actual_amount"}...).
-	// 	Update(order); err != nil {
-	// 	return err
-	// }
-
-	// return nil
+// GetCouponByOrdersID 获取优惠券订单
+func (m *GoodsDAO) GetCouponByOrdersID(ordersID string) ([]model.TaCoupon, error) {
+	var res []model.TaCoupon
+	query := `
+		SELECT t.*
+		FROM ta_coupon t
+		JOIN ta_goods_orders_coupon s ON t.coupon_id = s.coupon_id
+		WHERE s.orders_id = ?
+		ORDER BY t.create_date
+	`
+
+	err := m.db.SQL(query, ordersID).Find(&res)
+	return res, err
 }
 
 func (m *GoodsDAO) getCaseByID(caseID string) (*model.SysCase, error) {
@@ -237,6 +219,29 @@ func (m *GoodsDAO) GetOrdersByID(id string) (*OrdersWithGoods, error) {
 	return res, nil
 }
 
+func (m *GoodsDAO) GetOrdersDetailByID(id string, status ...int) (*OrdersDetail, error) {
+	sta := models.STATUS_NORMAL
+	if len(status) > 0 {
+		sta = status[0]
+	}
+
+	res := new(OrdersDetail)
+	if _, err := m.db.Table("ta_goods_orders").
+		Where("orders_id=?", id).
+		And("status=?", sta).
+		Get(res); err != nil {
+		return nil, err
+	}
+
+	details, err := m.GetOrderDetailByOrder(res.OrdersId)
+	if err != nil {
+		return nil, err
+	}
+
+	res.Goods = details
+	return res, nil
+}
+
 // GetOrdersByRecord 根据
 func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error) {
 	var orderList []OrdersWithGoods
@@ -338,8 +343,8 @@ func (m *GoodsDAO) GetOrderDetailByUser(caseid, userid string) ([]model.TaGoodsO
 	var details []model.TaGoodsOrdersDetail
 	sql := `select a.* from ta_goods_orders_detail a inner join ta_goods_orders b on a.orders_id=b.orders_id
 		inner join ta_customer c on b.user_id = c.customer_id
-	where c.user_id=? and b.status>? and b.case_id=? and b.pay_type = ? order by b.create_date desc`
-	if err := m.db.Sql(sql, userid, models.STATUS_DEL, caseid, models.CONSUME_INNER).Find(&details); err != nil {
+	where c.user_id=? and b.status=? and b.case_id=? and b.pay_type = ? order by b.create_date desc`
+	if err := m.db.Sql(sql, userid, models.STATUS_NORMAL, caseid, models.CONSUME_INNER).Find(&details); err != nil {
 		return nil, err
 	}
 	return details, nil

models/goods/types.go

@@ -46,3 +46,10 @@ type OrdersWithGoods struct {
 	AreaIconWhite       string
 	Goods               []DetailWithType
 }
+
+// OrdersDetail 订单详情
+type OrdersDetail struct {
+	model.TaGoodsOrders `xorm:"extends"`
+	Goods               []DetailWithType
+	Coupons             []model.TaGoodsOrdersCoupon
+}

models/models.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+	"spaceofcheng/services/utils"
+
 	"github.com/astaxie/beego/config"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
@@ -10,7 +12,7 @@ var (
 	DBEngine *xorm.Engine
 )
 
-func init() {
+func InitDB() {
 	DBEngine = NewDBEngine()
 }
 
@@ -29,8 +31,9 @@ func NewDBEngine() *xorm.Engine {
 	return engine
 }
 
-func getMySQLDNS() string {
-	dbconf, _ := config.NewConfig("ini", "conf/db.conf")
+func getMySQLDNS() (dns string) {
+	appRoot := utils.GetAppRoot()
+	dbconf, _ := config.NewConfig("ini", appRoot+"/conf/db.conf")
 
 	conProt := dbconf.DefaultString("con_protocol", "tcp")
 	dbAddr := dbconf.DefaultString("db_addr", "localhost")
@@ -40,7 +43,7 @@ func getMySQLDNS() string {
 	database := dbconf.String("database")
 	charSet := dbconf.DefaultString("char_set", "utf8")
 
-	dns := userName
+	dns = userName
 
 	if len(password) > 0 {
 		dns += ":" + password
@@ -48,5 +51,5 @@ func getMySQLDNS() string {
 
 	dns += "@" + conProt + "(" + dbAddr + ":" + dbPort + ")" + "/" + database + "?charset=" + charSet
 
-	return dns
+	return
 }

routers/common.go

@@ -24,9 +24,7 @@ import (
 	"github.com/astaxie/beego"
 )
 
-func getCommonRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::common")
-
+func getCommonRoutes(prefix string) beego.LinkNamespace {
 	return beego.NSNamespace(prefix,
 		// 商品分类
 		beego.NSRouter("/type/goods", &goods.GoodsController{}, "get:GetGoodsType"),

routers/guest.go

@@ -13,9 +13,7 @@ import (
 	"github.com/astaxie/beego"
 )
 
-func getGuestRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::guest")
-
+func getGuestRoutes(prefix string) beego.LinkNamespace {
 	return beego.NSNamespace(prefix,
 		// cms
 		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoByLocation"),

routers/router.go

@@ -9,25 +9,36 @@ package routers
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/utils"
 
 	"github.com/astaxie/beego"
 )
 
 func init() {
-	prefix := beego.AppConfig.String("api::prefix")
+	appRoot := utils.GetAppRoot()
+
+	appConf, _ := utils.GetConfiger(appRoot + "/conf/app.conf")
+	if appConf == nil {
+		return
+	}
+
+	prefix := appConf.String("api::prefix")
+	guestPrefix := appConf.String("api::guest")
+	commonPrefix := appConf.String("api::common")
+	wechatPrefix := appConf.String("api::wechat")
 
 	ns := beego.NewNamespace(prefix,
 		// 解决跨域时 先发送 options 问题
 		beego.NSRouter("*", &controllers.BaseController{}, "options:Options"),
 
 		// 通用需要鉴权路由
-		getCommonRoutes(),
+		getCommonRoutes(commonPrefix),
 
 		// 微信路由
-		getWechatRoutes(),
+		getWechatRoutes(wechatPrefix),
 
 		// 不需要鉴权的路由
-		getGuestRoutes(),
+		getGuestRoutes(guestPrefix),
 	)
 
 	beego.AddNamespace(ns)

routers/wechat.go

@@ -15,9 +15,7 @@ import (
 	"github.com/astaxie/beego"
 )
 
-func getWechatRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::wechat")
-
+func getWechatRoutes(prefix string) beego.LinkNamespace {
 	return beego.NSNamespace(prefix,
 		// 会员
 		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),

service/course/order.go

@@ -138,6 +138,10 @@ func (s *CourseServ) Orders(
 			return errors.New("保存优惠信息出错")
 		}
 
+		if err := s.couponDAO.IncreseCouponUsedNum(coupon.CouponId); err != nil {
+			return utils.LogError("保存优惠信息出错", err.Error())
+		}
+
 		// 优惠券核销
 		err = s.couponDAO.VerifyCustomerCoupon(customercouponid)
 		if err != nil {

service/events/events.go

@@ -85,7 +85,7 @@ var tsAction = func(e tinyevent.Event) error {
 	return nil
 }
 
-func init() {
+func EventInit() {
 	cases, err := models.GetAllCases()
 	if err != nil {
 		utils.LogError("获取有效案场列表失败: " + err.Error())

service/goods/orders.go

@@ -16,8 +16,8 @@ import (
 	"github.com/yl10/kit/guid"
 )
 
-// Orders 下单
-func (s *GoodsServ) Orders(
+// PreOrders 预下单
+func (s *GoodsServ) PreOrders(
 	info *model.TaGoodsOrders,
 	details []model.TaGoodsOrdersDetail,
 	customercouponid,
@@ -104,7 +104,7 @@ func (s *GoodsServ) Orders(
 				GoodsId: "",
 			}
 			for _, detail := range details {
-				if coupon.IsAll == 1 {
+				if coupon.IsAll == models.BOOL_TRUE {
 					dyprice, _ := strconv.ParseFloat(dyGoods.Price, 64)
 					detailprice, _ := strconv.ParseFloat(detail.Price, 64)
 					if dyprice < detailprice {
@@ -141,13 +141,6 @@ func (s *GoodsServ) Orders(
 				}
 				info.CouponAmount = dyGoods.Price
 				// info.ActualAmount = "0.0"
-
-				// 优惠券核销
-				err := s.couponDAO.VerifyCustomerCoupon(customercouponid)
-				if err != nil {
-					utils.LogError("优惠券核销出错: " + err.Error())
-					return errors.New("优惠券核销出错")
-				}
 			} else {
 				return errors.New("优惠券不可抵用商品")
 			}
@@ -169,13 +162,6 @@ func (s *GoodsServ) Orders(
 		if payMoney > 0 && couponAmount > 0 && info.PayType != models.CONSUME_INNER {
 			info.PayType = models.CONSUME_COUPON_COIN
 		}
-
-		// 如果是城币, 则插入用户账户消费记录
-		if payMoney > 0 {
-			if err := s.saveCustomerPayRec(account, info); err != nil {
-				return err
-			}
-		}
 	}
 
 	// 保存主订单
@@ -188,32 +174,102 @@ func (s *GoodsServ) Orders(
 		return err
 	}
 
-	// 通知后端有新订单 - websocket
-	// orderList, err := s.GetOnLineOrders(info.CaseId, false)
-	// if err != nil {
-	// 	utils.LogError("获取新单列表出错: " + err.Error())
-	// 	return nil
-	// }
-	newOrder, err := s.GetNewGoods(info.OrdersId)
+	return nil
+}
+
+// ConfirmOrder 订单确认
+// 1、订单状态修改为有效
+// 2、订单修改为支付状态
+// 3、卡券核销
+// 4、账户或者 VIP 卡扣钱
+func (s *GoodsServ) ConfirmOrder(ordersID string) error {
+	orders, err := s.dao.GetOrdersByID(ordersID)
 	if err != nil {
-		// 下单流程已经结束, 不反馈错误
-		utils.LogError("获取数据失败：", err.Error())
-		return nil
+		return utils.LogError("获取订单失败", err)
 	}
 
+	// 如果是内部人员
+	if orders.PayType == models.CONSUME_INNER {
+		// 查找禁用名单
+		fibUsers, err := s.userDAO.GetForbidUserByUserID(orders.UserId)
+		if err != nil {
+			return utils.LogError("校验下单人出错", err)
+		}
+
+		if fibUsers != nil && len(fibUsers) > 0 {
+			for _, u := range fibUsers {
+				if u.ForbidType == models.FORBID_ORDER && u.Status == models.STATUS_NORMAL {
+					return errors.New("当前下单人被禁止点单")
+				}
+			}
+		}
+	} else {
+		// 如果不是内部人员
+
+		// 如果使用了优惠券
+		coupons, err := s.dao.GetCouponByOrdersID(ordersID)
+		if err != nil {
+			return utils.LogError("校验订单优惠券失败", err)
+		}
+		if coupons != nil && len(coupons) > 0 {
+			for _, cp := range coupons {
+				if cp.Status != models.STATUS_NORMAL {
+					return errors.New("订单优惠券已经被使用, 请重新选择优惠券")
+				}
+
+				// 优惠券核销
+				err := s.couponDAO.VerifyCustomerCoupon(cp.CouponId)
+				if err != nil {
+					return utils.LogError("优惠券核销出错", err)
+				}
+
+				// 优惠券使用数量 + 1
+				if err := s.couponDAO.IncreseCouponUsedNum(cp.CouponId); err != nil {
+					return utils.LogError("更新优惠券使用出错", err)
+				}
+			}
+		}
+
+		// 如果使用了城币
+		actualPay, _ := strconv.ParseFloat(orders.ActualAmount, 64)
+		if actualPay > 0.01 {
+			account, err := s.custDAO.GetAccountByCust(orders.UserId)
+			if err != nil {
+				return utils.LogError("查询用户账户信息出错", err)
+			}
+
+			accMoney, _ := strconv.ParseFloat(account.Amount, 64)
+			if accMoney < actualPay {
+				return errors.New("下单错误, 用户账户余额不足")
+			}
+
+			if err := s.saveCustomerPayRec(account, &orders.TaGoodsOrders); err != nil {
+				return err
+			}
+		}
+
+		// 不去校验商品及库存
+		// 因为暂时没有库存的概念
+	}
+
+	// 更新订单状态
+	orders.Status = models.STATUS_NORMAL
+	orders.IsPay = models.BOOL_TRUE
+	if err := s.dao.UpdateOrders(&orders.TaGoodsOrders, []string{"status", "is_pay"}); err != nil {
+		return utils.LogError("下单失败, 更新状态出错", err)
+	}
+
+	// 通知后端有新订单 - websocket
 	msg := utils.Message{
 		To: utils.ClientID{
-			Groups: []string{info.CaseId},
+			Groups: []string{orders.CaseId},
 		},
 		Data: map[string][]interface{}{
-			"refreshOnlineGoodsOrders": []interface{}{*newOrder},
+			"refreshOnlineGoodsOrders": []interface{}{*orders},
 		},
 	}
 
-	utils.LogError("调用下单 Websocket ")
-
 	utils.SendMessage(msg, utils.WsMessage)
-
 	return nil
 }
 
@@ -311,9 +367,6 @@ func (s *GoodsServ) validOrdersInfo(info *model.TaGoodsOrders) error {
 				if info.UserName == "" {
 					info.UserName = cust.CustomerName
 				}
-				// if ut.CaseId == caseID {
-
-				// }
 			}
 		}
 

tests/cases_test.go

@@ -0,0 +1,54 @@
+package tests
+
+import (
+	"net/http"
+	"net/url"
+	"spaceofcheng/services/controllers"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestGetCmsCaseList(t *testing.T) {
+
+	Convey("获取案场列表", t, func() {
+
+		Convey("正常业务", func() {
+			params := url.Values{}
+			params.Add("orgid", "1")
+
+			result := &controllers.JSONMessage{}
+
+			code, _, err := NewRequestMock().Request(http.MethodGet, "/api/guest/MQ/cms/case", params, result)
+
+			// http 常规判断, 可以省略
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
+
+			// 业务返回判断
+			Convey("结果码 200", func() {
+				So(result.Code, ShouldEqual, http.StatusOK)
+			})
+
+			Convey("结果不为空", func() {
+				So(result.Result, ShouldNotBeEmpty)
+			})
+		})
+
+		Convey("机构不传报错", func() {
+			result := &controllers.JSONMessage{}
+
+			code, _, err := NewRequestMock().Request(http.MethodGet, "/api/guest/MQ/cms/case", nil, result)
+
+			// http 常规判断, 可以省略
+			So(code, ShouldEqual, http.StatusOK)
+			So(err, ShouldBeNil)
+
+			// 业务返回判断
+			Convey("结果码 不是200", func() {
+				So(result.Code, ShouldNotEqual, http.StatusOK)
+			})
+		})
+
+	})
+}

tests/tests.go

@@ -0,0 +1,29 @@
+package tests
+
+/**
+*
+* 使用的测试框架为  http://labix.org/gocheck
+*
+**/
+
+import (
+	"spaceofcheng/services/bootstrap"
+	"spaceofcheng/services/utils"
+	"testing"
+
+	_ "spaceofcheng/services/routers"
+
+	"github.com/astaxie/beego"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestHelloWorld(t *testing.T) {
+	Convey("Hello go tester !", t, func() {
+		So(2, ShouldEqual, 2)
+	})
+}
+
+func init() {
+	bootstrap.SystemInit()
+	beego.TestBeegoInit(utils.GetAppRoot())
+}

tests/utils.go

@@ -0,0 +1,212 @@
+package tests
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"mime/multipart"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/astaxie/beego"
+)
+
+// RequestMock 模拟请求
+type RequestMock struct {
+	Headers map[string]string
+	Host    string
+}
+
+// NewRequestMock new inst
+func NewRequestMock() *RequestMock {
+	return &RequestMock{
+		Headers: make(map[string]string),
+	}
+}
+
+// SetHeaders 设置自定义请求头
+func (t *RequestMock) SetHeaders(headers map[string]string) *RequestMock {
+	t.Headers = headers
+	return t
+}
+
+// SetHost 设置 host 包含 port
+func (t *RequestMock) SetHost(host string) *RequestMock {
+	t.Host = host
+	return t
+}
+
+// Request 请求
+// 暂时只支持 params 是 url.Values 及 map[string]interface{} 两种类型
+// url.Values 将被理解为 content-type="application/x-www-form-urlencoded"
+// map[string]interface{} 将被理解为 content-type="multipart/form-data"
+func (t *RequestMock) Request(meth, addr string, params interface{}, result interface{}) (code int, body []byte, err error) {
+	var r *http.Request
+	defer t.SetHeaders(nil)
+
+	code = 0
+	body = nil
+	err = nil
+
+	if t.Host != "" {
+		addr = t.Host + addr
+	} else {
+		addr = "http://127.0.0.1:8080" + addr
+	}
+
+	switch meth {
+
+	// get 请求, 只支持 params 为 url.Values 的参数
+	case http.MethodGet:
+		if params != nil {
+			if dt, ok := params.(url.Values); ok {
+				searchStr := dt.Encode()
+				if strings.Index(addr, "?") > -1 {
+					searchStr = "&" + searchStr
+				} else {
+					searchStr = "?" + searchStr
+				}
+				r, _ = http.NewRequest(meth, addr+searchStr, nil)
+			}
+		} else {
+			r, _ = http.NewRequest(meth, addr, nil)
+		}
+
+	// post, put, delete
+	case http.MethodPost, http.MethodPut, http.MethodDelete:
+		rb, ct, e := GetBody(params)
+		if e != nil {
+			err = e
+			return
+		}
+
+		r, _ = http.NewRequest(meth, addr, rb)
+		if ct != "" {
+			r.Header.Set("Content-Type", ct)
+		}
+
+	// 其他的本系统没有使用
+	default:
+		err = errors.New("不支持的请求类型")
+		return
+	}
+
+	// 自定义的 header 头
+	if t.Headers != nil {
+		for k, v := range t.Headers {
+			r.Header.Set(k, v)
+		}
+	}
+
+	w := httptest.NewRecorder()
+	beego.BeeApp.Handlers.ServeHTTP(w, r)
+
+	code = w.Code
+	body, _ = ioutil.ReadAll(w.Result().Body)
+
+	beego.Trace("testing", meth+" - "+addr)
+
+	if result != nil {
+		err = json.Unmarshal(body, result)
+		return
+	}
+
+	return
+}
+
+func GetBody(params interface{}) (body io.Reader, contentType string, err error) {
+	body = nil
+	contentType = ""
+	err = nil
+
+	if params == nil {
+		return
+	}
+
+	t := fmt.Sprintf("%T", params)
+	switch t {
+
+	// 被会解析为 application/x-www-form-urlencoded
+	case "url.Values":
+		data, _ := params.(url.Values)
+		body = strings.NewReader(data.Encode())
+		contentType = "application/x-www-form-urlencoded"
+		return
+
+	// 被会解析为 multipart/form-data
+	case "map[string]interface {}":
+		var b bytes.Buffer
+		var fw io.Writer
+
+		w := multipart.NewWriter(&b)
+		data, _ := params.(map[string]interface{})
+
+		// 遍历字段
+		for k, v := range data {
+			switch x := v.(type) {
+
+			// 文件
+			case *os.File:
+				if fw, err = w.CreateFormFile(k, x.Name()); err != nil {
+					return
+				}
+
+				if _, err = io.Copy(fw, x); err != nil {
+					return
+				}
+
+			// 字符串
+			case string:
+				err = w.WriteField(k, x)
+				if err != nil {
+					return
+				}
+
+			// 整数, 暂不支持 int 各种原始类型, 比如 int32, int64 等
+			case int:
+				dt := strconv.Itoa(x)
+				err = w.WriteField(k, dt)
+				if err != nil {
+					return
+				}
+
+			// 小数, 暂时不支持其他类型的浮点数
+			case float64:
+				dt := strconv.FormatFloat(x, 'f', -1, 64)
+				err = w.WriteField(k, dt)
+				if err != nil {
+					return
+				}
+
+			// 时间
+			case time.Time:
+				dt := x.Format("2006-01-02 15:04:05")
+				err = w.WriteField(k, dt)
+				if err != nil {
+					return
+				}
+
+			// 其他
+			default:
+				err = fmt.Errorf("暂时不支持 key "+k+" 对应的数据类型 %T", x)
+				return
+			}
+		}
+
+		body = bytes.NewReader(b.Bytes())
+		contentType = w.FormDataContentType()
+		return
+
+	default:
+		err = fmt.Errorf("暂时不支持的参数类型 " + t)
+		return
+	}
+}

utils/captcha.go

@@ -19,7 +19,7 @@ type CaptchaEngine struct {
 	capList map[string]cap
 }
 
-var capEngine *CaptchaEngine
+var capEngine = NewCaptchaEngine()
 
 // NewCaptchaEngine 创建验证码引擎
 func NewCaptchaEngine() *CaptchaEngine {
@@ -108,7 +108,3 @@ func (c *CaptchaEngine) DestoryCaptcha(phone string) {
 	// 如果成功, 则注销
 	delete(c.capList, phone)
 }
-
-func init() {
-	capEngine = NewCaptchaEngine()
-}

utils/configer.go

@@ -0,0 +1,15 @@
+package utils
+
+import (
+	"github.com/astaxie/beego/config"
+)
+
+// GetConfiger 获取配置
+func GetConfiger(file string) (config.Configer, error) {
+	conf, err := config.NewConfig("ini", file)
+	if err != nil {
+		return nil, LogError("读取配置文件失败", err.Error())
+	}
+
+	return conf, nil
+}

utils/log.go

@@ -9,8 +9,7 @@ import (
 	"github.com/astaxie/beego/logs"
 )
 
-var defaultLogger *logs.BeeLogger
-var instances map[string]*logs.BeeLogger
+var instances = make(map[string]*logs.BeeLogger)
 
 // NewLog 构造日志对象
 func NewLog(tp ...string) *logs.BeeLogger {
@@ -101,9 +100,6 @@ func GetDefaultLogger() *logs.BeeLogger {
 	return log
 }
 
-func init() {
-	instances = make(map[string]*logs.BeeLogger)
+func LogInit() {
 	NewLog()
-
-	defaultLogger = GetDefaultLogger()
 }

utils/message.go

@@ -45,6 +45,6 @@ func SendMessage(message Message, msgType string) {
 	}
 }
 
-func init() {
+func MessageInit() {
 	go websocket.Run()
 }

utils/sms.go

@@ -19,7 +19,7 @@ type SMSEngine struct {
 }
 
 var defaultSMS *SMSEngine
-var mtx *sync.Mutex
+var mtx = new(sync.Mutex)
 
 // ResetSMSEngine 重置引擎
 func ResetSMSEngine(conf config.Configer) {
@@ -71,7 +71,3 @@ func SendSMS(smsType, tel string, messages ...string) {
 
 	}()
 }
-
-func init() {
-	mtx = new(sync.Mutex)
-}

utils/utils.go

@@ -4,6 +4,8 @@ import (
 	"encoding/base64"
 	"math/rand"
 	"net/http"
+	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -156,3 +158,10 @@ func GetFiveSeconds(t time.Time) string {
 
 	return str[:strLen-1] + strconv.Itoa(lastNum)
 }
+
+// GetAppRoot 获取系统根目录
+func GetAppRoot() string {
+	_, file, _, _ := runtime.Caller(1)
+	appRoot, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator))))
+	return appRoot
+}

utils/wechat.go

@@ -60,9 +60,10 @@ func GetWxAppID(org string) string {
 	return wxClients[org].GetAppID()
 }
 
-func init() {
-	wx.SetLogInst(defaultLogger)
-	mini.SetLogInst(defaultLogger)
+func WechatInit() {
+	logger := GetDefaultLogger()
+	wx.SetLogInst(logger)
+	mini.SetLogInst(logger)
 }
 
 // MapToWechatUser 映射微信人员