bug 修复

@@ -298,16 +298,30 @@ func (c *OrderInfoController) editOrderPurpose(param postPurposeOrderDetail) err
 	return err
 	return err
 }
 }
 
 
-//OrderPurposeDelivery 发货 意向订单转实发单
-func (c *OrderInfoController) OrderPurposeDelivery() {
-	//用与适配前端定义的数据结构
-	type PostParameter struct {
+type postOrderPurposeDelivery struct {
 	ShipmentsId   string          `json:"shipmentsId"` //发货单号
 	ShipmentsId   string          `json:"shipmentsId"` //发货单号
 	Id            string          `json:"id"`          //订单id
 	Id            string          `json:"id"`          //订单id
 	ProductDetail []postOrderGood `json:"productDetail"`
 	ProductDetail []postOrderGood `json:"productDetail"`
+}
+
+func (postData postOrderPurposeDelivery) Valid() error {
+	if len(postData.ShipmentsId) == 0 {
+		return lib.ThrowError(lib.ARG_ERROR, "发货单号必填")
 	}
 	}
+	for i := range postData.ProductDetail {
+		if err := postData.ProductDetail[i].Valid(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+//OrderPurposeDelivery 发货 意向订单转实发单
+func (c *OrderInfoController) OrderPurposeDelivery() {
+	//用与适配前端定义的数据结构
+
 	var (
 	var (
-		param PostParameter
+		param postOrderPurposeDelivery
 		err   error
 		err   error
 	)
 	)
 	if err = c.BindJsonData(&param); err != nil {
 	if err = c.BindJsonData(&param); err != nil {
@@ -315,13 +329,16 @@ func (c *OrderInfoController) OrderPurposeDelivery() {
 		c.ResponseError(errors.New("json数据解析失败"))
 		c.ResponseError(errors.New("json数据解析失败"))
 		return
 		return
 	}
 	}
-	orderSrv := orderService.NewOrderInfoService(nil)
 
 
 	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
 	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
 	if orderid <= 0 {
 	if orderid <= 0 {
 		c.ResponseError(errors.New("参数错误"))
 		c.ResponseError(errors.New("参数错误"))
 		return
 		return
 	}
 	}
+	if err = param.Valid(); err != nil {
+		c.ResponseError(err)
+		return
+	}
 	goods := []orderCmd.OrderGoodData{}
 	goods := []orderCmd.OrderGoodData{}
 	for _, v := range param.ProductDetail {
 	for _, v := range param.ProductDetail {
 		g := orderCmd.OrderGoodData{
 		g := orderCmd.OrderGoodData{
@@ -334,6 +351,7 @@ func (c *OrderInfoController) OrderPurposeDelivery() {
 		OrderId: orderid, DeliveryCode: param.ShipmentsId,
 		OrderId: orderid, DeliveryCode: param.ShipmentsId,
 		DeliveryTime: time.Now(), Goods: goods,
 		DeliveryTime: time.Now(), Goods: goods,
 	}
 	}
+	orderSrv := orderService.NewOrderInfoService(nil)
 	err = orderSrv.Delivery(deliveryCommand)
 	err = orderSrv.Delivery(deliveryCommand)
 	if err != nil {
 	if err != nil {
 		c.ResponseError(err)
 		c.ResponseError(err)
@@ -564,7 +582,7 @@ func (c *OrderInfoController) editOrderReal(param postRealOrderDetail) error {
 	}
 	}
 	updatecmd := orderCmd.UpdateOrderCommand{
 	updatecmd := orderCmd.UpdateOrderCommand{
 		Id:                   param.Id,
 		Id:                   param.Id,
-		OrderType:            domain.OrderIntention,
+		OrderType:            domain.OrderReal,
 		OrderCode:            param.OrderId,
 		OrderCode:            param.OrderId,
 		DeliveryCode:         param.ShipmentsId,
 		DeliveryCode:         param.ShipmentsId,
 		BuyerName:            param.BuyerName,
 		BuyerName:            param.BuyerName,