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

controllers/bodycheck/bodycheck.go

@@ -7,6 +7,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/bodycheck"
 	"spaceofcheng/services/utils"
+	"sync"
 
 	"github.com/astaxie/beego"
 )
@@ -15,6 +16,8 @@ import (
 // 临时的解决方案是放到全局单例对象中
 var qrCodes map[string]string
 
+var mtx *sync.Mutex
+
 // BodyCheckController 商品
 type BodyCheckController struct {
 	serv *bodycheck.BodyCheckServ
@@ -67,8 +70,15 @@ func (c *BodyCheckController) GetCheckByUser() {
 
 // PostCheckResult 测量结果返回
 func (c *BodyCheckController) PostCheckResult() {
+	// 防止并发
+	mtx.Lock()
+
 	r := c.Ctx.Request
-	defer r.Body.Close()
+	defer func() {
+		r.Body.Close()
+		mtx.Unlock()
+	}()
+
 	con, _ := ioutil.ReadAll(r.Body) //获取post的数据
 
 	var formVal map[string]interface{}
@@ -98,4 +108,5 @@ func (c *BodyCheckController) PostCheckResult() {
 
 func init() {
 	qrCodes = make(map[string]string)
+	mtx = new(sync.Mutex)
 }

controllers/goods/order.go

@@ -8,9 +8,12 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"sync"
 	"time"
 )
 
+var mtx *sync.Mutex
+
 // GetOrderList 获取商品订单
 // 管理端 - 统计查询
 func (c *GoodsController) GetOrderList() {
@@ -86,6 +89,10 @@ func (c *GoodsController) GetOnlineOrder() {
 // PostOrder 下单
 // 微信端
 func (c *GoodsController) PostOrder() {
+	// 防止并发
+	mtx.Lock()
+	defer mtx.Unlock()
+
 	// 订单主信息
 	info := c.GetString("info")
 	if info == "" {
@@ -283,3 +290,7 @@ func (c *GoodsController) UpdateOrdersIntimidate() {
 	}
 	c.ResponseJSON("操作成功！")
 }
+
+func init() {
+	mtx = new(sync.Mutex)
+}

service/goods/orders.go

@@ -11,23 +11,16 @@ import (
 	"spaceofcheng/services/service/cases"
 	"spaceofcheng/services/utils"
 	"strconv"
-	"sync"
 	"time"
 
 	"github.com/yl10/kit/guid"
 )
 
-var mtx *sync.Mutex
-
 // Orders 下单
 func (s *GoodsServ) Orders(
 	info *model.TaGoodsOrders,
 	details []model.TaGoodsOrdersDetail,
 	customercouponid string) error {
-	// 防止并发
-	mtx.Lock()
-	defer mtx.Unlock()
-
 	// org := s.ctx.Get("org").(model.SysOrg)
 	cust := s.ctx.Get("customer").(model.TaCustomer)
 
@@ -595,7 +588,3 @@ func (s *GoodsServ) GetNewGoods(ordersID string) (*goods.OrdersWithGoods, error)
 
 	return order, nil
 }
-
-func init() {
-	mtx = new(sync.Mutex)
-}