Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into dev

-package repository
-
-import (
-	"bytes"
-	"encoding/gob"
-	"fmt"
-	"github.com/go-pg/pg/v10/orm"
-	"github.com/linmadan/egglib-go/utils/snowflake"
-)
-
-var (
-	ERR_EMPTY_TC = fmt.Errorf("transactionContext参数不能为nil")
-)
-
-type Query struct {
-	*orm.Query
-	queryOptions map[string]interface{}
-	AffectRow    int
-}
-
-func NewQuery(query *orm.Query, queryOptions map[string]interface{}) *Query {
-	return &Query{
-		query,
-		queryOptions,
-		0,
-	}
-}
-
-func (query *Query) SetWhere(condition, key string) *Query {
-	if v, ok := query.queryOptions[key]; ok {
-		query.Where(condition, v)
-	}
-	return query
-}
-
-func (query *Query) SetLimit() *Query {
-	if offset, ok := query.queryOptions["offset"]; ok {
-		offset := offset.(int)
-		if offset > -1 {
-			query.Offset(offset)
-		}
-	} else {
-		query.Offset(0)
-	}
-	if limit, ok := query.queryOptions["limit"]; ok {
-		limit := limit.(int)
-		if limit > -1 {
-			query.Limit(limit)
-		} else {
-			query.Limit(20)
-		}
-	}
-	return query
-}
-
-func (query *Query) SetOrder(orderColumn string, key string) *Query {
-	//query.Order(condition...)
-	//return query
-	if v, ok := query.queryOptions[key]; ok {
-		query.Order(fmt.Sprintf("%v %v", orderColumn, v))
-	}
-	return query
-}
-
-func (query *Query) HandleError(err error, errMsg string) error {
-	if err.Error() == "pg: no rows in result set" {
-		return fmt.Errorf(errMsg)
-	} else {
-		return err
-	}
-}
-
-func NewSnowflakeId() (int64, error) {
-	IdWorker, err := snowflake.NewIdWorker(2)
-	if err != nil {
-		return 0, err
-	}
-	id, err := IdWorker.NextId()
-	return id, err
-}
-
-//GobModelTransform 模型转换
-func GobModelTransform(dst interface{}, src interface{}) error {
-	var data bytes.Buffer
-	enc := gob.NewEncoder(&data)
-	if err := enc.Encode(src); err != nil {
-		return err
-	}
-	dec := gob.NewDecoder(&data)
-	if err := dec.Decode(dst); err != nil {
-		return err
-	}
-	return nil
-}

@@ -90,8 +90,10 @@ func (c *OrderController) addOrderPurpose(param orderDetail) error {
 		OrderName: param.OrderName,
 		OrderName: param.OrderName,
 		//数量
 		//数量
 		OrderCount:       param.OrderNum,
 		OrderCount:       param.OrderNum,
+		OrderActualCount: param.OrderNum,
 		//订单金额
 		//订单金额
 		OrderAmount:       param.OrderPrice,
 		OrderAmount:       param.OrderPrice,
+		OrderActualAmount: param.OrderPrice,
 		//买家
 		//买家
 		BuyerName: param.Buyer,
 		BuyerName: param.Buyer,
 		//买家电话
 		//买家电话