Ver código fonte

fix:添加运单删除发件人信息

zoie 1 mês atrás
pai
commit
cb1c5db36e
1 arquivos alterados com 0 adições e 13 exclusões
  1. 0 13
      app/admin/service/dto/waybill.go

+ 0 - 13
app/admin/service/dto/waybill.go

@@ -48,10 +48,6 @@ type WaybillInsertReq struct {
 	No                      string `json:"no" swaggerignore:"true"`                                              //单号
 	OrderNo                 string `json:"orderNo"`                                                              // 订单号
 	Status                  int    `json:"status" swaggerignore:"true"`                                          //订单状态:1-待处理;102-待装车 103-运输中 104-已签收
-	SaveSenderAddress       bool   `json:"saveSenderAddress"`                                                    //保存发货地址
-	SenderAddressDetails    string `json:"senderAddressDetails"`                                                 //发货地址详情
-	SenderAddressName       string `json:"senderAddressName"`                                                    //发货地址名称
-	SenderAddressPhone      string `json:"senderAddressPhone" vd:"regexp('^1[3-9]\\d{9}$');msg:'配送人电话格式不正确'"`    //发货地址电话
 	SaveConsigneeAddress    bool   `json:"SaveConsigneeAddress"`                                                 //保存收货地址
 	ConsigneeAddressDetails string `json:"consigneeAddressDetails"`                                              //收发货地址详情
 	ConsigneeAddressName    string `json:"consigneeAddressName"`                                                 //收发货地址名称
@@ -75,9 +71,6 @@ func (s *WaybillInsertReq) Generate(m *model.Waybill) {
 	}
 	m.Status = 1
 	m.OrderNo = s.OrderNo
-	m.SenderAddressDetails = s.SenderAddressDetails
-	m.SenderAddressName = s.SenderAddressName
-	m.SenderAddressPhone = s.SenderAddressPhone
 	m.ConsigneeAddressDetails = s.ConsigneeAddressDetails
 	m.ConsigneeAddressName = s.ConsigneeAddressName
 	m.ConsigneeAddressPhone = s.ConsigneeAddressPhone
@@ -110,9 +103,6 @@ func (s *WaybillInsertReq) GetId() interface{} {
 type WaybillUpdateReq struct {
 	Id                      int    `json:"id" comment:"编码" swaggerignore:"true"` // 编码
 	OrderNo                 string `json:"orderNo"`
-	SenderAddressDetails    string `json:"senderAddressDetails"`    //发货地址详情
-	SenderAddressName       string `json:"senderAddressName"`       //发货地址名称
-	SenderAddressPhone      string `json:"senderAddressPhone"`      //发货地址电话
 	ConsigneeAddressDetails string `json:"consigneeAddressDetails"` //收发货地址详情
 	ConsigneeAddressName    string `json:"consigneeAddressName"`    //收发货地址名称
 	ConsigneeAddressPhone   string `json:"consigneeAddressPhone"`   //收发货地址电话
@@ -135,9 +125,6 @@ func (s *WaybillUpdateReq) Generate(m *model.Waybill) {
 		m.Id = s.Id
 	}
 	m.OrderNo = s.OrderNo
-	m.SenderAddressDetails = s.SenderAddressDetails
-	m.SenderAddressName = s.SenderAddressName
-	m.SenderAddressPhone = s.SenderAddressPhone
 	m.ConsigneeAddressDetails = s.ConsigneeAddressDetails
 	m.ConsigneeAddressName = s.ConsigneeAddressName
 	m.ConsigneeAddressPhone = s.ConsigneeAddressPhone