修改了bug114和124

controllers/supply_order_api_contorller.go

@@ -237,11 +237,7 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商编号不能为空")
 		return
 	}
-	//supplierid, _ := this.GetInt64("id") //供应商id
-	//fmt.Println(dataBody["id"])
-	//utils.InfoLog("+++++++++++++前++++++++++++++++++", dataBody["id"])
 	supplierid := int64(dataBody["id"].(float64))
-	//utils.InfoLog("+++++++++++++后++++++++++++++++++", supplierid)
 	if supplierid == 0 {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "供应商id不能为空")
 		return
@@ -278,22 +274,21 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 		dataBody["vatrate"] = 0
 	}
 	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
-	//vatRate, _ := this.GetFloat("vatrate")           //增值税税率
-	vatRate, _ := dataBody["suppliertype"].(float64) //增值税税率
+	var tmpvarrate float64
+	datavarrate := dataBody["vatrate"]
+	switch datavarrate.(type) {
+	case float64:
+		tmpvarrate = datavarrate.(float64)
+	case string:
+		tmpvarrate, _ = strconv.ParseFloat(dataBody["vatrate"].(string), 64)
+	}
+	vatRate := tmpvarrate //增值税税率
 	//number := this.GetString("number")               //纳税人识别号
 	number := dataBody["number"].(string) //纳税人识别号
 	//bank := this.GetString("bank")                   //开户银行
 	bank := dataBody["bank"].(string) //纳税人识别号
 	//bankAccount := this.GetString("bankAccount")     //银行账号
 	bankAccount := dataBody["bankaccount"].(string)
-	//contacts := this.Get("contacts")//联系人
-	//dataBody := make(map[string]interface{}, 0)
-	//err = json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//if err != nil {
-	//	utils.ErrorLog(err.Error())
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
 	//保存联系人
 	if dataBody["contacts"] != nil && reflect.TypeOf(dataBody["contacts"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["contacts"].([]interface{})
@@ -409,6 +404,7 @@ func (this *SupplyOrderApiController) GetSupplyType() {
 
 //删除供应商及联系人
 func (this *SupplyOrderApiController) DelSupply() {
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//拿到供应商的id
 	suid, _ := this.GetInt64("id")
 	if suid == 0 {
@@ -418,7 +414,7 @@ func (this *SupplyOrderApiController) DelSupply() {
 	supply := models.SpSupplierName{
 		ID: suid,
 	}
-	err := service.DelSupply(supply)
+	err := service.DelSupply(supply, orgId)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -434,7 +430,10 @@ func (this *SupplyOrderApiController) DelSupply() {
 func (this *SupplyOrderApiController) DelContactOne() {
 	id, _ := this.GetInt64("id")
 	if id == 0 {
-		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人id不能为空")
+		//this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人id不能为空")
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": "删除成功,没有走数据库",
+		})
 		return
 	}
 	err := service.DelContactOne(id)
@@ -530,9 +529,17 @@ func (this *SupplyOrderApiController) SaveSupply() {
 	}
 	supplierType := int64(dataBody["suppliertype"].(float64)) //供应商类别
 	//vatRate, _ := this.GetFloat("vatrate")
-	vatRate, _ := dataBody["vatrate"].(float64) //增值税税率
-	//number := this.GetString("number")
-	number := dataBody["number"].(string)
+	var tmpvarrate float64
+	datavarrate := dataBody["vatrate"]
+	switch datavarrate.(type) {
+	case float64:
+		tmpvarrate = datavarrate.(float64)
+	case string:
+		tmpvarrate, _ = strconv.ParseFloat(dataBody["vatrate"].(string), 64)
+	}
+	vatRate := tmpvarrate //增值税税率
+	//number := dataBody["number"].(string)
+	number, _ := dataBody["number"].(string)
 	//bank := this.GetString("bank")
 	bank := dataBody["bank"].(string)
 	//bankAccount := this.GetString("bankAccount")

service/supply_service.go

@@ -166,8 +166,29 @@ func GetSupplyAndContactOne(id, orgId int64) (supply models.SpSupplierName, cont
 }
 
 //删除供应商及联系人
-func DelSupply(supply models.SpSupplierName) error {
-	err := XTWriteDB().Model(&supply).Update("status", 0).Error
+func DelSupply(supply models.SpSupplierName, orgId int64) error {
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//删除供应商
+	err := tx.Model(&supply).Update("status", 0).Error
+	if err != nil {
+		return err
+	}
+	var spcode models.SpSupplierName
+	//获取供应商编号
+	err = tx.Model(&models.SpSupplierName{}).Select("supplier_code").Where("user_org_id = ? and id = ?", orgId, supply.ID).First(&spcode).Error
+	if err != nil {
+		return err
+	}
+	//删除联系人
+	err = tx.Model(&models.SpSupplierContacts{}).Where("supplier_code = ? and user_org_id = ?", spcode.SupplierCode, orgId).Update("status", 0).Error
+
 	return err
 }