修改

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java

@@ -33,7 +33,7 @@ import java.util.List;
 @EnableDiscoveryClient
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.universal.feign", "com.github.wxiaoqi.security.admin"})
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.universal.feign"})
 @EnableScheduling
 @EnableAceAuthClient
 @EnableAceCache

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

-package com.github.wxiaoqi.security.admin.feign;
-
-
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * ${DESCRIPTION}
- *
- * @author wanghaobin
- * @create 2017-06-21 8:11
- */
-@FeignClient(value = "ace-admin")
-public interface UserFeign {
-    @RequestMapping(value = "/public/app/userinfo-by-token")
-    public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
-
-}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

-package com.github.wxiaoqi.security.admin.feign.dto;
-
-import lombok.Data;
-/**
- * 用户详情信息表
- */
-@Data
-public class AppUserDTO {
-
-	private Integer id;
-	private Integer userid;
-	private Integer isMember;
-	private String nickname;
-	private String realname;
-	private String headimgurl;
-	private String email;
-	private Integer sex;
-	private String birthday;
-	private String personSign;
-	private String remark;
-	private Long createtime;
-	private Long updatetime;
-	private Integer isdel;
-
-}

xx-tour/xx-tour-api/pom.xml

@@ -11,12 +11,6 @@
     <groupId>com.xxfc.platform</groupId>
     <artifactId>xx-tour-api</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>com.github.wxiaoqi</groupId>
-            <artifactId>ace-admin</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourDepartTimeVo.java

@@ -56,6 +56,10 @@ public class TourDepartTimeVo {
 	@ApiModelProperty(value = "库存")
 	private Integer stock;
 
+	//是否过期
+	@ApiModelProperty(value = "是否过期")
+	private Integer overdue;
+
 	
 
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/TourApplication.java

@@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.github.wxiaoqi.security.admin.feign","com.xxfc.platform.tour.feign"})
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform"})
 @EnableAceCache
 @EnableCaching
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.tour.mapper")

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java → xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java

 package com.xxfc.platform.tour.common;
 
-import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.rest.BaseController;
+//import com.xxfc.platform.vehicle.feign.UserFeign;
+//import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
 
 @Slf4j
-public class TourBaseController<Biz extends BaseBiz>extends BaseController {
-
-    @Autowired
-    protected UserFeign userFeign;
-    @Autowired
-    protected UserAuthConfig userAuthConfig;
-
-  public AppUserDTO getUserInfo(){
-      return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
-  }
+public class TourBaseController<Biz extends BaseBiz> {
 
+//    @Autowired
+//    protected HttpServletRequest request;
+//
+//    @Autowired
+//    protected UserFeign userFeign;
+//    @Autowired
+//    protected UserAuthConfig userAuthConfig;
+//
+//    public AppUserDTO getUserInfo(){
+//        return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
+//    }
 
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodSpeController.java

 package com.xxfc.platform.tour.rest;
 
+
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.tour.biz.TourGoodSpeBiz;
@@ -15,18 +16,19 @@ public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
 
 
 
-    //获取商品详情
-    @RequestMapping(value = "/user/prices", method = RequestMethod.POST)
-    public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDTO priceDto) {
-        return baseBiz.getPricesByuserid(priceDto);
-    }
+    //获取价格
+//    @RequestMapping(value = "/user/prices", method = RequestMethod.POST)
+//    public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDTO  priceDto) {
+//        return   baseBiz.getPricesByuserid(priceDto);
+//    }
+//
+//    //减库存
+//    @RequestMapping(value = "/stock", method = RequestMethod.GET)
+//    public ObjectRestResponse<TourSpePriceVo> stock(
+//            @RequestParam(value = "speId",defaultValue = "0")Integer speId,
+//            @RequestParam(value = "number",defaultValue = "0") Integer number){
+//        return   baseBiz.cutStock(speId,number);
+//    }
 
-    //减库存
-    @RequestMapping(value = "/stock", method = RequestMethod.GET)
-    public ObjectRestResponse<TourSpePriceVo> stock(
-            @RequestParam(value = "speId",defaultValue = "0")Integer speId,
-            @RequestParam(value = "number",defaultValue = "0") Integer number){
-        return   baseBiz.cutStock(speId,number);
-    }
 
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java

 package com.xxfc.platform.tour.rest;
 
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ListRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourUserBiz;

xx-tour/xx-tour-server/src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.1.37.192:8848
+        server-addr: 127.0.0.1:8848
 
 ---
 spring:

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -36,7 +36,7 @@
            and t.id in (SELECT s.good_id from (
            select good_id,
            if(ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0- #{params.latitude}* PI() / 180.0)/2), 2)+COS( latitude * PI() / 180.0)*COS( #{params.longitude} * PI() / 180.0)
-           *POW(SIN((longitude * PI() / 180.0 - #{params.longitude}* PI() /180.0)/2),2))))*6378.137)*10000)/10000 is null ,0,ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0-22.954205* PI() / 180.0)/2), 2)+COS( latitude * PI() / 180.0)*COS(113.879421 * PI() / 180.0)
+           *POW(SIN((longitude * PI() / 180.0 - #{params.longitude}* PI() /180.0)/2),2))))*6378.137)*10000)/10000 is null ,0,ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0- #{params.latitude* PI() / 180.0)/2), 2)+COS( latitude * PI() / 180.0)*COS(#{params.longitude} * PI() / 180.0)
            *POW(SIN((longitude * PI() / 180.0 - #{params.longitude}* PI() /180.0)/2),2))))*6378.137)*10000)/10000 ) AS distance
            FROM tour_good_site
            order by distance

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSpePriceMapper.xml

@@ -31,13 +31,14 @@
         <result property="stock" column="stock"/>
         <result property="startWeek" column="startWeek"/>
         <result property="endWeek" column="endWeek"/>
+        <result property="overdue" column="overdue"/>
     </resultMap>
 
     <!-- 获取出行时间 -->
     <select id="getAllByGoodId"  resultMap="tourDepartTimeVoMap">
         SELECT id,good_id,good_id,DATE_FORMAT(start_time,'%Y-%m-%d') as start_time,DATE_FORMAT(end_time,'%Y-%m-%d') as end_time,spe_id,price,child_price,member_price,stock,
-        DATE_FORMAT(start_time,'%w') as startWeek,DATE_FORMAT(end_time,'%w') as endWeek
-        FROM tour_good_spe_price WHERE good_id=#{goodId} and is_del=0
+        DATE_FORMAT(start_time,'%w') as startWeek,DATE_FORMAT(end_time,'%w') as endWeek,IF(IFNULL(DATEDIFF(start_time,NOW()),0)>0,'0','1') as overdue
+        FROM tour_good_spe_price WHERE good_id=#{goodId} and is_del=0  ORDER BY start_time
     </select>
 
     <!-- 减库存-->