二级库正式环境bug

controllers/secondary_order_api_contorller.go

@@ -338,13 +338,15 @@ func (this *SecondaryOrderApiController) AddStorehouse() {
 		StorehouseAdminId: admin_id,
 		Ctime:             time.Now().Unix(),
 	}
-	err = service.AddStroehouse(storehouse)
+	var shiwu string
+	shiwu, err = service.AddStroehouse(storehouse)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "保存失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": "保存成功",
+		"list":  "保存成功",
+		"shiwu": shiwu,
 	})
 	return
 }
@@ -1957,7 +1959,6 @@ func (this *SecondaryOrderApiController) GetuserName() {
 	//viewModels, _, _ := service.GetAdminUsersAndLoginInfo(10164, 12123, 1, 100)
 	c, _ := service.Getcreateid(adminUserInfo.CurrentOrgId)
 	//c, _ := service.Getcreateid(10164)
-	//c.Creator
 	admin := []*service.AdminUserManageViewModel{} //记录当前管理员的信息
 	//去除禁用的角色
 	tmp := []*service.AdminUserManageViewModel{}

service/secondary_service.go

@@ -109,36 +109,45 @@ func IsStorehouseAddress(orgid int64, storehouse_address string) (bool, error) {
 }
 
 //新增仓库
-func AddStroehouse(storehouse models.Storehouse) error {
+func AddStroehouse(storehouse models.Storehouse) (shiwu string, err error) {
 	tx := XTWriteDB().Begin()
 	defer func() {
 		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			shiwu = "失败"
 			tx.Rollback()
 		} else {
+			shiwu = "成功"
 			tx.Commit()
 		}
 	}()
 	//创建仓库
-	err := tx.Create(&storehouse).Error
+	err = tx.Create(&storehouse).Error
 	if err != nil {
-		return err
+		return shiwu, err
 	}
+	utils.ErrorLog("创建仓库成功")
 	var id models.Storehouse
 	//获取创建仓库的id
 	err = tx.Model(&models.Storehouse{}).Select("id").Where("status = 1 and user_org_id = ?", storehouse.UserOrgId).Order("id desc").First(&id).Error
 	if err != nil {
-		return err
+		return shiwu, err
 	}
+
 	//判断是否存在仓库配置
 	boolean := IsStorehouseconfigXT(storehouse.UserOrgId, tx)
 	if boolean == false {
 		//创建仓库配置
 		err = CreateStorehouseConfigXT(storehouse.UserOrgId, id.ID, tx)
+		if err != nil {
+			utils.ErrorLog("仓库配置失败")
+			return shiwu, err
+		}
 	} else {
 		utils.ErrorLog("仓库配置已存在")
 	}
-
-	return err
+	utils.ErrorLog("结束")
+	return shiwu, err
 }
 
 //修改仓库
@@ -209,7 +218,7 @@ func GetDefaultStorehouse(orgid int64) error {
 		Status:            1,
 		Ctime:             time.Now().Unix(),
 	}
-	err = AddStroehouse(storehouse)
+	_, err = AddStroehouse(storehouse)
 	return err
 }