更新

@@ -11,7 +11,12 @@ const (
 	OrderIntention            //意向订单
 	OrderIntention            //意向订单
 )
 )
 
 
-//买家
+const (
+	OrderDisableNot = iota //订单未关闭
+	OrderDisableYes        //订单已关闭
+)
+
+//Buyer 买家
 type Buyer struct {
 type Buyer struct {
 	//买家姓名
 	//买家姓名
 	BuyerName string `json:"buyerName"`
 	BuyerName string `json:"buyerName"`
@@ -50,6 +55,8 @@ type OrderBase struct {
 	Goods []OrderGood `json:"goods"`
 	Goods []OrderGood `json:"goods"`
 	//核算订单相关数据
 	//核算订单相关数据
 	OrderCompute OrderCompute `json:"orderCompute"`
 	OrderCompute OrderCompute `json:"orderCompute"`
+	//是否关闭订单
+	IsDisable int `json:"isDisable"`
 }
 }
 
 
 type OrderCompute struct {
 type OrderCompute struct {

@@ -58,7 +58,7 @@ type OrderBase struct {
 	PartnerBonusExpense float64
 	PartnerBonusExpense float64
 	//上一次查看时间 已读情况
 	//上一次查看时间 已读情况
 	LastViewTime time.Time
 	LastViewTime time.Time
-
+	//是否关闭订单
 	IsDisable int
 	IsDisable int
 }
 }
 
 

@@ -29,6 +29,7 @@ func (reponsitory OrderBaseRepository) transformPgModelToDomainModel(orderModel
 		DeliveryCode: orderModel.DeliveryCode, Buyer: orderModel.Buyer, RegionInfo: orderModel.RegionInfo,
 		DeliveryCode: orderModel.DeliveryCode, Buyer: orderModel.Buyer, RegionInfo: orderModel.RegionInfo,
 		PartnerId: orderModel.PartnerId, SalesmanBonusPercent: orderModel.SalesmanBonusPercent,
 		PartnerId: orderModel.PartnerId, SalesmanBonusPercent: orderModel.SalesmanBonusPercent,
 		CreateTime: orderModel.CreateTime, DeliveryTime: orderModel.DeliveryTime, UpdateTime: orderModel.UpdateTime,
 		CreateTime: orderModel.CreateTime, DeliveryTime: orderModel.DeliveryTime, UpdateTime: orderModel.UpdateTime,
+		IsDisable: orderModel.IsDisable,
 		OrderCompute: domain.OrderCompute{
 		OrderCompute: domain.OrderCompute{
 			PlanPartnerBonus: orderModel.PlanPartnerBonus, UsePartnerBonus: orderModel.UsePartnerBonus,
 			PlanPartnerBonus: orderModel.PlanPartnerBonus, UsePartnerBonus: orderModel.UsePartnerBonus,
 			PartnerBonusHas: orderModel.PartnerBonusHas, PartnerBonusNot: orderModel.PartnerBonusNot,
 			PartnerBonusHas: orderModel.PartnerBonusHas, PartnerBonusNot: orderModel.PartnerBonusNot,

@@ -412,6 +412,7 @@ func (c *OrderInfoController) PageListOrderReal() {
 			"orderDist":       orderinfo.RegionInfo.RegionName,
 			"orderDist":       orderinfo.RegionInfo.RegionName,
 			"quantityControl": "",
 			"quantityControl": "",
 			"priceControl":    "",
 			"priceControl":    "",
+			"status":          orderinfo.IsDisable,
 		}
 		}
 		if orderinfo.OrderCompute.UseOrderCount >= 0 {
 		if orderinfo.OrderCompute.UseOrderCount >= 0 {
 			m["quantityControl"] = fmt.Sprint(orderinfo.OrderCompute.UseOrderCount)
 			m["quantityControl"] = fmt.Sprint(orderinfo.OrderCompute.UseOrderCount)