zjxpcyc 6 anni fa
parent
commit
da3867e973
2 ha cambiato i file con 7 aggiunte e 3 eliminazioni
  1. 3
    1
      controllers/goods/order.go
  2. 4
    2
      service/goods/orders.go

+ 3
- 1
controllers/goods/order.go Vedi File

@@ -93,6 +93,8 @@ func (c *GoodsController) PostOrder() {
93 93
 	mtx.Lock()
94 94
 	defer mtx.Unlock()
95 95
 
96
+	innerUser := c.GetString("from")
97
+
96 98
 	// 订单主信息
97 99
 	info := c.GetString("info")
98 100
 	if info == "" {
@@ -134,7 +136,7 @@ func (c *GoodsController) PostOrder() {
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 140
 		c.ResponseError(err)
139 141
 	}
140 142
 

+ 4
- 2
service/goods/orders.go Vedi File

@@ -20,7 +20,8 @@ import (
20 20
 func (s *GoodsServ) Orders(
21 21
 	info *model.TaGoodsOrders,
22 22
 	details []model.TaGoodsOrdersDetail,
23
-	customercouponid string) error {
23
+	customercouponid,
24
+	innerUser string) error {
24 25
 	// org := s.ctx.Get("org").(model.SysOrg)
25 26
 	cust := s.ctx.Get("customer").(model.TaCustomer)
26 27
 
@@ -51,7 +52,8 @@ func (s *GoodsServ) Orders(
51 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 58
 		// TODO
57 59
 	} else {