修改bug

controllers/supply_order_api_contorller.go

@@ -289,25 +289,72 @@ func (this *SupplyOrderApiController) UpdateSupply() {
 	bank := dataBody["bank"].(string) //纳税人识别号
 	//bankAccount := this.GetString("bankAccount")     //银行账号
 	bankAccount := dataBody["bankaccount"].(string)
+	tmodify := this.GetAdminUserInfo().AdminUser.Id //修改者
 	//保存联系人
 	if dataBody["contacts"] != nil && reflect.TypeOf(dataBody["contacts"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["contacts"].([]interface{})
 		if len(thisStockIn) > 0 {
-			if len(thisStockIn) == 1 {
+			for _, v := range thisStockIn { //这个循环是用来检测当填了手机号时联系人不能为空
+				vtem := v.(map[string]interface{})
+				if vtem["phone"].(string) != "" && vtem["name"].(string) == "" {
+					this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人不能为空")
+					return
+				}
+			}
+			if len(thisStockIn) == 1 { //当只有一条联系人时强制设为首要联系人
 				for _, item := range thisStockIn {
 					items := item.(map[string]interface{})
 					items["is_first"] = 1
+					//如果电话和联系人都为空，不保存联系人
+					if items["phone"] == "" && items["name"] == "" {
+						upsupply := models.SpSupplierName{
+							ID:           supplierid,
+							SupplierCode: supplierCode,
+							SupplierName: supplierName,
+							SupplierType: supplierType,
+							VatRate:      vatRate,
+							Number:       number,
+							Bank:         bank,
+							BankAccount:  bankAccount,
+							Status:       1,
+							Mtime:        time.Now().Unix(),
+							Modify:       tmodify,
+						}
+						err = service.UpdateSupplyName(upsupply)
+						if err != nil {
+							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+							return
+						}
+					}
 				}
 			}
-			tmodify := this.GetAdminUserInfo().AdminUser.Id
 			err = service.UpdateSupplyAndContact(thisStockIn, supplierid, orgId, supplierType, tmodify, supplierCode, supplierName, number, bank, bankAccount, vatRate)
 			if err != nil {
 				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 				return
 			}
 		} else {
-			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人不能为空")
-			return
+			//如果联系人是空的，直接保存供应商
+			//更新供应商
+			upsupply := models.SpSupplierName{
+				ID:           supplierid,
+				SupplierCode: supplierCode,
+				SupplierName: supplierName,
+				SupplierType: supplierType,
+				VatRate:      vatRate,
+				Number:       number,
+				Bank:         bank,
+				BankAccount:  bankAccount,
+				Status:       1,
+				Mtime:        time.Now().Unix(),
+				Modify:       tmodify,
+			}
+			err = service.UpdateSupplyName(upsupply)
+			if err != nil {
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+				return
+			}
+
 		}
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -520,7 +567,7 @@ func (this *SupplyOrderApiController) SaveSupply() {
 		dataBody["suppliertype"] = tmp
 	}
 	if dataBody["vatrate"] == "" {
-		dataBody["vatrate"] = 0
+		dataBody["vatrate"] = "0"
 	}
 	//supplierType, _ := this.GetInt64("suppliertype")
 	if dataBody["suppliertype"] == "" || dataBody["suppliertype"] == 0 {
@@ -544,33 +591,74 @@ func (this *SupplyOrderApiController) SaveSupply() {
 	bank := dataBody["bank"].(string)
 	//bankAccount := this.GetString("bankAccount")
 	bankAccount := dataBody["bankaccount"].(string)
-
-	//contacts := this.Get("contacts")//联系人
-	//err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//if err != nil {
-	//	utils.ErrorLog(err.Error())
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
+	tcreater := this.GetAdminUserInfo().AdminUser.Id
 	//保存联系人
 	if dataBody["contacts"] != nil && reflect.TypeOf(dataBody["contacts"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["contacts"].([]interface{})
 		if len(thisStockIn) > 0 {
-			if len(thisStockIn) == 1 {
+			for _, v := range thisStockIn { //这个循环是用来检测当填了手机号时联系人不能为空
+				vtem := v.(map[string]interface{})
+				if vtem["phone"] != "" && vtem["name"] == nil {
+					this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人不能为空")
+					return
+				}
+			}
+			if len(thisStockIn) == 1 { //当只有一条联系人时强制设为首要联系人,
 				for _, item := range thisStockIn {
 					items := item.(map[string]interface{})
 					items["is_first"] = 1
+					//如果电话和联系人都为空，不保存联系人
+					if items["phone"] == "" && items["name"] == "" {
+						supply := models.SpSupplierName{
+							SupplierCode: supplierCode,
+							SupplierName: supplierName,
+							SupplierType: supplierType,
+							VatRate:      vatRate,
+							Number:       number,
+							Bank:         bank,
+							BankAccount:  bankAccount,
+							UserOrgId:    orgId,
+							Status:       1,
+							Ctime:        time.Now().Unix(),
+							Mtime:        0,
+							Creater:      tcreater,
+							Modify:       tcreater,
+						}
+						err = service.SaveSupply(supply)
+						if err != nil {
+							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+							return
+						}
+					}
 				}
 			}
-			tcreater := this.GetAdminUserInfo().AdminUser.Id
 			err = service.SaveSupplyAndContact(thisStockIn, orgId, supplierType, tcreater, supplierCode, supplierName, number, bank, bankAccount, vatRate)
 			if err != nil {
 				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 				return
 			}
 		} else {
-			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "联系人不能为空")
-			return
+			//如果联系人是空的，这里直接保存供应商
+			supply := models.SpSupplierName{
+				SupplierCode: supplierCode,
+				SupplierName: supplierName,
+				SupplierType: supplierType,
+				VatRate:      vatRate,
+				Number:       number,
+				Bank:         bank,
+				BankAccount:  bankAccount,
+				UserOrgId:    orgId,
+				Status:       1,
+				Ctime:        time.Now().Unix(),
+				Mtime:        0,
+				Creater:      tcreater,
+				Modify:       tcreater,
+			}
+			err = service.SaveSupply(supply)
+			if err != nil {
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+				return
+			}
 		}
 	}
 	this.ServeSuccessJSON(map[string]interface{}{

service/supply_service.go

@@ -43,7 +43,7 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 	}()
 	for _, item := range thisStockIn {
 		items := item.(map[string]interface{})
-		//查询是否
+		//判断联系人是否为新加的
 		if items["id"] == "" || items["id"] == 0 {
 			var tmp float64 = 0
 			items["id"] = tmp
@@ -76,7 +76,7 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 			Ctime:        0,
 			Mtime:        time.Now().Unix(),
 		}
-		if id == 0 {
+		if id == 0 { //表示这是新加的
 			spcontacts := models.SpSupplierContacts{
 				Name:         name,
 				Phone:        phone,
@@ -87,7 +87,7 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 				Status:       1,
 				Ctime:        time.Now().Unix(),
 				Mtime:        0,
-			}
+			} //保存一条联系人的数据
 			err = SaveContacts(spcontacts, tx)
 			if err != nil {
 				return err
@@ -97,7 +97,7 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 		}
 		var tmpid int64
 		if isfirst == 1 {
-			if id == 0 {
+			if id == 0 { //新加的首要联系人
 				var spconid []*models.SpSupplierContacts
 				spconid, err = SaveContactsId(tx, orgId)
 				if err != nil {
@@ -123,7 +123,7 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 				Mtime:        time.Now().Unix(),
 				Modify:       tcreater,
 			}
-			err = UpdateSupplyName(upsupply, tx)
+			err = UpdateSupplyNameTX(upsupply, tx)
 			if err != nil {
 				return err
 			}
@@ -133,12 +133,18 @@ func UpdateSupplyAndContact(thisStockIn []interface{}, suid, orgId, supplierType
 	return err
 }
 
-//更新一条供应商的信息
-func UpdateSupplyName(upsupply models.SpSupplierName, tx *gorm.DB) error {
+//更新一条供应商的信息,添加了事务的
+func UpdateSupplyNameTX(upsupply models.SpSupplierName, tx *gorm.DB) error {
 	err := tx.Model(&models.SpSupplierName{}).Where("id = ? and status = 1", upsupply.ID).Updates(map[string]interface{}{"supplier_code": upsupply.SupplierCode, "supplier_name": upsupply.SupplierName, "supplier_type": upsupply.SupplierType, "vat_rate": upsupply.VatRate, "number": upsupply.Number, "bank": upsupply.Bank, "bank_account": upsupply.BankAccount, "user_org_id": upsupply.UserOrgId, "status": upsupply.Status, "contacts_id": upsupply.ContactsId, "mtime": upsupply.Mtime, "modify": upsupply.Modify}).Error
 	return err
 }
 
+//更新一条供应商的信息,没有添加事务
+func UpdateSupplyName(upsupply models.SpSupplierName) error {
+	err := XTWriteDB().Model(&models.SpSupplierName{}).Where("id = ? and status = 1", upsupply.ID).Updates(map[string]interface{}{"supplier_code": upsupply.SupplierCode, "supplier_name": upsupply.SupplierName, "supplier_type": upsupply.SupplierType, "vat_rate": upsupply.VatRate, "number": upsupply.Number, "bank": upsupply.Bank, "bank_account": upsupply.BankAccount, "user_org_id": upsupply.UserOrgId, "status": upsupply.Status, "contacts_id": upsupply.ContactsId, "mtime": upsupply.Mtime, "modify": upsupply.Modify}).Error
+	return err
+}
+
 //更新一条联系人的信息
 func UpdateContact(updatecontacts models.SpSupplierContacts, tx *gorm.DB) error {
 	err := tx.Model(&models.SpSupplierContacts{}).Where("id = ? and status = 1", updatecontacts.ID).Updates(map[string]interface{}{"name": updatecontacts.Name, "phone": updatecontacts.Phone, "address": updatecontacts.Address, "is_first": updatecontacts.IsFirst, "supplier_code": updatecontacts.SupplierCode, "user_org_id": updatecontacts.UserOrgId, "status": updatecontacts.Status, "mtime": updatecontacts.Mtime}).Error
@@ -255,7 +261,7 @@ func SaveSupplyAndContact(thisStockIn []interface{}, orgId, supplierType, tcreat
 				Creater:      tcreater,
 				Modify:       tcreater,
 			}
-			err = SaveSupply(supply, tx)
+			err = SaveSupplyTx(supply, tx)
 			if err != nil {
 				return err
 			}
@@ -309,12 +315,18 @@ func FindSupplierCodes(supplierCode string, orgid int64) (codebool bool, err err
 	return codebool, err
 }
 
-//保存一条供应商数据
-func SaveSupply(supply models.SpSupplierName, tx *gorm.DB) error {
+//保存一条供应商数据加事务的
+func SaveSupplyTx(supply models.SpSupplierName, tx *gorm.DB) error {
 	err := tx.Create(&supply).Error
 	return err
 }
 
+//保存一条供应商数据没有事务的
+func SaveSupply(supply models.SpSupplierName) error {
+	err := XTWriteDB().Create(&supply).Error
+	return err
+}
+
 //获取联系人的id
 func SaveContactsId(tx *gorm.DB, orgid int64) (spconid []*models.SpSupplierContacts, err error) {
 	err = tx.Model(&models.SpSupplierContacts{}).Select("id").Where("status = 1 and user_org_id = ?", orgid).Order("id desc").First(&spconid).Error