Merge pull request '物业系统电梯卡充值缴费' (#5) from feature_charge into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_MY_BACKEND/pulls/5

web/controllers/accesscardtab_controller.go

@@ -104,8 +104,8 @@ func InsertAccesscardtab(ctx iris.Context) {
 		return
 	}
 	data.Cid = user.Pid
-	err := data.Add()
-	if err != nil {
+	res := data.Add()
+	if !res {
 		supports.Error(ctx, iris.StatusBadRequest, "添加失败！", nil)
 		return
 	}

web/controllers/contracttab_controller.go

@@ -76,11 +76,21 @@ func InsertContracttab(ctx iris.Context) {
 		access.Lastmodifytime = utils.TimeFormat(time.Now(), "yyyyMMddHHmmss")
 		access.Descr = "电梯卡费"
 		access.Lastmodifyby = user.Userid
-		err := access.Add()
+		res := access.Add()
+		if !res {
+			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
+			return
+		}
+		/****查询缴费***/
+		cardtab := new(models.Accesscardtab)
+		cardtab.Cid = user.Pid
+		cardtab.Accesscardid = data.Accesscardid
+		result, err := cardtab.SelectOne()
 		if err != nil {
 			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
 			return
 		}
+		me.Contractid = result.Contractid
 	case 3:
 		lengthdate = data.Contracttab.Chargedexpense / data.Unitprice
 		carport := new(models.Carporttab)

web/models/accesscardtab.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"errors"
 	"lapp_-wy/db"
 	"lapp_-wy/utils"
 	"xorm.io/core"
@@ -31,21 +30,21 @@ func (t *Accesscardtab) Clipped() {
 }
 
 //增
-func (t *Accesscardtab) Add() error {
+func (t *Accesscardtab) Add() bool {
 	e := db.MasterEngine()
 	countrole := new(Accesscardtab)
 	affw, err := e.Table("accesscardtab").ID(core.PK{t.Cid, t.Accesscardid}).Count(countrole)
 	if err != nil {
-		return err
+		return false
 	}
 	if affw > 0 {
-		return errors.New("数据已经存在！")
+		return true
 	}
 	_, err = e.Table("accesscardtab").Insert(t)
 	if err != nil {
-		return err
+		return false
 	}
-	return nil
+	return true
 }
 
 //删
@@ -142,6 +141,10 @@ func (t *Accesscardtab) Search(buildingid string, unit string, room string) (Con
 	var info AccesscardContract
 	e := db.MasterEngine()
 	query := e.Table("accesscardtab").Join("RIGHT", "propertytab", "accesscardtab.propertyid=propertytab.propertyid and accesscardtab.cid=propertytab.cid").Join("LEFT", "propertytypetab", "accesscardtab.propertytypeid=propertytypetab.propertytypeid and accesscardtab.cid=propertytypetab.cid").Join("LEFT", "contracttab", "accesscardtab.contractid=contracttab.contractid and accesscardtab.cid=contracttab.cid").Where("propertytab.cid=? ", t.Cid)
+	if !utils.ValueIsEmpty(t.Accesscardid) {
+		query = query.And("accesscardtab.accesscardid = ?", t.Accesscardid)
+	}
+
 	if !utils.ValueIsEmpty(buildingid) {
 		query = query.And("propertytab.buildingid = ?", buildingid)
 	}
@@ -151,9 +154,7 @@ func (t *Accesscardtab) Search(buildingid string, unit string, room string) (Con
 	if !utils.ValueIsEmpty(room) {
 		query = query.And("propertytab.room = ?", room)
 	}
-	if !utils.ValueIsEmpty(t.Accesscardid) {
-		query = query.And("accesscardtab.accesscardid = ?", t.Accesscardid)
-	}
+
 	_, err := query.Get(&info)
 	if err != nil {
 		return data, err
@@ -185,7 +186,7 @@ func (t *Accesscardtab) Search(buildingid string, unit string, room string) (Con
 	data.AccesscardidList = accesscardidList
 	data.Accesscardid = t.Accesscardid
 	data.Cid = t.Cid
-	data.Contractid = info.Propertytab.Contractid
+	data.Contractid = info.Accesscardtab.Contractid
 	data.Descr = info.Propertytab.Descr
 	data.Contact = info.Propertytab.Contact
 	data.Phone1 = info.Propertytab.Phone1