code clean

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -176,75 +176,75 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
     @Override
     public PaginationResponse<UserDto> queryMemberListByPagination(PaginationRequest paginationRequest) throws BusinessCheckException {
         Page<MtUser> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
-        LambdaQueryWrapper<MtUser> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.ne(MtUser::getStatus, StatusEnum.DISABLE.getKey());
+        LambdaQueryWrapper<MtUser> wrapper = Wrappers.lambdaQuery();
+        wrapper.ne(MtUser::getStatus, StatusEnum.DISABLE.getKey());
 
         String name = paginationRequest.getSearchParams().get("name") == null ? "" : paginationRequest.getSearchParams().get("name").toString();
         if (StringUtils.isNotBlank(name)) {
-            lambdaQueryWrapper.like(MtUser::getName, name);
+            wrapper.like(MtUser::getName, name);
         }
         String id = paginationRequest.getSearchParams().get("id") == null ? "" : paginationRequest.getSearchParams().get("id").toString();
         if (StringUtils.isNotBlank(id)) {
-            lambdaQueryWrapper.eq(MtUser::getId, id);
+            wrapper.eq(MtUser::getId, id);
         }
         String mobile = paginationRequest.getSearchParams().get("mobile") == null ? "" : paginationRequest.getSearchParams().get("mobile").toString();
         if (StringUtils.isNotBlank(mobile)) {
-            lambdaQueryWrapper.like(MtUser::getMobile, mobile);
+            wrapper.like(MtUser::getMobile, mobile);
         }
         String birthday = paginationRequest.getSearchParams().get("birthday") == null ? "" : paginationRequest.getSearchParams().get("birthday").toString();
         if (StringUtils.isNotBlank(birthday)) {
-            lambdaQueryWrapper.like(MtUser::getBirthday, birthday);
+            wrapper.like(MtUser::getBirthday, birthday);
         }
         String userNo = paginationRequest.getSearchParams().get("userNo") == null ? "" : paginationRequest.getSearchParams().get("userNo").toString();
         if (StringUtils.isNotBlank(userNo)) {
-            lambdaQueryWrapper.eq(MtUser::getUserNo, userNo);
+            wrapper.eq(MtUser::getUserNo, userNo);
         }
         String gradeId = paginationRequest.getSearchParams().get("gradeId") == null ? "" : paginationRequest.getSearchParams().get("gradeId").toString();
         if (StringUtils.isNotBlank(gradeId)) {
-            lambdaQueryWrapper.eq(MtUser::getGradeId, gradeId);
+            wrapper.eq(MtUser::getGradeId, gradeId);
         }
         String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
         if (StringUtils.isNotBlank(merchantId)) {
-            lambdaQueryWrapper.eq(MtUser::getMerchantId, merchantId);
+            wrapper.eq(MtUser::getMerchantId, merchantId);
         }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
-            lambdaQueryWrapper.eq(MtUser::getStoreId, storeId);
+            wrapper.eq(MtUser::getStoreId, storeId);
         }
         String storeIds = paginationRequest.getSearchParams().get("storeIds") == null ? "" : paginationRequest.getSearchParams().get("storeIds").toString();
         if (StringUtils.isNotBlank(storeIds)) {
             List<String> idList = Arrays.asList(storeIds.split(","));
             if (idList.size() > 0) {
-                lambdaQueryWrapper.in(MtUser::getStoreId, idList);
+                wrapper.in(MtUser::getStoreId, idList);
             }
         }
         String groupIds = paginationRequest.getSearchParams().get("groupIds") == null ? "" : paginationRequest.getSearchParams().get("groupIds").toString();
         if (StringUtils.isNotBlank(groupIds)) {
             List<String> idList = Arrays.asList(groupIds.split(","));
             if (idList.size() > 0) {
-                lambdaQueryWrapper.in(MtUser::getGroupId, idList);
+                wrapper.in(MtUser::getGroupId, idList);
             }
         }
         String status = paginationRequest.getSearchParams().get("status") == null ? "" : paginationRequest.getSearchParams().get("status").toString();
         if (StringUtils.isNotBlank(status)) {
-            lambdaQueryWrapper.eq(MtUser::getStatus, status);
+            wrapper.eq(MtUser::getStatus, status);
         }
         // 注册开始、结束时间
         String startTime = paginationRequest.getSearchParams().get("startTime") == null ? "" : paginationRequest.getSearchParams().get("startTime").toString();
         String endTime = paginationRequest.getSearchParams().get("endTime") == null ? "" : paginationRequest.getSearchParams().get("endTime").toString();
         if (StringUtil.isNotEmpty(startTime)) {
-            lambdaQueryWrapper.ge(MtUser::getCreateTime, startTime);
+            wrapper.ge(MtUser::getCreateTime, startTime);
         }
         if (StringUtil.isNotEmpty(endTime)) {
-            lambdaQueryWrapper.le(MtUser::getCreateTime, endTime);
+            wrapper.le(MtUser::getCreateTime, endTime);
         }
         // 注册时间
         String regTime = paginationRequest.getSearchParams().get("regTime") == null ? "" : paginationRequest.getSearchParams().get("regTime").toString();
         if (StringUtil.isNotEmpty(regTime)) {
             String[] dateTime = regTime.split("~");
             if (dateTime.length == 2) {
-                lambdaQueryWrapper.ge(MtUser::getCreateTime, dateTime[0]);
-                lambdaQueryWrapper.le(MtUser::getCreateTime, dateTime[1]);
+                wrapper.ge(MtUser::getCreateTime, dateTime[0]);
+                wrapper.le(MtUser::getCreateTime, dateTime[1]);
             }
         }
         // 活跃时间
@@ -252,8 +252,8 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (StringUtil.isNotEmpty(activeTime)) {
             String[] dateTime = activeTime.split("~");
             if (dateTime.length == 2) {
-                lambdaQueryWrapper.ge(MtUser::getUpdateTime, dateTime[0]);
-                lambdaQueryWrapper.le(MtUser::getUpdateTime, dateTime[1]);
+                wrapper.ge(MtUser::getUpdateTime, dateTime[0]);
+                wrapper.le(MtUser::getUpdateTime, dateTime[1]);
             }
         }
         // 会员有效期
@@ -261,13 +261,12 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (StringUtil.isNotEmpty(memberTime)) {
             String[] dateTime = memberTime.split("~");
             if (dateTime.length == 2) {
-                lambdaQueryWrapper.ge(MtUser::getStartTime, dateTime[0]);
-                lambdaQueryWrapper.le(MtUser::getEndTime, dateTime[1]);
+                wrapper.ge(MtUser::getStartTime, dateTime[0]);
+                wrapper.le(MtUser::getEndTime, dateTime[1]);
             }
         }
-
-        lambdaQueryWrapper.orderByDesc(MtUser::getUpdateTime);
-        List<MtUser> userList = mtUserMapper.selectList(lambdaQueryWrapper);
+        wrapper.orderByDesc(MtUser::getUpdateTime);
+        List<MtUser> userList = mtUserMapper.selectList(wrapper);
         List<UserDto> dataList = new ArrayList<>();
         for (MtUser mtUser : userList) {
             String phone = mtUser.getMobile();

fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java

@@ -23,7 +23,6 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendActionLogController.java

@@ -84,8 +84,6 @@ public class BackendActionLogController extends BaseController {
         }
 
         paginationRequest.setSearchParams(searchParams);
-        paginationRequest.setSortColumn(new String[]{"actionTime desc"});
-
         PaginationResponse<TActionLog> paginationResponse = tActionLogService.findLogsByPagination(paginationRequest);
         return getSuccessResult(paginationResponse);
     }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendConfirmLogController.java

@@ -111,8 +111,6 @@ public class BackendConfirmLogController extends BaseController {
                 searchParams.put("userId", "0");
             }
         }
-
-        paginationRequest.setSortColumn(new String[]{"updateTime desc", "id desc"});
         paginationRequest.setSearchParams(searchParams);
 
         // 登录员工所属店铺处理

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponController.java

@@ -149,7 +149,6 @@ public class BackendCouponController extends BaseController {
         }
 
         paginationRequest.setSearchParams(params);
-        paginationRequest.setSortColumn(new String[]{"status asc", "createTime desc"});
         PaginationResponse<MtCoupon> paginationResponse = couponService.queryCouponListByPagination(paginationRequest);
         List<MtCoupon> dataList = paginationResponse.getContent();
         List<MtCouponGroup> groupList = new ArrayList<>();

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponGroupController.java

@@ -4,7 +4,6 @@ import com.fuint.common.Constants;
 import com.fuint.common.dto.*;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.CouponGroupService;
-import com.fuint.common.service.CouponService;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.common.util.XlsUtil;
 import com.fuint.framework.dto.ExcelExportDto;
@@ -57,11 +56,6 @@ public class BackendCouponGroupController extends BaseController {
      */
     private CouponGroupService couponGroupService;
 
-    /**
-     * 卡券服务接口
-     * */
-    private CouponService couponService;
-
     /**
      * 导出服务接口
      * */

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -128,7 +128,6 @@ public class BackendGoodsController extends BaseController {
             params.put("status", status);
         }
         paginationRequest.setSearchParams(params);
-        paginationRequest.setSortColumn(new String[]{"status asc", "sort asc", "updateTime desc"});
         PaginationResponse<GoodsDto> paginationResponse = goodsService.queryGoodsListByPagination(paginationRequest);
 
         // 商品类型列表

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -96,7 +96,6 @@ public class BackendStaffController extends BaseController {
             params.put("category", category);
         }
         paginationRequest.setSearchParams(params);
-        paginationRequest.setSortColumn(new String[]{"auditedStatus asc", "id desc"});
         PaginationResponse<MtStaff> paginationResponse = staffService.queryStaffListByPagination(paginationRequest);
 
         // 员工类别列表

fuint-application/src/main/java/com/fuint/module/schedule/MessageJob.java

@@ -1,6 +1,5 @@
 package com.fuint.module.schedule;
 
-import com.fuint.common.service.MerchantService;
 import com.fuint.common.service.MessageService;
 import com.fuint.common.service.WeixinService;
 import com.fuint.framework.exception.BusinessCheckException;

fuint-utils/src/main/java/com/fuint/utils/QRCodeUtil.java

@@ -2,9 +2,6 @@ package com.fuint.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-
 import java.io.*;
 
 /**
@@ -14,10 +11,8 @@ import java.io.*;
  * CopyRight https://www.fuint.cn
  */
 public class QRCodeUtil {
-    public static final Logger logger = LoggerFactory.getLogger(QRCodeUtil.class);
 
-    @Autowired
-    private Environment env;
+    public static final Logger logger = LoggerFactory.getLogger(QRCodeUtil.class);
 
     /**
      * 保存二维码