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

@@ -10,6 +10,8 @@ copyrequestbody = true
 enablexsrf = false
 enablexsrf = false
 xsrfkey = asdfioerjlasdfmFADFOEJF2323SDFF
 xsrfkey = asdfioerjlasdfmFADFOEJF2323SDFF
 xsrfexpire = 3600
 xsrfexpire = 3600
+#是否将错误信息进行渲染
+EnableErrorsRender =false
 [lang]
 [lang]
 types = en-US|zh-CN
 types = en-US|zh-CN
 names = English|简体中文
 names = English|简体中文

@@ -88,7 +88,8 @@ func (adminUserSrv AdminUserService) SaveAdminUser(saveUserCmd *command.SaveAdmi
 		permissionRepository = value
 		permissionRepository = value
 	}
 	}
 	permissions, err = permissionRepository.Find(domain.AdminPermissionFindQuery{
 	permissions, err = permissionRepository.Find(domain.AdminPermissionFindQuery{
-		IdsIn: saveUserCmd.PermissionId,
+		IdsIn:   saveUserCmd.PermissionId,
+		NotCode: []string{domain.PERMINSSION_ADMIN_USER},
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, lib.ThrowError(lib.INTERNAL_SERVER_ERROR, err.Error())

@@ -246,10 +246,12 @@ func (service OrderService) UpdateOrderPurpose(command command.UpdateOrderComman
 	}
 	}
 	err = orderData.Update(map[string]interface{}{
 	err = orderData.Update(map[string]interface{}{
 		//订单编号
 		//订单编号
-		"orderCode":   command.OrderCode,
-		"oderName":    command.OrderName,
-		"orderCount":  command.OrderCount,
-		"orderAmount": command.OrderAmount,
+		"orderCode":         command.OrderCode,
+		"oderName":          command.OrderName,
+		"orderCount":        command.OrderCount,
+		"orderAmount":       command.OrderAmount,
+		"orderActualCount":  command.OrderCount,
+		"orderActualAmount": command.OrderAmount,
 		"buyer": domain.Buyer{
 		"buyer": domain.Buyer{
 			BuyerName:       orderData.Buyer.BuyerName,
 			BuyerName:       orderData.Buyer.BuyerName,
 			ContactInfo:     command.BuyerPhone,
 			ContactInfo:     command.BuyerPhone,

@@ -82,7 +82,7 @@ func (reponsitory AdminUserRepository) addAdminUser(adminuser *domain.AdminUser)
 		AdminName:  adminuser.AdminName,
 		AdminName:  adminuser.AdminName,
 		Password:   adminuser.Password,
 		Password:   adminuser.Password,
 		IsDefault:  false,
 		IsDefault:  false,
-		IsUsable:   true,
+		IsUsable:   adminuser.IsUsable,
 		Permission: adminuser.Permission,
 		Permission: adminuser.Permission,
 	}
 	}
 	//添加用户数据
 	//添加用户数据

@@ -20,7 +20,7 @@ func (c *CommonController) Prepare() {
 // GetPartnerList 下拉选项数据通用接口，获取合伙人列表
 // GetPartnerList 下拉选项数据通用接口，获取合伙人列表
 func (c *CommonController) GetPartnerList() {
 func (c *CommonController) GetPartnerList() {
 	query := partnerQuery.ListPartnerInfoQuery{
 	query := partnerQuery.ListPartnerInfoQuery{
-		Limit:  2000,
+		Limit:  5000,
 		Offset: 0,
 		Offset: 0,
 	}
 	}
 	newPartnerService := partnerInfoService.NewPartnerInfoService(nil)
 	newPartnerService := partnerInfoService.NewPartnerInfoService(nil)