mall-api

jeecg-mall-api/src/main/java/annotation/ApiLogin.java

@@ -1,4 +1,4 @@
-package annotation;
+package org.jeecg.annotation;
 
 import lombok.extern.slf4j.Slf4j;
 

jeecg-mall-api/src/main/java/com/util/ThirdSessionHolder.java

@@ -1,4 +1,4 @@
-package com.util;
+package org.jeecg.com.util;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
 import lombok.experimental.UtilityClass;

jeecg-mall-api/src/main/java/config/WebConfig.java

@@ -1,10 +1,10 @@
-package config;
+package org.jeecg.config;
 
-import interceptor.ThirdSessionInterceptor;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.sign.interceptor.SignAuthInterceptor;
+import org.jeecg.interceptor.ThirdSessionInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -26,13 +26,13 @@ public class WebConfig implements WebMvcConfigurer {
 //	@Resource
 //	private RedisUtil redisUtil;
 
-	@Bean
-	public ThirdSessionInterceptor thirdSessionInterceptor() {
-		return new ThirdSessionInterceptor();
-	}
+//	@Bean
+//	public ThirdSessionInterceptor thirdSessionInterceptor() {
+//		return new ThirdSessionInterceptor();
+//	}
 
-//	@Resource
-//	private ThirdSessionInterceptor thirdSessionInterceptor;
+	@Resource
+	private ThirdSessionInterceptor thirdSessionInterceptor;
 	/**
 	 * 拦截器
 	 * @param registry
@@ -44,7 +44,7 @@ public class WebConfig implements WebMvcConfigurer {
 		 * 进入ThirdSession拦截器
 		 */
 		registry
-				.addInterceptor(thirdSessionInterceptor())
+				.addInterceptor(thirdSessionInterceptor)
 				.addPathPatterns("/mall-api/**")  //拦截路径
                 .excludePathPatterns("/mall-api/wxuser/ma-login");     //不拦截路径
 		WebMvcConfigurer.super.addInterceptors(registry);

jeecg-mall-api/src/main/java/interceptor/ThirdSessionInterceptor.java

@@ -1,13 +1,14 @@
-package interceptor;
+package org.jeecg.interceptor;
+
 
-import annotation.ApiLogin;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.druid.support.json.JSONUtils;
-import com.util.ThirdSessionHolder;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.AuthenticationException;
+import org.jeecg.annotation.ApiLogin;
+import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBoot401Exception;
 import org.jeecg.common.exception.JeecgBootException;

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/CouponsCashUsedController.java

@@ -9,25 +9,19 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.DecimalMin;
-
-import annotation.ApiLogin;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.util.ThirdSessionHolder;
-import config.WebConfig;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.hpsf.Decimal;
+import org.jeecg.annotation.ApiLogin;
+import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TenantContextHolder;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.ApiVersion;
 import org.jeecg.config.ApiVersionConstant;
+import org.jeecg.config.WebConfig;
 import org.jeecg.modules.business.dto.CouponsGenerateDto;
 import org.jeecg.modules.business.dto.PostDataDto;
 import org.jeecg.modules.business.dto.ProvideCouponsUsedDto;

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/CouponsUsedController.java

@@ -1,18 +1,17 @@
 package org.jeecg.modules.bus.controller;
 
-import annotation.ApiLogin;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.util.ThirdSessionHolder;
-import config.WebConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.annotation.ApiLogin;
+import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -20,6 +19,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TenantContextHolder;
 import org.jeecg.config.ApiVersion;
 import org.jeecg.config.ApiVersionConstant;
+import org.jeecg.config.WebConfig;
 import org.jeecg.modules.business.dto.CouponsGenerateDto;
 import org.jeecg.modules.business.dto.PostDataDto;
 import org.jeecg.modules.business.dto.ProvideCouponsUsedDto;

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -1,16 +1,14 @@
 package org.jeecg.modules.bus.controller;
-import annotation.ApiLogin;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import config.WebConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jeecg.annotation.ApiLogin;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.constant.CommonConstant;
@@ -23,6 +21,7 @@ import org.jeecg.common.util.TenantContextHolder;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.config.ApiVersion;
 import org.jeecg.config.ApiVersionConstant;
+import org.jeecg.config.WebConfig;
 import org.jeecg.modules.business.entity.BusHotel;
 import org.jeecg.modules.business.entity.BusMarketCouponsCashUsed;
 import org.jeecg.modules.business.service.IBusHotelService;
@@ -55,7 +54,7 @@ import java.util.Map;
 @AllArgsConstructor
 @RequestMapping("/mall-api/hotel")
 @Slf4j
-public class HotelController extends  WebConfig {
+public class HotelController extends WebConfig {
     @Resource
     private IBusHotelService busHotelService;
     @Resource

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/MemberCardController.java

@@ -1,17 +1,14 @@
 package org.jeecg.modules.bus.controller;
-
-import annotation.ApiLogin;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.util.ThirdSessionHolder;
-import config.WebConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jeecg.annotation.ApiLogin;
+import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
@@ -22,6 +19,7 @@ import org.jeecg.common.util.TenantContextHolder;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.config.ApiVersion;
 import org.jeecg.config.ApiVersionConstant;
+import org.jeecg.config.WebConfig;
 import org.jeecg.modules.business.dto.UserGroupDto;
 import org.jeecg.modules.business.dto.UserLabelDto;
 import org.jeecg.modules.business.entity.*;

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/ParamXcxRoomController.java

@@ -1,9 +1,6 @@
 package org.jeecg.modules.bus.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import config.WebConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +15,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.config.ApiVersion;
 import org.jeecg.config.ApiVersionConstant;
+import org.jeecg.config.WebConfig;
 import org.jeecg.modules.business.entity.BusParamXcxRoom;
 import org.jeecg.modules.business.service.IBusParamXcxRoomService;
 import org.springframework.beans.factory.annotation.Autowired;

jeecg-mall-api/src/main/java/org/jeecg/modules/mall/controller/MallContactController.java

@@ -11,10 +11,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import annotation.ApiLogin;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.util.ThirdSessionHolder;
-import config.WebConfig;
+
+import org.jeecg.annotation.ApiLogin;
+import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.TenantContextHolder;
@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.config.ApiVersion;
 import org.jeecg.config.ApiVersionConstant;
+import org.jeecg.config.WebConfig;
 import org.jeecg.modules.mall.entity.MallContact;
 import org.jeecg.modules.mall.service.IMallContactService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

jeecg-mall-api/src/main/java/org/jeecg/modules/wxuser/controller/WxUserController.java

@@ -1,15 +1,15 @@
 package org.jeecg.modules.wxuser.controller;
 
-import annotation.ApiLogin;
-import config.WebConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.jeecg.annotation.ApiLogin;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.ApiVersion;
 import org.jeecg.config.ApiVersionConstant;
+import org.jeecg.config.WebConfig;
 import org.jeecg.modules.wxuser.dto.LoginDto;
 import org.jeecg.modules.wxuser.dto.WxOpenDataDto;
 import org.jeecg.modules.wxuser.entity.MallUserInfo;

jeecg-mall-api/src/main/java/org/jeecg/modules/wxuser/service/impl/UserInfoServiceImpl.java

@@ -10,8 +10,8 @@ import com.alibaba.druid.support.json.JSONUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.util.ThirdSessionHolder;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.util.JwtUtil;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/finance/controller/SummaryController.java

@@ -224,15 +224,17 @@ public class SummaryController {
 
 	@ApiOperation(value = "按房间统计当日收入明细列表", notes = "按房间统计当日收入明细列表")
 	@GetMapping(value = "/roomStatDetailList")
-	public Result<List<RoomStatVo>> getRoomStatDetailList(@RequestParam String hotelId) {
-		List<RoomStatVo> list = summaryService.roomStatList(hotelId);
+	public Result<List<RoomStatVo>> getRoomStatDetailList(@RequestParam String hotelId, @RequestParam(name = "startTime", required = true) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime startTime,
+														  @RequestParam(name = "endTime", required = true) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime endTime) {
+		List<RoomStatVo> list = summaryService.roomStatList(hotelId, startTime, endTime);
 		return Result.OK(list);
 	}
 
 	@ApiOperation(value = "按时间统计当日收入明细列表", notes = "按时间统计当日收入明细列表")
 	@GetMapping(value = "/dayOrderFeeList")
-	public Result<List<HashMap<String,Object>>> getDayOrderFeeList(@RequestParam String hotelId) {
-		List<HashMap<String, Object>> list = summaryService.dayOrderFeeList(hotelId);
+	public Result<List<HashMap<String,Object>>> getDayOrderFeeList(@RequestParam String hotelId, @RequestParam(name = "startTime", required = true) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime startTime,
+																   @RequestParam(name = "endTime", required = true) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime endTime) {
+		List<HashMap<String, Object>> list = summaryService.dayOrderFeeList(hotelId, startTime, endTime);
 		return Result.OK(list);
 	}
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/finance/mapper/SummaryMapper.java

@@ -618,9 +618,11 @@ public interface SummaryMapper extends BaseMapper<PosOrderGoodsPayment> {
             "<if test='hotelId != null and hotelId !=\"\"'> and b.hotel_id = '${hotelId}' </if>" +
             "and b.fee_type=2 and b.preferential_status=2 and b.subject_type!=4\n" +
             "-- and b.subject_type!=5\n" +
-            "and datediff(b.create_time,now())=0\n" +
+            "-- and datediff(b.create_time,now())=0\n" +
+            "<if test='startTime != null'> and b.create_time &gt;= '${startTime}' </if>" +
+            "<if test='endTime != null'> and b.create_time &lt;= '${endTime}' </if>" +
             "group by b.room_id</script>")
-    public List<RoomStatVo> roomStatList(@Param("hotelId") String hotelId);
+    public List<RoomStatVo> roomStatList(@Param("hotelId") String hotelId, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 
     /**
      * 按房间统计当日收入明细列表
@@ -634,10 +636,12 @@ public interface SummaryMapper extends BaseMapper<PosOrderGoodsPayment> {
             "on b.pay_type=p.id\n" +
             "where 1=1\n" +
             "and b.fee_type=2 and b.preferential_status=2 and subject_type!=4\n" +
-            "and datediff(b.create_time,now())=0\n" +
+            "/* and datediff(b.create_time,now())=0 */\n" +
             "<if test='roomId != null and roomId !=\"\"'> and b.room_id = '${roomId}' </if>" +
+            "<if test='startTime != null'> and b.create_time &gt;= '${startTime}' </if>" +
+            "<if test='endTime != null'> and b.create_time &lt;= '${endTime}' </if>" +
             "</script>")
-    public List<HashMap<String, Object>> roomStatDeatilList(@Param("roomId") String roomId);
+    public List<HashMap<String, Object>> roomStatDeatilList(@Param("roomId") String roomId, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 
     /**
      * 按时间统计当日收入明细列表
@@ -654,15 +658,20 @@ public interface SummaryMapper extends BaseMapper<PosOrderGoodsPayment> {
             "where 1=1\n" +
             "<if test='hotelId != null and hotelId !=\"\"'> and b.hotel_id = '${hotelId}' </if>" +
             "and b.fee_type=2 and b.preferential_status=2 and subject_type!=4\n" +
-            "and datediff(b.create_time,now())=0" +
+            "/* and datediff(b.create_time,now())=0 */" +
+            "<if test='startTime != null'> and b.create_time &gt;= '${startTime}' </if>" +
+            "<if test='endTime != null'> and b.create_time &lt;= '${endTime}' </if>" +
             "UNION ALL\n" +
             "select b.create_time,b.pay_money as money,'--' as room_name,'点餐' as subject_type_name,p.name as pay_name from pos_order_goods_payment b\n" +
             "left join bus_room_pay_type_info p\n" +
             "on b.payment_method=p.id\n" +
             "where 1=1\n" +
             "<if test='hotelId != null and hotelId !=\"\"'> and b.hotel_id = '${hotelId}' </if>" +
-            "and datediff(b.create_time,now())=0</script>")
-    public List<HashMap<String, Object>> dayOrderFeeList(@Param("hotelId") String hotelId);
+            "/* and datediff(b.create_time,now())=0 */" +
+            "<if test='startTime != null'> and b.create_time &gt;= '${startTime}' </if>" +
+            "<if test='endTime != null'> and b.create_time &lt;= '${endTime}' </if>" +
+            "</script>")
+    public List<HashMap<String, Object>> dayOrderFeeList(@Param("hotelId") String hotelId, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 
     /**
      * 按收款方式统计当日收入明细列表

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/finance/service/ISummaryService.java

@@ -108,14 +108,14 @@ public interface ISummaryService extends IService<PosOrderGoodsPayment> {
      * @param hotelId
      * @return
      */
-    public List<RoomStatVo> roomStatList(String hotelId);
+    public List<RoomStatVo> roomStatList(String hotelId, DateTime startTime,DateTime endTime);
 
     /**
      * 按时间统计当日收入明细列表
      * @param hotelId
      * @return
      */
-    public List<HashMap<String, Object>> dayOrderFeeList(String hotelId);
+    public List<HashMap<String, Object>> dayOrderFeeList(String hotelId, DateTime startTime,DateTime endTime);
 
     /**
      * 按收款方式统计当日收入明细列表

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/finance/service/impl/SummaryServiceImpl.java

@@ -208,11 +208,11 @@ public class SummaryServiceImpl extends ServiceImpl<SummaryMapper, PosOrderGoods
      * @param hotelId
      * @return
      */
-    public List<RoomStatVo> roomStatList(String hotelId) {
-        List<RoomStatVo> list = summaryMapper.roomStatList(hotelId);
+    public List<RoomStatVo> roomStatList(String hotelId,  DateTime startTime,  DateTime endTime) {
+        List<RoomStatVo> list = summaryMapper.roomStatList(hotelId, startTime, endTime);
         if (ObjectUtils.isNotEmpty(list)) {
             for (RoomStatVo roomStatVo : list) {
-                List<HashMap<String, Object>> detailList = summaryMapper.roomStatDeatilList(roomStatVo.getRoomId());
+                List<HashMap<String, Object>> detailList = summaryMapper.roomStatDeatilList(roomStatVo.getRoomId(), startTime, endTime);
                 roomStatVo.setDetailList(detailList);
             }
         }
@@ -224,8 +224,8 @@ public class SummaryServiceImpl extends ServiceImpl<SummaryMapper, PosOrderGoods
      * @param hotelId
      * @return
      */
-    public List<HashMap<String, Object>> dayOrderFeeList(String hotelId){
-        return summaryMapper.dayOrderFeeList(hotelId);
+    public List<HashMap<String, Object>> dayOrderFeeList(String hotelId,  DateTime startTime,  DateTime endTime){
+        return summaryMapper.dayOrderFeeList(hotelId, startTime, endTime);
     }
 
     /**