FIX：h5签收不登录

app/admin/controller/waybill.go

@@ -32,7 +32,6 @@ import (
 	"os"
 	"path"
 	"sort"
-	"strconv"
 	"sync"
 	"time"
 )
@@ -79,11 +78,11 @@ func (e WaybillController) GetPage(c *gin.Context) {
 
 	list := make([]model.Waybill, 0)
 	var count int64
-	if userObj.Type == model.SysUserTypeSys {
-		err = s.GetPage(&req, &list, &count, p)
-	} else {
-		err = s.GetUserPage(&req, &list, &count, p)
-	}
+	//if userObj.Type == model.SysUserTypeSys {
+	err = s.GetPage(&req, &list, &count, p)
+	//} else {
+	//	err = s.GetUserPage(&req, &list, &count, p)
+	//}
 	if err != nil {
 		e.Error(500, err, err.Error())
 		return
@@ -632,7 +631,7 @@ func (e WaybillController) CustomerReceipt(c *gin.Context) {
 		return
 	}
 
-	req.WaybillNo = lib.AesDecryptCBC(req.WaybillNo, lib.AesKey)
+	//req.WaybillNo = lib.AesDecryptCBC(req.WaybillNo, lib.AesKey)
 	//数据权限检查
 	err = s.Receipt(&req, nil)
 	if err != nil {
@@ -902,7 +901,7 @@ func (e WaybillController) Import(c *gin.Context) {
 		for i, colCell := range row {
 			fmt.Println(i, ":", colCell)
 		}
-		quantity, _ := strconv.Atoi(row[8])
+		//quantity, _ := strconv.Atoi(row[8])
 		obj := dto.WaybillInsertReq{
 			Status:                  1,
 			SenderAddressName:       row[0],
@@ -913,9 +912,9 @@ func (e WaybillController) Import(c *gin.Context) {
 			ConsigneeAddressDetails: row[5],
 			DeliveryName:            row[6], // 防拆标签
 			DeliveryPhone:           row[7], // 防拆标签
-			Quantity:                quantity,
-			TamperProofLabel:        row[9], // 防拆标签
-			Remark:                  row[10],
+			//Quantity:                quantity,
+			TamperProofLabel: row[8], // 防拆标签
+			Remark:           row[9],
 		}
 		obj.SetDeptId(p.DeptId)
 		obj.SetCreateBy(user.GetUserId(c))

app/admin/router/upload.go

@@ -3,15 +3,14 @@ package router
 import (
 	"cold-delivery/app/admin/controller"
 	"github.com/gin-gonic/gin"
-	jwt "gogs.baozhida.cn/zoie/OAuth-core/pkg/jwtauth"
 )
 
 func init() {
-	routerCheckRole = append(routerCheckRole, registerUploadRouter)
+	routerNoCheckRole = append(routerNoCheckRole, registerUploadRouter)
 }
 
-func registerUploadRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+func registerUploadRouter(v1 *gin.RouterGroup) {
+	r1 := v1.Group("")
 	{
 		cont := controller.UploadController{}
 		r1.POST("/upload", cont.FilesUpload)

app/admin/service/waybill.go

@@ -264,11 +264,11 @@ func (e *Waybill) Insert(c *dto.WaybillInsertReq) error {
 		// 查询地址是否存在
 		address := model.Address{}
 		err = e.Orm.Where("address = ? and phone = ? and name = ? and dept_id = ? and address_type = 'consignee'",
-			c.SenderAddressDetails, c.SenderAddressPhone, c.SenderAddressName, c.DeptId).First(&address).Error
+			c.ConsigneeAddressDetails, c.ConsigneeAddressPhone, c.ConsigneeAddressName, c.DeptId).First(&address).Error
 		if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-			address.Address = c.SenderAddressDetails
-			address.Phone = c.SenderAddressPhone
-			address.Name = c.SenderAddressName
+			address.Address = c.ConsigneeAddressDetails
+			address.Phone = c.ConsigneeAddressPhone
+			address.Name = c.ConsigneeAddressName
 			address.DeptId = c.DeptId
 			address.AddressType = "consignee"
 			err = tx.Create(&address).Error
@@ -594,7 +594,7 @@ func (e *Waybill) Receipt(c *dto.WaybillReceiptReq, p *actions.DataPermission) e
 	}
 
 	var lng, lat string
-	lng, lat, err = e.GetSite(p.DeptId, coolerBox.Sn, waybillModel.ReceiptTime.String())
+	lng, lat, err = e.GetSite(waybillModel.DeptId, coolerBox.Sn, waybillModel.ReceiptTime.String())
 	if err != nil {
 		e.Log.Errorf("获取定位信息失败: %s", err)
 		return err
@@ -611,27 +611,30 @@ func (e *Waybill) Receipt(c *dto.WaybillReceiptReq, p *actions.DataPermission) e
 	// 未下车 直接点签收
 	if time.Time(task.EndTime).IsZero() {
 		task.EndTime = model2.Time(time.Now())
-		task.UpdateBy = p.UserId
+		//task.UpdateBy = p.UserId
 		err = tx.Save(&task).Error
 		if err != nil {
 			e.Log.Errorf("db error: %s", err)
 			return errors.New(fmt.Sprintf("保存运单任务信息失败：%s", err))
 		}
 	}
-
+	var userId int
+	if p != nil {
+		userId = p.UserId
+	}
 	// 添加签收记录
 	Logistics := model.WaybillLogistics{
 		WaybillNo:   c.WaybillNo,
 		Status:      c.Status,
 		CoolerBoxId: coolerBox.Id,
-		UserId:      p.UserId,
+		UserId:      userId,
 		Lng:         lng,
 		Lat:         lat,
 		ControlBy: model2.ControlBy{
-			CreateBy: p.UserId,
+			CreateBy: userId,
 		},
 		DeptBy: model2.DeptBy{
-			DeptId: p.DeptId,
+			DeptId: waybillModel.DeptId,
 		},
 		ModelTime: model2.ModelTime{
 			CreatedAt: waybillModel.ReceiptTime,