浏览代码

Merge branch 'issue-3' into dev

zjxpcyc 6 年前
父节点
当前提交
89215ea543
共有 2 个文件被更改,包括 7 次插入3 次删除
  1. 3
    1
      controllers/goods/order.go
  2. 4
    2
      service/goods/orders.go

+ 3
- 1
controllers/goods/order.go 查看文件

93
 	mtx.Lock()
93
 	mtx.Lock()
94
 	defer mtx.Unlock()
94
 	defer mtx.Unlock()
95
 
95
 
96
+	innerUser := c.GetString("from")
97
+
96
 	// 订单主信息
98
 	// 订单主信息
97
 	info := c.GetString("info")
99
 	info := c.GetString("info")
98
 	if info == "" {
100
 	if info == "" {
134
 		)
136
 		)
135
 	}
137
 	}
136
 
138
 
137
-	if err := c.serv.Orders(&orderInfo, orderDetail, customercouponid); err != nil {
139
+	if err := c.serv.Orders(&orderInfo, orderDetail, customercouponid, innerUser); err != nil {
138
 		c.ResponseError(err)
140
 		c.ResponseError(err)
139
 	}
141
 	}
140
 
142
 

+ 4
- 2
service/goods/orders.go 查看文件

20
 func (s *GoodsServ) Orders(
20
 func (s *GoodsServ) Orders(
21
 	info *model.TaGoodsOrders,
21
 	info *model.TaGoodsOrders,
22
 	details []model.TaGoodsOrdersDetail,
22
 	details []model.TaGoodsOrdersDetail,
23
-	customercouponid string) error {
23
+	customercouponid,
24
+	innerUser string) error {
24
 	// org := s.ctx.Get("org").(model.SysOrg)
25
 	// org := s.ctx.Get("org").(model.SysOrg)
25
 	cust := s.ctx.Get("customer").(model.TaCustomer)
26
 	cust := s.ctx.Get("customer").(model.TaCustomer)
26
 
27
 
51
 		return err
52
 		return err
52
 	}
53
 	}
53
 
54
 
54
-	if info.PayType == models.CONSUME_INNER {
55
+	if innerUser == "sales" {
56
+		info.PayType = models.CONSUME_INNER
55
 		// 内部人员, 可以直接购买
57
 		// 内部人员, 可以直接购买
56
 		// TODO
58
 		// TODO
57
 	} else {
59
 	} else {