押金管理bug修改

controllers/manager_center_api_controller.go

@@ -41,6 +41,7 @@ func ManagerCenterRegistRouters() {
 	//经销商
 	beego.Router("/api/stock/dealer/create", &ManagerCenterApiController{}, "post:CreateDealer")
 	beego.Router("/api/stock/dealer/modify", &ManagerCenterApiController{}, "post:ModifyDealer")
+	//经过测试这个接口完全不会执行，因为被另一个路由占用了
 	beego.Router("/api/stock/dealer/list", &ManagerCenterApiController{}, "get:GetDealersList")
 	beego.Router("/api/stock/dealer/delete", &ManagerCenterApiController{}, "post:DeleteDealer")
 	beego.Router("/api/stock/dealer/get", &ManagerCenterApiController{}, "get:GetDealer")
@@ -48,6 +49,7 @@ func ManagerCenterRegistRouters() {
 	//厂商
 	beego.Router("/api/stock/manufacturer/create", &ManagerCenterApiController{}, "post:CreateManufacturer")
 	beego.Router("/api/stock/manufacturer/modify", &ManagerCenterApiController{}, "post:ModifyManufacturer")
+	//经过测试这个接口也完全不会执行，因为被另一个路由占用了
 	beego.Router("/api/stock/manufacturer/list", &ManagerCenterApiController{}, "get:GetManufacturerList")
 	beego.Router("/api/stock/manufacturer/delete", &ManagerCenterApiController{}, "post:DeleteManufacturer")
 	beego.Router("/api/stock/manufacturer/get", &ManagerCenterApiController{}, "get:GetManufacturer")
@@ -1232,8 +1234,9 @@ func (c *ManagerCenterApiController) ModifyDealer() {
 func (c *ManagerCenterApiController) GetDealersList() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 7)
+	key, _ := c.GetInt64("key", 0)
 	adminUserInfo := c.GetAdminUserInfo()
-	deales, total, err := service.FindAllDealerList(adminUserInfo.CurrentOrgId, page, limit)
+	deales, total, err := service.FindAllDealerList(adminUserInfo.CurrentOrgId, page, limit, key)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"dealer": deales,
@@ -1381,8 +1384,9 @@ func (c *ManagerCenterApiController) ModifyManufacturer() {
 func (c *ManagerCenterApiController) GetManufacturerList() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
+	key, _ := c.GetInt64("key", 0)
 	adminUserInfo := c.GetAdminUserInfo()
-	manufacturer, total, err := service.FindAllManufacturerList(adminUserInfo.CurrentOrgId, page, limit)
+	manufacturer, total, err := service.FindAllManufacturerList(adminUserInfo.CurrentOrgId, page, limit, key)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"manufacturer": manufacturer,

controllers/stock_api_controller.go

@@ -19,11 +19,13 @@ func StockApiRegistRouters() {
 	beego.Router("/api/stock/dealer/create", &StockApiController{}, "post:CreateDealer")
 	beego.Router("/api/stock/dealer/modify", &StockApiController{}, "post:ModifyDealer")
 	beego.Router("/api/stock/dealer/list", &StockApiController{}, "get:GetDealersList")
+	beego.Router("/api/stock/dealer/getdealername", &StockApiController{}, "get:GetDealerName") //获取供应商名称
 	beego.Router("/api/stock/dealer/delete", &StockApiController{}, "post:DeleteDealer")
 	beego.Router("/api/stock/dealer/get", &StockApiController{}, "get:GetDealer")
 
 	beego.Router("/api/stock/manufacturer/create", &StockApiController{}, "post:CreateManufacturer")
 	beego.Router("/api/stock/manufacturer/modify", &StockApiController{}, "post:ModifyManufacturer")
+	beego.Router("/api/stock/manufacturer/getmanufacturername", &StockApiController{}, "get:GetManufacturerName") //获取生产厂商名称
 	beego.Router("/api/stock/manufacturer/list", &StockApiController{}, "get:GetManufacturerList")
 	beego.Router("/api/stock/manufacturer/delete", &StockApiController{}, "post:DeleteManufacturer")
 	beego.Router("/api/stock/manufacturer/get", &StockApiController{}, "get:GetManufacturer")
@@ -142,11 +144,19 @@ func (c *StockApiController) ModifyDealer() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+func (c *StockApiController) GetDealerName() {
+	adminUserInfo := c.GetAdminUserInfo()
+	list, _ := service.FindAllDealerName(adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
 func (c *StockApiController) GetDealersList() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 7)
+	key, _ := c.GetInt64("key", 0)
 	adminUserInfo := c.GetAdminUserInfo()
-	deales, total, err := service.FindAllDealerList(adminUserInfo.CurrentOrgId, page, limit)
+	deales, total, err := service.FindAllDealerList(adminUserInfo.CurrentOrgId, page, limit, key)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"dealer": deales,
@@ -308,11 +318,19 @@ func (c *StockApiController) ModifyManufacturer() {
 	}
 
 }
+func (c *StockApiController) GetManufacturerName() {
+	adminUserInfo := c.GetAdminUserInfo()
+	list, _ := service.FindAllManufacturerName(adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
 func (c *StockApiController) GetManufacturerList() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
+	key, _ := c.GetInt64("key", 0)
 	adminUserInfo := c.GetAdminUserInfo()
-	manufacturer, total, err := service.FindAllManufacturerList(adminUserInfo.CurrentOrgId, page, limit)
+	manufacturer, total, err := service.FindAllManufacturerList(adminUserInfo.CurrentOrgId, page, limit, key)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"manufacturer": manufacturer,

service/stock_service.go

@@ -38,10 +38,20 @@ func FindAllDealerTotal(orgId int64) (total int64) {
 	return
 }
 
-func FindAllDealerList(orgId int64, page int64, limit int64) (list []*models.Dealer, total int64, err error) {
+//获取经销商的名称
+func FindAllDealerName(orgId int64) (tmp []*models.Dealer, err error) {
+	err = readDb.Model(&models.Dealer{}).Where("org_id = ? and status = 1", orgId).Find(&tmp).Error
+	return
+}
+func FindAllDealerList(orgId int64, page int64, limit, key int64) (list []*models.Dealer, total int64, err error) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.Dealer{})
 	db = db.Where("org_id = ? AND status = 1", orgId)
+	if key != 0 {
+		db = db.Where("id = ? ", key)
+		offset = 0
+		limit = 10
+	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
 	return
 }
@@ -80,10 +90,21 @@ func ModifyManufacturer(manufacturer *models.Manufacturer) error {
 	return err
 }
 
-func FindAllManufacturerList(orgId int64, page int64, limit int64) (list []*models.Manufacturer, total int64, err error) {
+//获取生产厂商名称
+func FindAllManufacturerName(orgid int64) (tmp []*models.Manufacturer, err error) {
+	err = readDb.Model(&models.Manufacturer{}).Where("org_id = ? and status = 1", orgid).Find(&tmp).Error
+	return
+}
+
+func FindAllManufacturerList(orgId int64, page int64, limit, key int64) (list []*models.Manufacturer, total int64, err error) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.Manufacturer{})
 	db = db.Where("org_id = ? AND status = 1", orgId)
+	if key != 0 {
+		db = db.Where("id = ?", key)
+		offset = 0
+		limit = 10
+	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
 	return
 }