Merge remote-tracking branch 'origin/dev' into jrz_dev

# Conflicts:
#	xx-uccn/xx-uccn-server/pom.xml

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/feign/CampsiteFeign.java

@@ -3,6 +3,9 @@ package com.xxfc.platform.campsite.feign;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.campsite.vo.CampsiteShopDetailVo;
+import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,13 +17,31 @@ import java.util.List;
  * Created by ace on 2017/9/15.
  */
 //@FeignClient(value = "${auth.serviceId}",configuration = {})
-@FeignClient("xx-campsite")
+@FeignClient(name = "xx-campsite",path = "/campsiteShop")
 public interface CampsiteFeign {
 
     @ApiOperation("首页营地列表")
-    @GetMapping(value = "/campsiteShop/app/shopList")
-    public List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
-                                     @RequestParam(value = "limit",defaultValue = "4") Integer limit);
-    @GetMapping(value = "/campsiteShop/app/unauth/findRandomVehicle")
-    public ObjectRestResponse findRandomVehicle(@RequestParam(value = "number")Integer number);
+    @GetMapping(value = "/app/shopList")
+    List<GoodDataVO> goodList(@RequestParam(value = "page", defaultValue = "1") Integer page,
+                              @RequestParam(value = "limit", defaultValue = "4") Integer limit);
+
+    @GetMapping(value = "/app/unauth/findRandomVehicle")
+    ObjectRestResponse findRandomVehicle(@RequestParam(value = "number") Integer number);
+
+    @ApiOperation("分页查询营地列表")
+    @GetMapping("/app/unauth/shops")
+    ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsiteShopPageByType(@RequestParam(value = "type", required = false) Integer type,
+                                                                                  @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
+                                                                                  @RequestParam(value = "pageSize", required = false, defaultValue = "6") Integer pageSize);
+
+    /**
+     * @param longitude 经度
+     * @param latitude  纬度
+     * @return
+     */
+    @ApiOperation("查询营地详情")
+    @GetMapping("/app/unauth/shop")
+    ObjectRestResponse<CampsiteShopDetailVo> findCampsiteShopDetailById(@RequestParam(value = "id") Integer id,
+                                                                        @RequestParam(value = "longitude", required = false) Double longitude,
+                                                                        @RequestParam(value = "latitude", required = false) Double latitude);
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -164,12 +164,14 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         }
         campsiteShopDetailVo.setTypeNames(shopTagDTOS == null ? Collections.EMPTY_LIST : shopTagDTOS.stream().map(CampsiteShopTagDTO::getName).collect(Collectors.toList()));
         //根据经纬度算距离
-        if (campsiteShopDetailDTO.getLongitude() != null && campsiteShopDetailDTO.getLatitude() != null) {
-            double distance = getDistance(campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude);
-            if (log.isDebugEnabled()) {
-                log.debug("根据店铺经度=【{}】,纬度=【{}】和自己所在位置的经度=【{}】,纬度=【{}】计算出的距离：【{}km】", campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude, distance);
+        if(Objects.nonNull(latitude) && Objects.nonNull(longitude)) {
+            if (campsiteShopDetailDTO.getLongitude() != null && campsiteShopDetailDTO.getLatitude() != null) {
+                double distance = getDistance(campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude);
+                if (log.isDebugEnabled()) {
+                    log.debug("根据店铺经度=【{}】,纬度=【{}】和自己所在位置的经度=【{}】,纬度=【{}】计算出的距离：【{}km】", campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude, distance);
+                }
+                campsiteShopDetailVo.setDistance(String.format("%.1f", distance));
             }
-            campsiteShopDetailVo.setDistance(String.format("%.1f", distance));
         }
         campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));
         return campsiteShopDetailVo;

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -48,7 +48,9 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
      */
     @ApiOperation("查询营地详情")
     @GetMapping("/app/unauth/shop")
-    public ObjectRestResponse<CampsiteShopDetailVo> findCampsiteShopDetailById(@RequestParam("id") Integer id, @RequestParam("longitude") Double longitude, @RequestParam("latitude") Double latitude) {
+    public ObjectRestResponse<CampsiteShopDetailVo> findCampsiteShopDetailById(@RequestParam(value = "id") Integer id,
+                                                                               @RequestParam(value = "longitude",required = false) Double longitude,
+                                                                               @RequestParam(value = "latitude",required = false) Double latitude) {
         CampsiteShopDetailVo campsiteShopDetailVo = getBaseBiz().findCampsiteShopDetailById(id, longitude, latitude);
         return ObjectRestResponse.succ(campsiteShopDetailVo);
     }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/CampsiteUccnController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.campsite.feign.CampsiteFeign;
+import com.xxfc.platform.campsite.vo.CampsiteShopDetailVo;
+import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/28 10:05
+ */
+@RestController
+@RequestMapping("/app/unauth/campsite")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class CampsiteUccnController {
+
+    private final CampsiteFeign campsiteFeign;
+
+
+    @ApiOperation("分页查询营地列表")
+    @GetMapping("/shops")
+    public ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsiteShopPageByType(@RequestParam(value = "type", required = false) Integer type,
+                                                                                         @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
+                                                                                         @RequestParam(value = "pageSize", required = false, defaultValue = "6") Integer pageSize) {
+        return campsiteFeign.findCampsiteShopPageByType(type, pageNo, pageSize);
+    }
+
+    /**
+     * @param longitude 经度
+     * @param latitude  纬度
+     * @return
+     */
+    @ApiOperation("查询营地详情")
+    @GetMapping("/shop")
+    public ObjectRestResponse<CampsiteShopDetailVo> findCampsiteShopDetailById(@RequestParam(value = "id") Integer id,
+                                                                               @RequestParam(value = "longitude", required = false) Double longitude,
+                                                                               @RequestParam(value = "latitude", required = false) Double latitude) {
+        return campsiteFeign.findCampsiteShopDetailById(id, longitude, latitude);
+    }
+}