更新

@@ -15,4 +15,6 @@ type ListOrderBaseQuery struct {
 	PartnerCategory int    `json:"partnerCategory"`
 	PartnerCategory int    `json:"partnerCategory"`
 	UpdateTimeBegin string `json:"updateTimeBegin"`
 	UpdateTimeBegin string `json:"updateTimeBegin"`
 	UpdateTimeEnd   string `json:"updateTimeEnd"`
 	UpdateTimeEnd   string `json:"updateTimeEnd"`
+	CreateTimeBegin string `json:"createTimeBegin"`
+	CreateTimeEnd   string `json:"createTimeEnd"`
 }
 }

@@ -8,6 +8,8 @@ type ListOrderBonusQuery struct {
 	CompanyId       int64 `json:"companyId"`
 	CompanyId       int64 `json:"companyId"`
 	PartnerCategory int   `json:"partnerCategory"`
 	PartnerCategory int   `json:"partnerCategory"`
 	//订单类型
 	//订单类型
-	OrderType     int    `json:"orderType"`
-	PartnerOrCode string `json:"partnerOrCode"`
+	OrderType       int    `json:"orderType"`
+	PartnerOrCode   string `json:"partnerOrCode"`
+	CreateTimeBegin string `json:"createTimeBegin"`
+	CreateTimeEnd   string `json:"createTimeEnd"`
 }
 }

@@ -57,6 +57,7 @@ func (service OrderInfoService) PageListOrderBase(listOrderQuery query.ListOrder
 		listOrderQuery.OrderType,
 		listOrderQuery.OrderType,
 		listOrderQuery.PartnerOrCode,
 		listOrderQuery.PartnerOrCode,
 		[2]string{listOrderQuery.UpdateTimeBegin, listOrderQuery.UpdateTimeEnd},
 		[2]string{listOrderQuery.UpdateTimeBegin, listOrderQuery.UpdateTimeEnd},
+		[2]string{listOrderQuery.CreateTimeBegin, listOrderQuery.UpdateTimeEnd},
 		listOrderQuery.PartnerCategory,
 		listOrderQuery.PartnerCategory,
 		listOrderQuery.Limit, listOrderQuery.Offset,
 		listOrderQuery.Limit, listOrderQuery.Offset,
 	)
 	)
@@ -806,6 +807,7 @@ func (service OrderInfoService) PageListOrderBonus(listOrderQuery query.ListOrde
 		listOrderQuery.OrderType,
 		listOrderQuery.OrderType,
 		listOrderQuery.PartnerOrCode,
 		listOrderQuery.PartnerOrCode,
 		listOrderQuery.PartnerCategory,
 		listOrderQuery.PartnerCategory,
+		[2]string{listOrderQuery.CreateTimeBegin, listOrderQuery.CreateTimeEnd},
 		listOrderQuery.Limit,
 		listOrderQuery.Limit,
 		listOrderQuery.Offset,
 		listOrderQuery.Offset,
 	)
 	)

@@ -501,9 +501,9 @@ func (service UsersService) EditUserPermission(cmd command.EditUserPermissionCom
 		partners = append(partners, p)
 		partners = append(partners, p)
 	}
 	}
 	for i := range permissionList {
 	for i := range permissionList {
-		if permissionList[i].Code == domain.PERMINSSION_ADMIN_USER && !usersData.IsSuperAdmin() {
-			return lib.ThrowError(lib.BUSINESS_ERROR, "操作异常")
-		}
+		// if permissionList[i].Code == domain.PERMINSSION_ADMIN_USER && !usersData.IsSuperAdmin() {
+		// 	return lib.ThrowError(lib.BUSINESS_ERROR, "操作异常")
+		// }
 		p := domain.AdminPermissionBase{
 		p := domain.AdminPermissionBase{
 			Id:   permissionList[i].Id,
 			Id:   permissionList[i].Id,
 			Code: permissionList[i].Code,
 			Code: permissionList[i].Code,

@@ -182,18 +182,18 @@ func (order *OrderBase) AddGoods(goods []OrderGood) {
 	order.Compute()
 	order.Compute()
 }
 }
 
 
-func (order *OrderBase) DeleteGoods(goodIds []int64) {
-	var newGoods []OrderGood
-	for i := range order.Goods {
-		for _, goodId := range goodIds {
-			order.Goods[i].Id = goodId
-			continue
-		}
-		newGoods = append(newGoods, order.Goods[i])
-	}
-	order.Goods = newGoods
-	order.Compute()
-}
+// func (order *OrderBase) DeleteGoods(goodIds []int64) {
+// 	var newGoods []OrderGood
+// 	for i := range order.Goods {
+// 		for _, goodId := range goodIds {
+// 			order.Goods[i].Id = goodId
+// 			continue
+// 		}
+// 		newGoods = append(newGoods, order.Goods[i])
+// 	}
+// 	order.Goods = newGoods
+// 	order.Compute()
+// }
 
 
 //Compute 数据汇总核算
 //Compute 数据汇总核算
 func (order *OrderBase) Compute() error {
 func (order *OrderBase) Compute() error {

@@ -43,6 +43,7 @@ type GoodCompute struct {
 	//合伙人分红支出
 	//合伙人分红支出
 	PartnerBonusExpense float64 `json:"partnerBonusExpense"`
 	PartnerBonusExpense float64 `json:"partnerBonusExpense"`
 }
 }
+
 type OrderGoodRemarkReason struct {
 type OrderGoodRemarkReason struct {
 	ModifyGoodNumber          string `json:"modifyGoodNumber"`          //货品数量变更的理由
 	ModifyGoodNumber          string `json:"modifyGoodNumber"`          //货品数量变更的理由
 	ModifyPartnerBonusPercent string `json:"modifyPartnerBonusPercent"` //合伙人分红比例变更的理由
 	ModifyPartnerBonusPercent string `json:"modifyPartnerBonusPercent"` //合伙人分红比例变更的理由

@@ -51,7 +51,7 @@ func (dao OrderBaseDao) DeliveryCodeExist(code string, companyId int64, notId ..
 //orderType 订单类型
 //orderType 订单类型
 //partnerOrCode 合伙人姓名或订单号或发货单号
 //partnerOrCode 合伙人姓名或订单号或发货单号
 func (dao OrderBaseDao) OrderBonusListByCondition(companyId int64, orderType int, partnerOrCode string,
 func (dao OrderBaseDao) OrderBonusListByCondition(companyId int64, orderType int, partnerOrCode string,
-	partnerCategory int, limit, offset int) ([]models.OrderBase, int, error) {
+	partnerCategory int, createTime [2]string, limit, offset int) ([]models.OrderBase, int, error) {
 	tx := dao.transactionContext.GetDB()
 	tx := dao.transactionContext.GetDB()
 	var orders []models.OrderBase
 	var orders []models.OrderBase
 	query := tx.Model(&orders).Where("order_base.company_id=?", companyId)
 	query := tx.Model(&orders).Where("order_base.company_id=?", companyId)
@@ -63,6 +63,15 @@ func (dao OrderBaseDao) OrderBonusListByCondition(companyId int64, orderType int
 	if partnerCategory > 0 {
 	if partnerCategory > 0 {
 		query = query.Where(`order_base.partner_category@>'{"id":?}'`, partnerCategory)
 		query = query.Where(`order_base.partner_category@>'{"id":?}'`, partnerCategory)
 	}
 	}
+
+	if len(createTime[0]) > 0 {
+		query = query.Where(`order_base.create_time>=?`, createTime[0])
+	}
+
+	if len(createTime[1]) > 0 {
+		query = query.Where(`order_base.create_time<=?`, createTime[1])
+	}
+
 	if len(partnerOrCode) > 0 {
 	if len(partnerOrCode) > 0 {
 		query = query.Join("LEFT JOIN partner_info as p ON order_base.partner_id=p.id").
 		query = query.Join("LEFT JOIN partner_info as p ON order_base.partner_id=p.id").
 			WhereGroup(func(q *orm.Query) (*orm.Query, error) {
 			WhereGroup(func(q *orm.Query) (*orm.Query, error) {
@@ -101,6 +110,7 @@ type CustomOrderBonusForExcel struct {
 //@param orderType 订单类型
 //@param orderType 订单类型
 //@param partnerOrCode 合伙人姓名或订单号或发货单号
 //@param partnerOrCode 合伙人姓名或订单号或发货单号
 //@param partnerCategory 合伙人类型id
 //@param partnerCategory 合伙人类型id
+//@param createTime 订单的创建时间范围"[开始时间,结束时间]" 时间格式"2006-01-02 15:04:05+07"
 //@return result 查询结果数据
 //@return result 查询结果数据
 func (dao OrderBaseDao) OrderBonusListForExcel(companyId int64, orderType int, partnerOrCode string,
 func (dao OrderBaseDao) OrderBonusListForExcel(companyId int64, orderType int, partnerOrCode string,
 	partnerCategory int) (result []CustomOrderBonusForExcel, err error) {
 	partnerCategory int) (result []CustomOrderBonusForExcel, err error) {
@@ -168,8 +178,9 @@ func (dao OrderBaseDao) OrderBonusListForExcel(companyId int64, orderType int, p
 //@param partnerOrCode 合伙人姓名或订单号或发货单号
 //@param partnerOrCode 合伙人姓名或订单号或发货单号
 //@param partnerCategory 合伙人类型id
 //@param partnerCategory 合伙人类型id
 //@param updateTime 订单更新时间范围"[开始时间,结束时间]",时间格式"2006-01-02 15:04:05+07"
 //@param updateTime 订单更新时间范围"[开始时间,结束时间]",时间格式"2006-01-02 15:04:05+07"
+//@param createTime 订单的创建时间范围"[开始时间,结束时间]" 时间格式"2006-01-02 15:04:05+07"
 func (dao OrderBaseDao) OrderListByCondition(companyId int64, orderType int, partnerOrCode string,
 func (dao OrderBaseDao) OrderListByCondition(companyId int64, orderType int, partnerOrCode string,
-	updateTime [2]string, partnerCategory int, limit, offset int) ([]models.OrderBase, int, error) {
+	updateTime [2]string, createTime [2]string, partnerCategory int, limit, offset int) ([]models.OrderBase, int, error) {
 	tx := dao.transactionContext.GetDB()
 	tx := dao.transactionContext.GetDB()
 	var orders []models.OrderBase
 	var orders []models.OrderBase
 	query := tx.Model(&orders).Where("order_base.company_id=?", companyId)
 	query := tx.Model(&orders).Where("order_base.company_id=?", companyId)
@@ -187,6 +198,13 @@ func (dao OrderBaseDao) OrderListByCondition(companyId int64, orderType int, par
 	if len(updateTime[1]) > 0 {
 	if len(updateTime[1]) > 0 {
 		query = query.Where(`order_base.update_time<=?`, updateTime[1])
 		query = query.Where(`order_base.update_time<=?`, updateTime[1])
 	}
 	}
+	if len(createTime[0]) > 0 {
+		query = query.Where(`order_base.create_time>=?`, createTime[0])
+	}
+	if len(createTime[1]) > 0 {
+		query = query.Where(`order_base.create_time<=?`, createTime[1])
+	}
+
 	if len(partnerOrCode) > 0 {
 	if len(partnerOrCode) > 0 {
 		query = query.Join("LEFT JOIN partner_info as p ON order_base.partner_id=p.id").
 		query = query.Join("LEFT JOIN partner_info as p ON order_base.partner_id=p.id").
 			WhereGroup(func(q *orm.Query) (*orm.Query, error) {
 			WhereGroup(func(q *orm.Query) (*orm.Query, error) {

@@ -116,7 +116,7 @@ func (repository OrderBaseRepository) Find(queryOption domain.OrderBaseFindQuery
 		err          error
 		err          error
 		ordersReturn = make([]domain.OrderBase, 0)
 		ordersReturn = make([]domain.OrderBase, 0)
 	)
 	)
-	query = query.Order("order_base.id DESC")
+	query = query.Order("order_base.create_time DESC")
 	count, err := query.SelectAndCount()
 	count, err := query.SelectAndCount()
 	if err != nil {
 	if err != nil {
 		return ordersReturn, 0, err
 		return ordersReturn, 0, err

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
 	"strconv"
 	"strconv"
+	"time"
 
 
 	"github.com/astaxie/beego/logs"
 	"github.com/astaxie/beego/logs"
 	orderCmd "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/orderinfo/command"
 	orderCmd "gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/orderinfo/command"
@@ -32,11 +33,12 @@ func (c *OrderDividendController) Prepare() {
 //PageListOrderDividend 获取实发订单分红列表
 //PageListOrderDividend 获取实发订单分红列表
 func (c *OrderDividendController) PageListOrderDividend() {
 func (c *OrderDividendController) PageListOrderDividend() {
 	type Parameter struct {
 	type Parameter struct {
-		SearchWord        string `json:"searchWord"`
-		OrderType         int    `json:"orderType"`
-		PageSize          int    `json:"pageSize"`
-		PageNumber        int    `json:"pageNumber"`
-		PartnerCategoryId int    `json:"partnerCategoryId"`
+		SearchWord        string   `json:"searchWord"`
+		OrderType         int      `json:"orderType"`
+		PageSize          int      `json:"pageSize"`
+		PageNumber        int      `json:"pageNumber"`
+		PartnerCategoryId int      `json:"partnerCategoryId"`
+		CreateTime        []string `json:"createTime"`
 	}
 	}
 	var (
 	var (
 		param Parameter
 		param Parameter
@@ -59,6 +61,33 @@ func (c *OrderDividendController) PageListOrderDividend() {
 	if param.PageSize == 0 {
 	if param.PageSize == 0 {
 		param.PageSize = 20
 		param.PageSize = 20
 	}
 	}
+
+	var (
+		createTimeBegin string
+		createTimeEnd   string
+	)
+	if len(param.CreateTime) > 0 {
+		if len(param.CreateTime[0]) > 0 {
+			t, err := time.ParseInLocation("2006-01-02", param.CreateTime[0], time.Local)
+			if err != nil {
+				c.ResponseError(errors.New("UpdateTimeBegin 时间格式错误"))
+				return
+			}
+			createTimeBegin = t.Format("2006-01-02 15:04:05-07")
+		}
+	}
+	if len(param.CreateTime) > 1 {
+		if len(param.CreateTime[1]) > 0 {
+			t, err := time.ParseInLocation("2006-01-02", param.CreateTime[1], time.Local)
+			if err != nil {
+				c.ResponseError(errors.New("UpdateTimeEnd 时间格式错误"))
+				return
+			}
+			//设定时间边界
+			t = t.Add(86399 * time.Second)
+			createTimeEnd = t.Format("2006-01-02 15:04:05-07")
+		}
+	}
 	companyId := c.GetUserCompany()
 	companyId := c.GetUserCompany()
 	orderSrv := orderService.NewOrderInfoService(nil)
 	orderSrv := orderService.NewOrderInfoService(nil)
 	resp, cnt, err := orderSrv.PageListOrderBonus(orderQuery.ListOrderBonusQuery{
 	resp, cnt, err := orderSrv.PageListOrderBonus(orderQuery.ListOrderBonusQuery{
@@ -68,6 +97,8 @@ func (c *OrderDividendController) PageListOrderDividend() {
 		Offset:          (param.PageNumber - 1) * param.PageSize,
 		Offset:          (param.PageNumber - 1) * param.PageSize,
 		CompanyId:       companyId,
 		CompanyId:       companyId,
 		PartnerCategory: param.PartnerCategoryId,
 		PartnerCategory: param.PartnerCategoryId,
+		CreateTimeBegin: createTimeBegin,
+		CreateTimeEnd:   createTimeEnd,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		c.ResponseError(err)
 		c.ResponseError(err)

@@ -416,6 +416,7 @@ func (c *OrderInfoController) PageListOrderReal() {
 		PageSize        int      `json:"pageSize"`
 		PageSize        int      `json:"pageSize"`
 		PageNumber      int      `json:"pageNumber"`
 		PageNumber      int      `json:"pageNumber"`
 		UpdateTime      []string `json:"updateTime"`
 		UpdateTime      []string `json:"updateTime"`
+		CreateTime      []string `json:"createTime"`
 	}
 	}
 	var (
 	var (
 		param Parameter
 		param Parameter
@@ -458,6 +459,33 @@ func (c *OrderInfoController) PageListOrderReal() {
 			updateTimeEnd = t.Format("2006-01-02 15:04:05-07")
 			updateTimeEnd = t.Format("2006-01-02 15:04:05-07")
 		}
 		}
 	}
 	}
+	var (
+		createTimeBegin string
+		createTimeEnd   string
+	)
+	if len(param.CreateTime) > 0 {
+		if len(param.CreateTime[0]) > 0 {
+			t, err := time.ParseInLocation("2006-01-02", param.CreateTime[0], time.Local)
+			if err != nil {
+				c.ResponseError(errors.New("UpdateTimeBegin 时间格式错误"))
+				return
+			}
+			createTimeBegin = t.Format("2006-01-02 15:04:05-07")
+		}
+	}
+	if len(param.CreateTime) > 1 {
+		if len(param.CreateTime[1]) > 0 {
+			t, err := time.ParseInLocation("2006-01-02", param.CreateTime[1], time.Local)
+			if err != nil {
+				c.ResponseError(errors.New("UpdateTimeEnd 时间格式错误"))
+				return
+			}
+			//设定时间边界
+			t = t.Add(86399 * time.Second)
+			createTimeEnd = t.Format("2006-01-02 15:04:05-07")
+		}
+	}
+
 	companyId := c.GetUserCompany()
 	companyId := c.GetUserCompany()
 	orderSrv := orderService.NewOrderInfoService(nil)
 	orderSrv := orderService.NewOrderInfoService(nil)
 	orderinfos, cnt, err := orderSrv.PageListOrderBase(orderQuery.ListOrderBaseQuery{
 	orderinfos, cnt, err := orderSrv.PageListOrderBase(orderQuery.ListOrderBaseQuery{
@@ -469,6 +497,8 @@ func (c *OrderInfoController) PageListOrderReal() {
 		PartnerCategory: param.PartnerCategory,
 		PartnerCategory: param.PartnerCategory,
 		UpdateTimeBegin: updateTimeBegin,
 		UpdateTimeBegin: updateTimeBegin,
 		UpdateTimeEnd:   updateTimeEnd,
 		UpdateTimeEnd:   updateTimeEnd,
+		CreateTimeBegin: createTimeBegin,
+		CreateTimeEnd:   createTimeEnd,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		c.ResponseError(err)
 		c.ResponseError(err)

@@ -208,11 +208,12 @@ func (c *PartnerInfoController) GetPartnerInfo() {
 	return
 	return
 }
 }
 
 
-//PartnerInfoSetState 合伙人批量禁用
+//PartnerInfoSetState 合伙人批量禁用.启用
 func (c *PartnerInfoController) PartnerInfoSetState() {
 func (c *PartnerInfoController) PartnerInfoSetState() {
 	//用与适配前端定义的数据结构
 	//用与适配前端定义的数据结构
 	type Parameter struct {
 	type Parameter struct {
-		Id []int64 `json:"id"`
+		Id     []int64 `json:"id"`
+		Status int     `json:"status"`
 	}
 	}
 	var (
 	var (
 		param Parameter
 		param Parameter
@@ -224,10 +225,23 @@ func (c *PartnerInfoController) PartnerInfoSetState() {
 		return
 		return
 	}
 	}
 	comanyId := c.GetUserCompany()
 	comanyId := c.GetUserCompany()
-	cmd := partnerInfoCmd.StatusPartnerInfoCommand{
-		Ids:       param.Id,
-		CompanyId: comanyId,
-		Status:    domain.PARTNER_STATUS_NO,
+	var cmd partnerInfoCmd.StatusPartnerInfoCommand
+	switch param.Status {
+	case 0:
+		cmd = partnerInfoCmd.StatusPartnerInfoCommand{
+			Ids:       param.Id,
+			CompanyId: comanyId,
+			Status:    domain.PARTNER_STATUS_NO,
+		}
+	case 1:
+		cmd = partnerInfoCmd.StatusPartnerInfoCommand{
+			Ids:       param.Id,
+			CompanyId: comanyId,
+			Status:    domain.PARTNER_STATUS_YES,
+		}
+	default:
+		c.ResponseError(errors.New("参数错误"))
+		return
 	}
 	}
 	newPartnerService := partnerInfoService.NewPartnerInfoService(nil)
 	newPartnerService := partnerInfoService.NewPartnerInfoService(nil)
 	err = newPartnerService.UpdateStatus(cmd)
 	err = newPartnerService.UpdateStatus(cmd)

@@ -80,9 +80,6 @@ func (c *UserController) BeforeEditUser() {
 	}
 	}
 	var rspData []map[string]interface{}
 	var rspData []map[string]interface{}
 	for i := range allPermission {
 	for i := range allPermission {
-		if allPermission[i].Code == domain.PERMINSSION_ADMIN_USER {
-			continue
-		}
 		m := map[string]interface{}{
 		m := map[string]interface{}{
 			"id":             allPermission[i].Id,
 			"id":             allPermission[i].Id,
 			"permissionName": allPermission[i].Name,
 			"permissionName": allPermission[i].Name,