bug修改

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/business/oilrtx/rtx.go

@@ -54,3 +54,16 @@ type Tmp_User struct {
 	Telphone   string `xorm:"VARCHAR(500)"`
 	Deptid     string `xorm:"VARCHAR(500)"`
 }
+
+
+type BaseMsg struct {
+	Id           int    `xorm:"not null pk autoincr INT(11)"`
+	Type         string `xorm:"not null comment('类别（1注册（1-1注册成功1-2注册失败） 2密码重置（2-1验证码2-2重置密码））') VARCHAR(10)"`
+	UserName     string `xorm:"not null comment('企业用户名（即登录账号）') VARCHAR(50)"`
+	UserRealName string `xorm:"not null comment('企业名称') VARCHAR(100)"`
+	UserId       string `xorm:"not null comment('用户名Id（BaseUser表Id）') VARCHAR(11)"`
+	ToMobile     string `xorm:"not null comment('目标手机号') VARCHAR(20)"`
+	Msg          string `xorm:"not null comment('短信内容') VARCHAR(500)"`
+	ToTime       string `xorm:"not null comment('发送时间') VARCHAR(20)"`
+	Status       string `xorm:"not null comment('发送状态') VARCHAR(20)"`
+}

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1924,8 +1924,13 @@ func (this *OilSupplierController) GetEntityByName() {
 		svc.GetEntityByWhere(OilCorporateInfoName, "SupplierName='" + name + "'", &model2)
 		model2.Remark=""
 		model2.Id=0
-		this.Data["json"] = &model2
-		this.ServeJSON()
+
+		if model2.SupplierName==""{
+			this.ServeJSON()
+		}else{
+			this.Data["json"] = &model2
+			this.ServeJSON()
+		}
 	}
 	this.Data["json"] = &model
 	this.ServeJSON()

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -1,7 +1,9 @@
 package register
 
 import (
+	"dashoo.cn/backend/api/business/oilrtx"
 	"encoding/json"
+	"io/ioutil"
 	"strconv"
 	"strings"
 	"time"
@@ -291,6 +293,29 @@ func (this *OilCorporateInfoController) ComAudit() {
 				//插入更新数据
 				_, err3 := svcRegister.InsertEntityBytbl(OilCorporateInfoName, &model)
 				if err3 == nil {
+					//编辑短信内容
+					toMobile:=model.UserTelephone
+					msg:="恭喜您！市场管理信息系统账号注册成功，系统登录用户名为: "+model.UserName
+
+					//调用短信接口发送短信
+					rtxSvc := oilrtx.GetRtxService(utils.DBE)
+					resp:=rtxSvc.HandleSendMsg("", toMobile, msg)
+					jsonBlob, _ := ioutil.ReadAll(resp.Body)
+					var rtxRespToken oilrtx.RtxRespToken
+					json.Unmarshal(jsonBlob, &rtxRespToken)
+
+					//如果发送返回代码存入短信信息记录表
+					var resultMsg oilrtx.BaseMsg
+					resultMsg.Type="1-1"
+					resultMsg.UserName=model.UserName
+					resultMsg.UserRealName=model.UserRealName
+					resultMsg.UserId=strconv.Itoa(model.UserId)
+					resultMsg.ToMobile=toMobile
+					resultMsg.Msg=msg
+					resultMsg.ToTime=time.Now().Format("2006-01-02 15:04:05")
+					resultMsg.Status=strconv.Itoa(rtxRespToken.Code)
+					svcRegister.InsertEntityBytbl("Base_Msg", &resultMsg)
+
 					errinfo.Message = "审核通过！"
 					errinfo.Code = 0
 					errinfo.Item = model.Id
@@ -315,11 +340,36 @@ func (this *OilCorporateInfoController) ComAudit() {
 			this.ServeJSON()
 			return
 		}
+
 	}else {
 		upmodel.Remark = Remark
 		upmodel.CheckStatus = -1 //未通过审核
 		cols := []string{"Remark", "CheckStatus"}
 		err = svc.UpdateEntityBytbl(OilCorporateInfoName, model.Id, &upmodel, cols)
+
+		//编辑短信内容
+		toMobile:=model.UserTelephone
+		msg:="市场管理信息系统账号注册失败，因“"+Remark+"”，请按照要求重新注册，联系人："+model.CheckUserName+"，联系电话：**"
+
+		//调用短信接口发送短信
+		rtxSvc := oilrtx.GetRtxService(utils.DBE)
+		resp:=rtxSvc.HandleSendMsg("", toMobile, msg)
+		jsonBlob, _ := ioutil.ReadAll(resp.Body)
+		var rtxRespToken oilrtx.RtxRespToken
+		json.Unmarshal(jsonBlob, &rtxRespToken)
+
+		//如果发送返回代码存入短信信息记录表
+		var resultMsg oilrtx.BaseMsg
+		resultMsg.Type="1-2"
+		resultMsg.UserName=model.UserName
+		resultMsg.UserRealName=model.UserRealName
+		resultMsg.UserId=strconv.Itoa(model.UserId)
+		resultMsg.ToMobile=toMobile
+		resultMsg.Msg=msg
+		resultMsg.ToTime=time.Now().Format("2006-01-02 15:04:05")
+		resultMsg.Status=strconv.Itoa(rtxRespToken.Code)
+		svc.InsertEntityBytbl("Base_Msg", &resultMsg)
+
 		if err == nil {
 			errinfo.Message = "审核未通过！"
 			errinfo.Code = 0

src/dashoo.cn/frontend_web/src/pages/oilsupplier/companyaudit/index.vue

@@ -359,6 +359,8 @@
               //关闭dialog
               _this.Auditshow = false
               _this.dialogVisible = false
+              this.shenheForm.AuditorRemark='',
+              this.shenheForm.SuccessStatus=1
               //更新列表
               _this.initData()
             } else {