fix bug

boot/nsq.go

@@ -1,15 +1,16 @@
 package boot
 
 import (
-	"dashoo.cn/micro_libary/nsq"
+	nsqUtils "dashoo.cn/micro_libary/nsq"
 	"github.com/gogf/gf/frame/g"
+	"lims_adapter/common"
 	"lims_adapter/service/reservation"
 )
 
 // NsqInit  nsq初始化
 func NsqInit() {
 	// 生产者初始化
-	nsq.NSqProducer = nsq.NewNsqProducer()
+	common.NsqProducer = nsqUtils.NewNsqProducer()
 
 	// 预约消息订阅
 	autoProcessTopic := g.Cfg().GetString("nsq.nsqReservationAutoProcess")

common/nsq.go

@@ -0,0 +1,5 @@
+package common
+
+import "github.com/nsqio/go-nsq"
+
+var NsqProducer *nsq.Producer

go.mod

@@ -6,6 +6,7 @@ require (
 	dashoo.cn/common_definition v0.0.0
 	dashoo.cn/micro_libary v0.0.0
 	github.com/gogf/gf v1.16.4
+	github.com/nsqio/go-nsq v1.0.8
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
 	github.com/smallnest/rpcx v1.6.10
 )
@@ -62,7 +63,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/mojocn/base64Captcha v1.3.1 // indirect
-	github.com/nsqio/go-nsq v1.0.8 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onsi/ginkgo v1.16.4 // indirect

service/reservation/autopress.go

@@ -6,6 +6,7 @@ import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
 	"github.com/nsqio/go-nsq"
+	"lims_adapter/common"
 	"time"
 )
 
@@ -60,7 +61,7 @@ func AutoProcess(id int, tenant string, delayTime time.Duration) {
 		glog.Error("appoint auto process json marshal err:", err.Error())
 	}
 	// 发送延时消息
-	err = utilNsq.NSqProducer.DeferredPublish(topic, delayTime, msg)
+	err = common.NsqProducer.DeferredPublish(topic, delayTime, msg)
 	if err != nil {
 		glog.Error("发送预约类的延时消息失败，err:", err.Error())
 	}

service/reservation/reservation.go

@@ -222,7 +222,10 @@ func (s Service) AutoEnding(id int) error {
 	if err != nil {
 		return err
 	}
-	if entity.SignOutTime.String() != "" {
+	if entity == nil {
+		return nil
+	}
+	if entity.SignOutTime != nil && entity.SignOutTime.String() != "" {
 		return nil
 	}
 	_, err = s.Dao.WherePri(id).Update(g.Map{s.Dao.Columns.SignOutTime: entity.EndTime})