1

controllers/jx_order.go

@@ -52,12 +52,14 @@ func (c *OrderController) FinishedPickup() {
 // @Param	token			header		string	true	"认证token"
 // @Param	vendorOrderID	formData	string	true	"订单ID"
 // @Param	vendorID		formData	int		true	"订单所属的厂商ID"
+// @Param	courierName		formData	string	false	"骑手姓名-制作假配送"
+// @Param	courierMobile	formData	string	false	"骑手电话-制作假配送"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /SelfDelivering [post]
 func (c *OrderController) SelfDelivering() {
 	c.callSelfDelivering(func(params *tOrderSelfDeliveringParams) (retVal interface{}, errCode string, err error) {
-		err = defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
+		err = defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName(), params.CourierName, params.CourierMobile)
 		return nil, "", err
 	})
 }

controllers/tiktok_delivery.go

@@ -59,7 +59,8 @@ func (c *LogisticsController) LogisticsRegister() {
 	if err != nil {
 		globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
 	}
-	if len(data) <= 0 {
+
+	if len(data) == 0 || err != nil {
 		c.Data["json"] = LogisticsRegisterResp{
 			Result:     false,
 			ReturnCode: "1002",
@@ -154,15 +155,12 @@ func (c *LogisticsController) LogisticsQuery() {
 	data, err := dao.GetWayBillsByWayBillId(dao.GetDB(), param.TrackNo)
 	if err != nil {
 		globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
-	}
-	if len(data) <= 0 {
-		c.Data["json"] = LogisticsRegisterResp{
+		c.Data["json"] = LogisticsQueryRest{
 			Result:     false,
 			ReturnCode: "1002",
-			Message:    "单号不存在",
+			Message:    "运单账号不存在",
 		}
 		c.ServeJSON()
-		return
 	}
 
 	returnParam := &LogisticsQueryRest{