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

controllers/goods/order.go

@@ -93,6 +93,8 @@ func (c *GoodsController) PostOrder() {
 	mtx.Lock()
 	defer mtx.Unlock()
 
+	innerUser := c.GetString("from")
+
 	// 订单主信息
 	info := c.GetString("info")
 	if info == "" {
@@ -107,6 +109,10 @@ func (c *GoodsController) PostOrder() {
 
 	// 订单优惠券
 	customercouponid := c.GetString("customercouponid")
+	if customercouponid == "undefined" {
+		customercouponid = ""
+	}
+
 	//
 	var orderInfo model.TaGoodsOrders
 	var orderDetail []model.TaGoodsOrdersDetail
@@ -134,7 +140,7 @@ func (c *GoodsController) PostOrder() {
 		)
 	}
 
-	if err := c.serv.Orders(&orderInfo, orderDetail, customercouponid); err != nil {
+	if err := c.serv.Orders(&orderInfo, orderDetail, customercouponid, innerUser); err != nil {
 		c.ResponseError(err)
 	}
 

service/goods/orders.go

@@ -20,7 +20,8 @@ import (
 func (s *GoodsServ) Orders(
 	info *model.TaGoodsOrders,
 	details []model.TaGoodsOrdersDetail,
-	customercouponid string) error {
+	customercouponid,
+	innerUser string) error {
 	// org := s.ctx.Get("org").(model.SysOrg)
 	cust := s.ctx.Get("customer").(model.TaCustomer)
 
@@ -51,7 +52,8 @@ func (s *GoodsServ) Orders(
 		return err
 	}
 
-	if info.PayType == models.CONSUME_INNER {
+	if innerUser == "sales" {
+		info.PayType = models.CONSUME_INNER
 		// 内部人员, 可以直接购买
 		// TODO
 	} else {