瀏覽代碼

二级库正式环境bug

mainqaq 3 年之前
父節點
當前提交
71b4bf25df
共有 2 個文件被更改,包括 20 次插入10 次删除
  1. 4 3
      controllers/secondary_order_api_contorller.go
  2. 16 7
      service/secondary_service.go

+ 4 - 3
controllers/secondary_order_api_contorller.go 查看文件

338
 		StorehouseAdminId: admin_id,
338
 		StorehouseAdminId: admin_id,
339
 		Ctime:             time.Now().Unix(),
339
 		Ctime:             time.Now().Unix(),
340
 	}
340
 	}
341
-	err = service.AddStroehouse(storehouse)
341
+	var shiwu string
342
+	shiwu, err = service.AddStroehouse(storehouse)
342
 	if err != nil {
343
 	if err != nil {
343
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "保存失败")
344
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "保存失败")
344
 		return
345
 		return
345
 	}
346
 	}
346
 	this.ServeSuccessJSON(map[string]interface{}{
347
 	this.ServeSuccessJSON(map[string]interface{}{
347
-		"list": "保存成功",
348
+		"list":  "保存成功",
349
+		"shiwu": shiwu,
348
 	})
350
 	})
349
 	return
351
 	return
350
 }
352
 }
1957
 	//viewModels, _, _ := service.GetAdminUsersAndLoginInfo(10164, 12123, 1, 100)
1959
 	//viewModels, _, _ := service.GetAdminUsersAndLoginInfo(10164, 12123, 1, 100)
1958
 	c, _ := service.Getcreateid(adminUserInfo.CurrentOrgId)
1960
 	c, _ := service.Getcreateid(adminUserInfo.CurrentOrgId)
1959
 	//c, _ := service.Getcreateid(10164)
1961
 	//c, _ := service.Getcreateid(10164)
1960
-	//c.Creator
1961
 	admin := []*service.AdminUserManageViewModel{} //记录当前管理员的信息
1962
 	admin := []*service.AdminUserManageViewModel{} //记录当前管理员的信息
1962
 	//去除禁用的角色
1963
 	//去除禁用的角色
1963
 	tmp := []*service.AdminUserManageViewModel{}
1964
 	tmp := []*service.AdminUserManageViewModel{}

+ 16 - 7
service/secondary_service.go 查看文件

109
 }
109
 }
110
 
110
 
111
 //新增仓库
111
 //新增仓库
112
-func AddStroehouse(storehouse models.Storehouse) error {
112
+func AddStroehouse(storehouse models.Storehouse) (shiwu string, err error) {
113
 	tx := XTWriteDB().Begin()
113
 	tx := XTWriteDB().Begin()
114
 	defer func() {
114
 	defer func() {
115
 		if err != nil {
115
 		if err != nil {
116
+			utils.ErrorLog("事务失败,原因为: %v", err)
117
+			shiwu = "失败"
116
 			tx.Rollback()
118
 			tx.Rollback()
117
 		} else {
119
 		} else {
120
+			shiwu = "成功"
118
 			tx.Commit()
121
 			tx.Commit()
119
 		}
122
 		}
120
 	}()
123
 	}()
121
 	//创建仓库
124
 	//创建仓库
122
-	err := tx.Create(&storehouse).Error
125
+	err = tx.Create(&storehouse).Error
123
 	if err != nil {
126
 	if err != nil {
124
-		return err
127
+		return shiwu, err
125
 	}
128
 	}
129
+	utils.ErrorLog("创建仓库成功")
126
 	var id models.Storehouse
130
 	var id models.Storehouse
127
 	//获取创建仓库的id
131
 	//获取创建仓库的id
128
 	err = tx.Model(&models.Storehouse{}).Select("id").Where("status = 1 and user_org_id = ?", storehouse.UserOrgId).Order("id desc").First(&id).Error
132
 	err = tx.Model(&models.Storehouse{}).Select("id").Where("status = 1 and user_org_id = ?", storehouse.UserOrgId).Order("id desc").First(&id).Error
129
 	if err != nil {
133
 	if err != nil {
130
-		return err
134
+		return shiwu, err
131
 	}
135
 	}
136
+
132
 	//判断是否存在仓库配置
137
 	//判断是否存在仓库配置
133
 	boolean := IsStorehouseconfigXT(storehouse.UserOrgId, tx)
138
 	boolean := IsStorehouseconfigXT(storehouse.UserOrgId, tx)
134
 	if boolean == false {
139
 	if boolean == false {
135
 		//创建仓库配置
140
 		//创建仓库配置
136
 		err = CreateStorehouseConfigXT(storehouse.UserOrgId, id.ID, tx)
141
 		err = CreateStorehouseConfigXT(storehouse.UserOrgId, id.ID, tx)
142
+		if err != nil {
143
+			utils.ErrorLog("仓库配置失败")
144
+			return shiwu, err
145
+		}
137
 	} else {
146
 	} else {
138
 		utils.ErrorLog("仓库配置已存在")
147
 		utils.ErrorLog("仓库配置已存在")
139
 	}
148
 	}
140
-
141
-	return err
149
+	utils.ErrorLog("结束")
150
+	return shiwu, err
142
 }
151
 }
143
 
152
 
144
 //修改仓库
153
 //修改仓库
209
 		Status:            1,
218
 		Status:            1,
210
 		Ctime:             time.Now().Unix(),
219
 		Ctime:             time.Now().Unix(),
211
 	}
220
 	}
212
-	err = AddStroehouse(storehouse)
221
+	_, err = AddStroehouse(storehouse)
213
 	return err
222
 	return err
214
 }
223
 }
215
 
224