Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

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

@@ -78,6 +78,8 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
                 //获取出行时间
                 List<TourDepartTimeVo> timelist = priceMapper.getAllByGoodId(id);
                 detailVo.setTourDepartTimeVo(timelist);
+               Integer stock=priceMapper.getTotalStock(id);
+                detailVo.setStock(stock);
                 //获取出发地点
                 List<TourDepartVo> departList = siteMapper.getlistByGoodId(id);
                 detailVo.setTourDepartVo(departList);

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

@@ -18,6 +18,9 @@ public interface TourGoodSpePriceMapper extends Mapper<TourGoodSpePrice> {
 
     List<TourDepartTimeVo>  getAllByGoodId(@Param("goodId") Integer goodId);
 
+    //获取总库存
+    Integer getTotalStock(@Param("goodId") Integer goodId);
+
     //减库存
     int updStockById(@Param("id") Integer id,@Param("number") Integer number,@Param("type") Integer type);
 

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

@@ -34,7 +34,7 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     @GetMapping("/app/unauth/getTourUser/{isChild}")
     public ObjectRestResponse findListByTourUserByIsChild(@PathVariable int isChild){
         AppUserDTO userInfo = getUserInfo();
-        Integer id = userInfo.getId();
+        Integer id = userInfo.getUserid();
         List<TourUser> tourUsers= baseBiz.findListByTourUserByIsChild(id,isChild);
 
        return ObjectRestResponse.succ(tourUsers);
@@ -115,7 +115,7 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
         if (userInfo==null||userInfo.getUserid()==null||userInfo.getUserid()==0) {
             ObjectRestResponse.createDefaultFail();
         }
-        Integer id = userInfo.getId();
+        Integer id = userInfo.getUserid();
         List<TourUser> tourUsers= baseBiz.getTourUser(id);
         return ObjectRestResponse.succ(tourUsers);
     }

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

@@ -41,6 +41,11 @@
         FROM tour_good_spe_price WHERE good_id=#{goodId} and is_del=0 ORDER BY start_time
     </select>
 
+    <!-- 获取出行时间 -->
+    <select id="getTotalStock" resultType="Integer" >
+      SELECT IFNULL(SUM(stock),0) as stock FROM tour_good_spe_price WHERE good_id=#{goodId} and is_del=0 and IFNULL(DATEDIFF(start_time,NOW()),0)>0
+    </select>
+
     <!-- 减库存-->
     <update id="updStockById">
         update  tour_good_spe_price set