Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

controllers/cms.go

@@ -359,3 +359,24 @@ func (c *CmsController) GetVendorOrgCodeInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 得到商家与用户之间骑行路线规划
+// @Description 得到商家与用户之间骑行路线规划
+// @Param	token	header	string	true	"认证token"
+// @Param	sLng	query	int	    true	"商家经度"
+// @Param	sLat	query	int	    true	"商家纬度"
+// @Param	uLng	query	int		true	"用户经度"
+// @Param	uLat	query	int		true	"用户纬度"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetSToURidingDistance [get]
+func (c *CmsController) GetSToURidingDistance() {
+	c.callGetSToURidingDistance(func(params *tCmsGetSToURidingDistanceParams) (retVal interface{}, errCode string, err error) {
+		sLng := jxutils.IntCoordinate2Standard(params.SLng)
+		sLat := jxutils.IntCoordinate2Standard(params.SLat)
+		uLng := jxutils.IntCoordinate2Standard(params.ULng)
+		uLat := jxutils.IntCoordinate2Standard(params.ULat)
+		retVal, err = cms.GetSToURidingDistance(sLng, sLat, uLng, uLat)
+		return retVal, "", err
+	})
+}

controllers/im.go

@@ -11,46 +11,13 @@ type IMController struct {
 	web.Controller
 }
 
-var maxMessageSize = int64(8192) // 最大的消息大小
-
 // @Title IM初始化长链接
 // @Description IM初始化长链接
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /StartWebSocket [get]
 func (c *IMController) StartWebSocket() {
-
 	im.Run(c.Ctx.ResponseWriter, c.Ctx.Request)
-	//
-	//upgrader.CheckOrigin = func(r *http.Request) bool {
-	//	return true
-	//}
-	//conn, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
-	//if err != nil {
-	//	globals.SugarLogger.Errorf("upgrade error: %v", err)
-	//	return
-	//}
-	//defer conn.Close()
-	//
-	//clientID := c.GetString("clientID")
-	//globals.SugarLogger.Debugf("clientID=%s", clientID)
-	//
-	////设置读取消息大小上线
-	//conn.SetReadLimit(maxMessageSize)
-	//
-	//clientSocket := im.NewClient(clientID, conn)
-	//
-	////读取客户端消息
-	//clientSocket.Read()
-	//
-	//if err = im.ConnRender(conn, im.RetData{Data: clientID}); err != nil {
-	//	_ = conn.Close()
-	//	return
-	//}
-	//
-	//// 用户连接事件
-	//im.Manager.Connect <- clientSocket
-
 }
 
 // @Title IM获取门店用户聊天列表

controllers/tiktok_delivery.go

@@ -204,6 +204,7 @@ func (c *LogisticsController) LogisticsQuery() {
 		}
 		c.Data["json"] = wayBillDetail
 		c.ServeJSON()
+		return
 	}
 
 	returnParam := &LogisticsQueryRest{