短信模板发送修改

app/admin/controller/cooler_box.go

@@ -367,7 +367,6 @@ func (e CoolerBoxController) GetCoolerBoxNewestLocus(c *gin.Context) {
 		Data       []nats_server.DeviceData_ `json:"data"`
 	}
 	var response Response
-
 	for conn {
 		select {
 		case <-notify:
@@ -516,7 +515,6 @@ func (e CoolerBoxController) ExportExecl(c *gin.Context) {
 		e.Error(500, err, "获取用户信息失败")
 		return
 	}
-	fmt.Println(sysUser)
 	if sysUser.Dept.IsCoolerReleaseCold {
 		// 这里设置表头ÒÒ
 		f.SetCellValue("Sheet1", "A1", "序号")

app/admin/service/cooler_box.go

@@ -438,7 +438,7 @@ func (e *CoolerBox) GetNewLocus(c *dto.CoolerBoxReq, list *[]nats_server.DeviceD
 	// 获取公司秘钥
 	var dataDept model.SysDept
 	var Depts []model.SysDept
-	fmt.Println("公司ID=================", c.Id)
+	//fmt.Println("公司ID=================", c.Id)
 	err := e.Orm.Model(&dataDept).Where("id = ?", c.Id).Or("parent_id =?", c.Id).Find(&Depts).Error
 	if err != nil {
 		e.Log.Errorf("db error: %s", err)

app/admin/service/ice_raft.go

@@ -723,7 +723,7 @@ func (e *IceRaft) GetCoolerBoxBindCieRaft(c *dto.GetCoolerBoxByIceRaft, p *actio
 			// 查询冰排是否存在
 			var iceRaftModel model.IceRaftRecord
 			err = e.Orm.Scopes(actions.Permission(iceRaftModel.TableName(), p)).
-				Where("code = ?", code).Where("status = ?", model.IceRaftRecordStatusWaitUse).
+				Where("code = ?", code).Where("status = ?", model.IceRaftRecordStatusWaitUse).Or("status = ?", model.IceRaftRecordReleasedInTheColdEnd).
 				First(&iceRaftModel).Error
 			if err != nil {
 				if errors.Is(gorm.ErrRecordNotFound, err) {
@@ -737,16 +737,20 @@ func (e *IceRaft) GetCoolerBoxBindCieRaft(c *dto.GetCoolerBoxByIceRaft, p *actio
 	} else {
 		var iceRaftModel []model.IceRaftRecord
 		err = e.Orm.Scopes(actions.Permission(model.IceRaftRecord{}.TableName(), p)).
-			Where("status = ?", model.IceRaftRecordStatusWaitUse).Find(&iceRaftModel).Error
+			Where("status = ?", model.IceRaftRecordStatusWaitUse).Or("status = ?", model.IceRaftRecordReleasedInTheColdEnd).Find(&iceRaftModel).Error
 		if err != nil {
 			e.Log.Errorf("获取冰排信息失败: %s", err)
 			return errors.New("获取冰排信息失败")
 		}
 		for _, v := range iceRaftModel {
-			*list = append(*list, v.Code)
+			var iceRaft model.IceRaft
+			err = e.Orm.Scopes(actions.Permission(model.IceRaft{}.TableName(), p)).
+				Where("id = ?", v.Id).First(&iceRaft).Error
+			if len(iceRaft.BindCoolerBox) == 0 {
+				*list = append(*list, v.Code)
+			}
 		}
 	}
-
 	return nil
 }
 func (e *IceRaft) GetCoolerIceRaft(p *actions.DataPermission, list *[]model.IceRaft) error {

app/admin/service/waybill.go

@@ -792,7 +792,7 @@ func (e *Waybill) Delivery(c *dto.WaybillDeliveryReq, p *actions.DataPermission)
 				}
 				waybillModel.SendLog = model.WaybillSendLog{
 					Phone:   waybillModel.ConsigneeAddressPhone,
-					Content: "【冷链送药追溯平台】您的运单正在派送中，点击查看详情：" + addr,
+					Content: "【贵州宝智达冷链科技有限公司】您的运单正在派送中，点击查看详情：" + addr,
 				}
 				//// 查询任务
 				//var logistics model.WaybillLogistics
@@ -1918,7 +1918,7 @@ func (e *Waybill) SecondaryDistribution(c *dto.WaybillAssignment, p *actions.Dat
 	}
 	waybil.SendLog = model.WaybillSendLog{
 		Phone:   c.ConsigneeAddressPhone,
-		Content: "【冷链送药追溯平台】您的运单正在派送中，点击查看详情：" + addr,
+		Content: "【贵州宝智达冷链科技有限公司】您的运单正在派送中，点击查看详情：" + addr,
 	}
 	// 添加物流
 	logisticsObj := model.WaybillLogistics{