|
@@ -105,7 +105,8 @@ func (c *OrderController) addOrderPurpose(param orderDetail) error { |
|
@@ -105,7 +105,8 @@ func (c *OrderController) addOrderPurpose(param orderDetail) error { |
105
|
//业务员分红百分比
|
105
|
//业务员分红百分比
|
106
|
SalesmanBonusPercent: param.SalesmanRatio,
|
106
|
SalesmanBonusPercent: param.SalesmanRatio,
|
107
|
//订单类型
|
107
|
//订单类型
|
108
|
- OrderType: domain.OrderIntention,
|
108
|
+ OrderType: domain.OrderIntention,
|
|
|
109
|
+ OrderStatus: domain.OrderStatusReserve,
|
109
|
}
|
110
|
}
|
110
|
err := orderSrv.CreateOrder(Createcmd)
|
111
|
err := orderSrv.CreateOrder(Createcmd)
|
111
|
return err
|
112
|
return err
|
|
@@ -415,7 +416,7 @@ func (c *OrderController) UpdateOrderReal() { |
|
@@ -415,7 +416,7 @@ func (c *OrderController) UpdateOrderReal() { |
415
|
if param.Id == 0 {
|
416
|
if param.Id == 0 {
|
416
|
err = c.addOrderReal(param)
|
417
|
err = c.addOrderReal(param)
|
417
|
} else {
|
418
|
} else {
|
418
|
- err = c.editOrderPurpose(param)
|
419
|
+ err = c.editOrderReal(param)
|
419
|
}
|
420
|
}
|
420
|
if err != nil {
|
421
|
if err != nil {
|
421
|
c.ResponseError(err)
|
422
|
c.ResponseError(err)
|
|
@@ -454,6 +455,8 @@ func (c *OrderController) addOrderReal(param orderDetail) error { |
|
@@ -454,6 +455,8 @@ func (c *OrderController) addOrderReal(param orderDetail) error { |
454
|
SalesmanBonusPercent: param.SalesmanRatio,
|
455
|
SalesmanBonusPercent: param.SalesmanRatio,
|
455
|
//订单类型
|
456
|
//订单类型
|
456
|
OrderType: domain.OrderReal,
|
457
|
OrderType: domain.OrderReal,
|
|
|
458
|
+ //状态
|
|
|
459
|
+ OrderStatus: param.OrderStatue,
|
457
|
}
|
460
|
}
|
458
|
err := orderSrv.CreateOrder(Createcmd)
|
461
|
err := orderSrv.CreateOrder(Createcmd)
|
459
|
return err
|
462
|
return err
|
|
@@ -481,6 +484,8 @@ func (c *OrderController) editOrderReal(param orderDetail) error { |
|
@@ -481,6 +484,8 @@ func (c *OrderController) editOrderReal(param orderDetail) error { |
481
|
PartnerBonusPercent: param.PartnerRatio,
|
484
|
PartnerBonusPercent: param.PartnerRatio,
|
482
|
//业务员分红百分比
|
485
|
//业务员分红百分比
|
483
|
SalesmanBonusPercent: param.SalesmanRatio,
|
486
|
SalesmanBonusPercent: param.SalesmanRatio,
|
|
|
487
|
+ //状态
|
|
|
488
|
+ OrderStatus: param.OrderStatue,
|
484
|
}
|
489
|
}
|
485
|
orderSrv := orderService.NewOrderService(nil)
|
490
|
orderSrv := orderService.NewOrderService(nil)
|
486
|
err := orderSrv.UpdateOrderReal(updateCmd)
|
491
|
err := orderSrv.UpdateOrderReal(updateCmd)
|