供应商模块保存和更改接口改动

controllers/supply_order_api_contorller.go

@@ -183,7 +183,6 @@ func (this *SupplyOrderApiController) GetSupplyList() {
 
 //保存供应商及联系人（用于更改）
 func (this *SupplyOrderApiController) UpdateSupply() {
-	fmt.Printf("HAHHAH")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -204,9 +203,9 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	}
 	//supplierid, _ := this.GetInt64("id") //供应商id
 	//fmt.Println(dataBody["id"])
-	utils.InfoLog("+++++++++++++前++++++++++++++++++", dataBody["id"])
+	//utils.InfoLog("+++++++++++++前++++++++++++++++++", dataBody["id"])
 	supplierid := int64(dataBody["id"].(float64))
-	utils.InfoLog("+++++++++++++后++++++++++++++++++", supplierid)
+	//utils.InfoLog("+++++++++++++后++++++++++++++++++", supplierid)
 	if supplierid == 0 {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
 		return
@@ -235,7 +234,14 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 		}
 	}
 	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
-	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
+	if dataBody["suppliertype"] == "" {
+		var tmp int64 = 0
+		dataBody["suppliertype"] = tmp
+	}
+	if dataBody["vatrate"] == "" {
+		dataBody["vatrate"] = 0
+	}
+	supplierType := dataBody["suppliertype"].(int64) //供应商类别
 	//vatRate, _ := this.GetFloat("vatrate")           //增值税税率
 	vatRate, _ := dataBody["suppliertype"].(float64) //增值税税率
 	//number := this.GetString("number")               //纳税人识别号
@@ -266,7 +272,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 			tmodify := this.GetAdminUserInfo().AdminUser.Id
 			err = service.UpdateSupplyAndContact(thisStockIn, supplierid, orgId, supplierType, tmodify, supplierCode, supplierName, number, bank, bankAccount, vatRate)
 			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 				return
 			}
 		} else {
@@ -419,9 +425,16 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号重复")
 		return
 	}
-	//supplierType, _ := this.GetInt64("suppliertype") //供应商类别
-	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
-	//vatRate, _ := this.GetFloat("vatrate")           //增值税税率
+	if dataBody["suppliertype"] == "" {
+		var tmp int64 = 0
+		dataBody["suppliertype"] = tmp
+	}
+	if dataBody["vatrate"] == "" {
+		dataBody["vatrate"] = 0
+	}
+	//supplierType, _ := this.GetInt64("suppliertype")
+	supplierType := dataBody["suppliertype"].(int64) //供应商类别
+	//vatRate, _ := this.GetFloat("vatrate")
 	vatRate, _ := dataBody["suppliertype"].(float64) //增值税税率
 	//number := this.GetString("number")
 	number := dataBody["number"].(string)
@@ -450,7 +463,7 @@ func (this *SupplyOrderApiController) SaveSupply() {
 			tcreater := this.GetAdminUserInfo().AdminUser.Id
 			err = service.SaveSupplyAndContact(thisStockIn, orgId, supplierType, tcreater, supplierCode, supplierName, number, bank, bankAccount, vatRate)
 			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 				return
 			}
 		} else {

service/supply_service.go

@@ -52,6 +52,9 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 	for _, item := range thisStockIn {
 		items := item.(map[string]interface{})
 		//查询是否
+		if items["id"] == "" {
+			items["id"] = "0"
+		}
 		id, _ := strconv.ParseInt(items["id"].(string), 10, 64)
 		name := items["name"].(string)
 		phone := items["phone"].(string)