0.5.0版本 移除的功能 代码注释清理

@@ -6,7 +6,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"time"
 	"unicode/utf8"
 
 	"github.com/astaxie/beego/logs"
@@ -33,140 +32,140 @@ func (c *OrderInfoController) Prepare() {
 }
 
 //PageListOrderPurpose 分页获取意向订单列表
-func (c *OrderInfoController) PageListOrderPurpose() {
-	type Parameter struct {
-		SearchText string `json:"searchText"`
-		Partner    int64  `json:"partner"`
-		PageSize   int    `json:"pageSize"`
-		PageNumber int    `json:"pageNumber"`
-	}
-	var (
-		param Parameter
-		err   error
-	)
-	if err = c.BindJsonData(&param); err != nil {
-		logs.Error(err)
-		c.ResponseError(errors.New("json数据解析失败"))
-		return
-	}
-	if param.PageNumber == 0 {
-		param.PageNumber = 1
-	}
-	if param.PageSize == 0 {
-		param.PageSize = 20
-	}
-	companyId := c.GetUserCompany()
-	orderSrv := orderService.NewOrderInfoService(nil)
-	orderinfos, cnt, err := orderSrv.PageListOrderBase(orderQuery.ListOrderBaseQuery{
-		PartnerId: param.Partner,
-		OrderCode: param.SearchText,
-		OrderType: domain.OrderIntention,
-		Limit:     param.PageSize,
-		Offset:    (param.PageNumber - 1) * param.PageSize,
-		CompanyId: companyId,
-	})
-	if err != nil {
-		c.ResponseError(err)
-		return
-	}
-	rsp := []map[string]interface{}{}
-	for i := range orderinfos {
-		orderinfo := orderinfos[i]
-		m := map[string]interface{}{
-			"createTime": orderinfo.CreateTime.Local().Format("2006-01-02 15:04:05"),
-			"updateTime": orderinfo.UpdateTime.Local().Format("2006-01-02 15:04:05"),
-			"buyer":      orderinfo.Buyer.BuyerName,
-			"id":         orderinfo.Id,
-			"orderId":    orderinfo.OrderCode,
-			"partner":    orderinfo.PartnerInfo.PartnerName,
-			"orderNum":   orderinfo.OrderCompute.PlanOrderCount,
-			"orderPrice": orderinfo.OrderCompute.PlanOrderAmount,
-			"orderDist":  orderinfo.RegionInfo.RegionName,
-		}
-		rsp = append(rsp, m)
-	}
-	c.ResponsePageList(rsp, cnt, param.PageNumber)
-}
+// func (c *OrderInfoController) PageListOrderPurpose() {
+// 	type Parameter struct {
+// 		SearchText string `json:"searchText"`
+// 		Partner    int64  `json:"partner"`
+// 		PageSize   int    `json:"pageSize"`
+// 		PageNumber int    `json:"pageNumber"`
+// 	}
+// 	var (
+// 		param Parameter
+// 		err   error
+// 	)
+// 	if err = c.BindJsonData(&param); err != nil {
+// 		logs.Error(err)
+// 		c.ResponseError(errors.New("json数据解析失败"))
+// 		return
+// 	}
+// 	if param.PageNumber == 0 {
+// 		param.PageNumber = 1
+// 	}
+// 	if param.PageSize == 0 {
+// 		param.PageSize = 20
+// 	}
+// 	companyId := c.GetUserCompany()
+// 	orderSrv := orderService.NewOrderInfoService(nil)
+// 	orderinfos, cnt, err := orderSrv.PageListOrderBase(orderQuery.ListOrderBaseQuery{
+// 		PartnerId: param.Partner,
+// 		OrderCode: param.SearchText,
+// 		OrderType: domain.OrderIntention,
+// 		Limit:     param.PageSize,
+// 		Offset:    (param.PageNumber - 1) * param.PageSize,
+// 		CompanyId: companyId,
+// 	})
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 		return
+// 	}
+// 	rsp := []map[string]interface{}{}
+// 	for i := range orderinfos {
+// 		orderinfo := orderinfos[i]
+// 		m := map[string]interface{}{
+// 			"createTime": orderinfo.CreateTime.Local().Format("2006-01-02 15:04:05"),
+// 			"updateTime": orderinfo.UpdateTime.Local().Format("2006-01-02 15:04:05"),
+// 			"buyer":      orderinfo.Buyer.BuyerName,
+// 			"id":         orderinfo.Id,
+// 			"orderId":    orderinfo.OrderCode,
+// 			"partner":    orderinfo.PartnerInfo.PartnerName,
+// 			"orderNum":   orderinfo.OrderCompute.PlanOrderCount,
+// 			"orderPrice": orderinfo.OrderCompute.PlanOrderAmount,
+// 			"orderDist":  orderinfo.RegionInfo.RegionName,
+// 		}
+// 		rsp = append(rsp, m)
+// 	}
+// 	c.ResponsePageList(rsp, cnt, param.PageNumber)
+// }
 
 //GetOrderPurpose 获取意向订单详情
-func (c *OrderInfoController) GetOrderPurpose() {
-	type Parameter struct {
-		Id string `json:"id"`
-	}
-	var (
-		param Parameter
-		err   error
-	)
-	if err = c.BindJsonData(&param); err != nil {
-		logs.Error(err)
-		c.ResponseError(errors.New("json数据解析失败"))
-		return
-	}
-	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
-	companyId := c.GetUserCompany()
-	orderSrv := orderService.NewOrderInfoService(nil)
-	orderinfo, err := orderSrv.GetOrderDetail(orderQuery.GetOrderQuery{
-		OrderId:   orderid,
-		CompanyId: companyId,
-	})
-	if err != nil {
-		c.ResponseError(err)
-		return
-	}
-	if orderinfo.OrderType != domain.OrderIntention {
-		c.ResponseError(errors.New("参数错误"))
-		return
-	}
-	allGoods := []map[string]interface{}{}
-	for _, v := range orderinfo.Goods {
-		m := map[string]interface{}{
-			"id":           v.Id,
-			"productName":  v.GoodName,
-			"orderNum":     v.PlanGoodNumber,
-			"univalence":   v.Price,
-			"partnerRatio": v.PartnerBonusPercent,
-			"orderPrice":   v.GoodCompute.PlanAmount,
-		}
-		allGoods = append(allGoods, m)
-	}
-	rsp := map[string]interface{}{
-		"buyer":                      orderinfo.Buyer.BuyerName,
-		"id":                         orderinfo.Id,
-		"partnerID":                  orderinfo.PartnerInfo.Id,
-		"partner":                    orderinfo.PartnerInfo.PartnerName,
-		"orderDist":                  orderinfo.RegionInfo.RegionName,
-		"orderId":                    orderinfo.OrderCode,
-		"product":                    allGoods,
-		"commissionProportion":       orderinfo.SalesmanBonusPercent,
-		"orderNumCount":              orderinfo.OrderCompute.PlanOrderCount,
-		"orderAmountAdjustmentCount": orderinfo.OrderCompute.PlanOrderAmount,
-	}
-	c.ResponseData(rsp)
-}
+// func (c *OrderInfoController) GetOrderPurpose() {
+// 	type Parameter struct {
+// 		Id string `json:"id"`
+// 	}
+// 	var (
+// 		param Parameter
+// 		err   error
+// 	)
+// 	if err = c.BindJsonData(&param); err != nil {
+// 		logs.Error(err)
+// 		c.ResponseError(errors.New("json数据解析失败"))
+// 		return
+// 	}
+// 	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
+// 	companyId := c.GetUserCompany()
+// 	orderSrv := orderService.NewOrderInfoService(nil)
+// 	orderinfo, err := orderSrv.GetOrderDetail(orderQuery.GetOrderQuery{
+// 		OrderId:   orderid,
+// 		CompanyId: companyId,
+// 	})
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 		return
+// 	}
+// 	if orderinfo.OrderType != domain.OrderIntention {
+// 		c.ResponseError(errors.New("参数错误"))
+// 		return
+// 	}
+// 	allGoods := []map[string]interface{}{}
+// 	for _, v := range orderinfo.Goods {
+// 		m := map[string]interface{}{
+// 			"id":           v.Id,
+// 			"productName":  v.GoodName,
+// 			"orderNum":     v.PlanGoodNumber,
+// 			"univalence":   v.Price,
+// 			"partnerRatio": v.PartnerBonusPercent,
+// 			"orderPrice":   v.GoodCompute.PlanAmount,
+// 		}
+// 		allGoods = append(allGoods, m)
+// 	}
+// 	rsp := map[string]interface{}{
+// 		"buyer":                      orderinfo.Buyer.BuyerName,
+// 		"id":                         orderinfo.Id,
+// 		"partnerID":                  orderinfo.PartnerInfo.Id,
+// 		"partner":                    orderinfo.PartnerInfo.PartnerName,
+// 		"orderDist":                  orderinfo.RegionInfo.RegionName,
+// 		"orderId":                    orderinfo.OrderCode,
+// 		"product":                    allGoods,
+// 		"commissionProportion":       orderinfo.SalesmanBonusPercent,
+// 		"orderNumCount":              orderinfo.OrderCompute.PlanOrderCount,
+// 		"orderAmountAdjustmentCount": orderinfo.OrderCompute.PlanOrderAmount,
+// 	}
+// 	c.ResponseData(rsp)
+// }
 
 //RemoveOrderPurpose 删除意向订单
-func (c *OrderInfoController) RemoveOrderPurpose() {
-	type Parameter struct {
-		Id int64 `json:"id"`
-	}
-	var (
-		param Parameter
-		err   error
-	)
-	if err = c.BindJsonData(&param); err != nil {
-		logs.Error(err)
-		c.ResponseError(errors.New("json数据解析失败"))
-		return
-	}
-	companyId := c.GetUserCompany()
-	orderSrv := orderService.NewOrderInfoService(nil)
-	err = orderSrv.DeleteOrder(param.Id, companyId)
-	if err != nil {
-		c.ResponseError(err)
-		return
-	}
-	c.ResponseData(nil)
-}
+// func (c *OrderInfoController) RemoveOrderPurpose() {
+// 	type Parameter struct {
+// 		Id int64 `json:"id"`
+// 	}
+// 	var (
+// 		param Parameter
+// 		err   error
+// 	)
+// 	if err = c.BindJsonData(&param); err != nil {
+// 		logs.Error(err)
+// 		c.ResponseError(errors.New("json数据解析失败"))
+// 		return
+// 	}
+// 	companyId := c.GetUserCompany()
+// 	orderSrv := orderService.NewOrderInfoService(nil)
+// 	err = orderSrv.DeleteOrder(param.Id, companyId)
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 		return
+// 	}
+// 	c.ResponseData(nil)
+// }
 
 //postPurposeOrderDetail 请求添加/更新的订单数据
 type postPurposeOrderDetail struct {
@@ -252,34 +251,34 @@ func (postData *postOrderGood) Valid() error {
 	return nil
 }
 
-//UpdateOrderPurpose 更新意向订单
-func (c *OrderInfoController) UpdateOrderPurpose() {
-	//用与适配前端定义的数据结构
-	var (
-		param postPurposeOrderDetail
-		err   error
-	)
-	if err = c.BindJsonData(&param); err != nil {
-		logs.Error(err)
-		c.ResponseError(errors.New("json数据解析失败"))
-		return
-	}
-
-	if err := param.Valid(); err != nil {
-		c.ResponseError(err)
-		return
-	}
-	if param.Id == 0 {
-		err = c.addOrderPurpose(param)
-	} else {
-		err = c.editOrderPurpose(param)
-	}
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseData(nil)
-	return
-}
+// //UpdateOrderPurpose 更新意向订单
+// func (c *OrderInfoController) UpdateOrderPurpose() {
+// 	//用与适配前端定义的数据结构
+// 	var (
+// 		param postPurposeOrderDetail
+// 		err   error
+// 	)
+// 	if err = c.BindJsonData(&param); err != nil {
+// 		logs.Error(err)
+// 		c.ResponseError(errors.New("json数据解析失败"))
+// 		return
+// 	}
+
+// 	if err := param.Valid(); err != nil {
+// 		c.ResponseError(err)
+// 		return
+// 	}
+// 	if param.Id == 0 {
+// 		err = c.addOrderPurpose(param)
+// 	} else {
+// 		err = c.editOrderPurpose(param)
+// 	}
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 	}
+// 	c.ResponseData(nil)
+// 	return
+// }
 
 func (c *OrderInfoController) addOrderPurpose(param postPurposeOrderDetail) error {
 
@@ -364,49 +363,49 @@ func (postData *postOrderPurposeDelivery) Valid() error {
 }
 
 //OrderPurposeDelivery 发货 意向订单转实发单
-func (c *OrderInfoController) OrderPurposeDelivery() {
-	//用与适配前端定义的数据结构
-
-	var (
-		param postOrderPurposeDelivery
-		err   error
-	)
-	if err = c.BindJsonData(&param); err != nil {
-		logs.Error(err)
-		c.ResponseError(errors.New("json数据解析失败"))
-		return
-	}
-	param.ShipmentsId = strings.TrimSpace(param.ShipmentsId)
-	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
-	if orderid <= 0 {
-		c.ResponseError(errors.New("参数错误"))
-		return
-	}
-	if err = param.Valid(); err != nil {
-		c.ResponseError(err)
-		return
-	}
-	goods := []orderCmd.OrderGoodData{}
-	for _, v := range param.ProductDetail {
-		g := orderCmd.OrderGoodData{
-			Id: v.Id, GoodName: v.ProductName, PlanGoodNumber: v.OrderNum,
-			Price: v.Univalence, PartnerBonusPercent: v.PartnerRatio,
-		}
-		goods = append(goods, g)
-	}
-	companyId := c.GetUserCompany()
-	deliveryCommand := orderCmd.OrderDeliveryCommand{
-		OrderId: orderid, DeliveryCode: param.ShipmentsId,
-		DeliveryTime: time.Now(), Goods: goods, CompanyId: companyId,
-	}
-	orderSrv := orderService.NewOrderInfoService(nil)
-	err = orderSrv.Delivery(deliveryCommand)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	c.ResponseData(nil)
-	return
-}
+// func (c *OrderInfoController) OrderPurposeDelivery() {
+// 	//用与适配前端定义的数据结构
+
+// 	var (
+// 		param postOrderPurposeDelivery
+// 		err   error
+// 	)
+// 	if err = c.BindJsonData(&param); err != nil {
+// 		logs.Error(err)
+// 		c.ResponseError(errors.New("json数据解析失败"))
+// 		return
+// 	}
+// 	param.ShipmentsId = strings.TrimSpace(param.ShipmentsId)
+// 	orderid, _ := strconv.ParseInt(param.Id, 10, 64)
+// 	if orderid <= 0 {
+// 		c.ResponseError(errors.New("参数错误"))
+// 		return
+// 	}
+// 	if err = param.Valid(); err != nil {
+// 		c.ResponseError(err)
+// 		return
+// 	}
+// 	goods := []orderCmd.OrderGoodData{}
+// 	for _, v := range param.ProductDetail {
+// 		g := orderCmd.OrderGoodData{
+// 			Id: v.Id, GoodName: v.ProductName, PlanGoodNumber: v.OrderNum,
+// 			Price: v.Univalence, PartnerBonusPercent: v.PartnerRatio,
+// 		}
+// 		goods = append(goods, g)
+// 	}
+// 	companyId := c.GetUserCompany()
+// 	deliveryCommand := orderCmd.OrderDeliveryCommand{
+// 		OrderId: orderid, DeliveryCode: param.ShipmentsId,
+// 		DeliveryTime: time.Now(), Goods: goods, CompanyId: companyId,
+// 	}
+// 	orderSrv := orderService.NewOrderInfoService(nil)
+// 	err = orderSrv.Delivery(deliveryCommand)
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 	}
+// 	c.ResponseData(nil)
+// 	return
+// }
 
 //PageListOrderReal 获取实发订单列表
 func (c *OrderInfoController) PageListOrderReal() {