包装类 比较用equals

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java

@@ -16,7 +16,6 @@
  */
 package org.springblade.system.user.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/BoxTubeApplication.java

@@ -16,12 +16,10 @@
  */
 package org.springblade.box.tube;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 箱管启动器
@@ -29,10 +27,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author Chill
  */
 @EnableBladeFeign
-@EnableFeignClients({"org.springblade"})
 @SpringCloudApplication
 @SeataCloudApplication
-@MapperScan({"org.springblade.box.tube.**.mapper.**"})
 public class BoxTubeApplication {
 
 	public static void main(String[] args) {

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/RepairServiceImpl.java

@@ -27,7 +27,6 @@ import lombok.AllArgsConstructor;
 import org.springblade.box.tube.entity.*;
 import org.springblade.box.tube.mapper.*;
 import org.springblade.box.tube.service.IRepairService;
-import org.springblade.box.tube.utils.GeneralToolsUtils;
 import org.springblade.box.tube.vo.RepairVO;
 import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;

blade-service/blade-box-tube/src/main/resources/application-dev.yml

@@ -1,12 +1,9 @@
 #服务器端口
 server:
   port: 8096
-  profile: D:/ruoyi/uploadPath
-
 #数据源配置
 spring:
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
     url: ${blade.datasource.dev.url}
     username: ${blade.datasource.dev.username}
     password: ${blade.datasource.dev.password}
@@ -14,7 +11,3 @@ spring:
 #  mapper-locations: classpath:com/yh/project/mapper/*Mapper.xml
 #  type-aliases-package: com.yh.project.*.entity
 #swagger文档
-swagger:
-  base-packages:
-    - org.springblade.box.tube
-

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -16,8 +16,6 @@
  */
 package org.springblade.check.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -11,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.client.constant.LandConstant;
 import org.springblade.client.corps.excel.*;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.corps.service.ICorpsTypeDescService;

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescPartsController.java

@@ -19,7 +19,6 @@ import org.springblade.client.entity.CorpsAddr;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.CorpsType;
 import org.springblade.client.entity.CorpsTypeDesc;
-import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
@@ -29,7 +28,6 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.system.user.entity.User;

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -34,7 +34,6 @@ import org.springblade.client.goods.excel.GoodsInfoExcel;
 import org.springblade.client.goods.excel.GoodsInfoPartsExcel;
 import org.springblade.client.goods.mapper.*;
 import org.springblade.client.goods.service.IGoodsDescService;
-import org.springblade.client.goods.service.IGoodsFilesService;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.client.vo.ProductVO;
 import org.springblade.core.log.exception.ServiceException;
@@ -52,7 +51,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.math.MathContext;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -847,7 +845,10 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 		});
 		return R.success("ok");
 	}
-
+   /**
+   * 提取Cname 的 数字
+   * 取出数字作为查询条件
+   */
 	private String getCnameInt(String cname) {
 		String regex = "[^0-9]";
 		Pattern p = Pattern.compile(regex);

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsTypeServiceImpl.java

@@ -19,8 +19,6 @@ package org.springblade.client.goods.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.client.entity.CorpsType;
-import org.springblade.client.entity.FeesType;
 import org.springblade.client.entity.GoodsType;
 import org.springblade.client.vo.GoodsTypeVO;
 import org.springblade.client.goods.mapper.GoodsTypeMapper;

blade-service/blade-client/src/main/java/org/springblade/client/message/service/impl/MessageServiceImpl.java

@@ -37,9 +37,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

blade-service/blade-client/src/main/java/org/springblade/client/parities/controller/ParitiesController.java

@@ -17,17 +17,20 @@
 package org.springblade.client.parities.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.client.parities.entity.Parities;
 import org.springblade.client.parities.entity.ParitiesItem;
 import org.springblade.client.parities.service.IParitiesItemService;
+import org.springblade.client.parities.service.IParitiesService;
+import org.springblade.client.parities.vo.ParitiesVO;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -36,12 +39,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.client.parities.entity.Parities;
-import org.springblade.client.parities.vo.ParitiesVO;
-import org.springblade.client.parities.service.IParitiesService;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

blade-service/blade-client/src/main/java/org/springblade/client/school/controller/SchoolConfigController.java

@@ -17,15 +17,17 @@
 package org.springblade.client.school.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.client.entity.SchoolConfig;
 import org.springblade.client.school.service.ISchoolConfigService;
+import org.springblade.client.vo.SchoolConfigVO;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -34,10 +36,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.client.entity.SchoolConfig;
-import org.springblade.client.vo.SchoolConfigVO;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 
 /**
  * 学校拨付标准配置主表 控制器

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/StorageTypeServiceImpl.java

@@ -5,16 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.AllArgsConstructor;
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.entity.StorageType;
 import org.springblade.client.serial.mapper.StorageTypeMapper;
-import org.springblade.client.serial.service.IStorageDescService;
-import org.springblade.client.serial.service.IStorageTypeDescService;
 import org.springblade.client.serial.service.IStorageTypeService;
 import org.springblade.client.vo.StorageTypeVO;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/AllotController.java

@@ -8,7 +8,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.StorageDesc;
@@ -22,14 +21,12 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.deliver.goods.entity.Delivery;
-import org.springblade.deliver.goods.enums.DeliveryEnum;
 import org.springblade.deliver.goods.enums.DeliveryStatusEnum;
 import org.springblade.deliver.goods.service.IDeliveryFeesService;
 import org.springblade.deliver.goods.service.IDeliveryFilesService;
 import org.springblade.deliver.goods.service.IDeliveryItemsService;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
-import org.springblade.purchase.sales.entity.Order;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -17,25 +17,22 @@
 package org.springblade.deliver.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.StorageDesc;
-import org.springblade.client.entity.StorageType;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.feign.IStorageClient;
 import org.springblade.common.annotation.RepeatSubmit;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -45,6 +42,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.entity.DeliveryItems;
 import org.springblade.deliver.goods.enums.DeliveryEnum;
 import org.springblade.deliver.goods.enums.DeliveryStatusEnum;
@@ -52,22 +50,17 @@ import org.springblade.deliver.goods.excel.SaleDeliveryExcel;
 import org.springblade.deliver.goods.service.IDeliveryFeesService;
 import org.springblade.deliver.goods.service.IDeliveryFilesService;
 import org.springblade.deliver.goods.service.IDeliveryItemsService;
-import org.springblade.purchase.sales.excel.SaleOrderExcel;
-import org.springblade.purchase.sales.vo.OrderVO;
-import org.springblade.purchase.sales.vo.SalesDetailsVo;
+import org.springblade.deliver.goods.service.IDeliveryService;
+import org.springblade.deliver.goods.vo.DeliveryVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.deliver.goods.entity.Delivery;
-import org.springblade.deliver.goods.vo.DeliveryVO;
-import org.springblade.deliver.goods.service.IDeliveryService;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 国内发货通知单 控制器

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryReportController.java

@@ -34,7 +34,6 @@ import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 /**

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ImportDeliveryController.java

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.trade.purchase.order.entity.Order;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ReCeVingController.java

@@ -27,7 +27,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IStorageClient;
@@ -44,7 +43,6 @@ import org.springblade.deliver.goods.entity.FactoryDelivery;
 import org.springblade.deliver.goods.service.IDeliveryItemsService;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
-import org.springblade.stock.entity.StockGoods;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
@@ -52,10 +50,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 国内收货通知单 控制器

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -24,7 +24,7 @@
         select * from land_order where is_deleted = 0
     </select>
 
-    <select id="selectAcctList" resultType="org.springblade.land.vo.OrderAcctVO">
+     <select id="selectAcctList" resultType="org.springblade.land.vo.OrderAcctVO">
         select t1.id as orderId,
             t2.id as itemId,
             t1.corp_id as corpId,

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/BusinessOverpaymentController.java

@@ -16,32 +16,30 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.purchase.sales.entity.Order;
+import org.springblade.mocha.entity.BusinessOverpayment;
+import org.springblade.mocha.service.IBusinessOverpaymentService;
+import org.springblade.mocha.vo.BusinessOverpaymentVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.mocha.entity.BusinessOverpayment;
-import org.springblade.mocha.vo.BusinessOverpaymentVO;
-import org.springblade.mocha.service.IBusinessOverpaymentService;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceServiceImpl.java

@@ -24,7 +24,6 @@ import org.springblade.core.tool.api.R;
 import org.springblade.mocha.entity.Price;
 import org.springblade.mocha.entity.PriceItem;
 import org.springblade.mocha.mapper.PriceItemMapper;
-import org.springblade.mocha.vo.PriceVO;
 import org.springblade.mocha.mapper.PriceMapper;
 import org.springblade.mocha.service.IPriceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -28,7 +28,6 @@ import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.feign.ICheckClient;
-import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.entity.GoodsType;
 import org.springblade.client.feign.ICorpsDescClient;
@@ -36,7 +35,6 @@ import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.mocha.entity.SalesPolicy;
 import org.springblade.mocha.entity.SalesPolicyItem;
@@ -46,15 +44,12 @@ import org.springblade.mocha.mapper.SalesPolicyMapper;
 import org.springblade.mocha.service.ISalesPolicyService;
 import org.springblade.mocha.vo.SalesPolicyItemVO;
 import org.springblade.mocha.vo.SalesPolicyVO;
-import org.springblade.purchase.sales.entity.Biding;
-import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.rmi.server.ServerCloneException;
 import java.util.*;
 
 /**

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -14,7 +14,6 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;

blade-service/blade-project/src/main/java/org/springblade/project/mapper/HandoverItemMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.project.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.springblade.project.entity.HandoverItem;
 import org.springblade.project.vo.HandoverItemVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -28,6 +29,7 @@ import java.util.List;
  * @author BladeX
  * @since 2022-04-07
  */
+@Mapper
 public interface HandoverItemMapper extends BaseMapper<HandoverItem> {
 
 	/**

blade-service/blade-project/src/main/java/org/springblade/project/mapper/HandoverMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.project.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.springblade.project.entity.Handover;
 import org.springblade.project.vo.HandoverVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -28,6 +29,7 @@ import java.util.List;
  * @author BladeX
  * @since 2022-04-07
  */
+@Mapper
 public interface HandoverMapper extends BaseMapper<Handover> {
 
 	/**

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -812,7 +812,7 @@ public class OrderController extends BladeController {
 		return R.data(orderStatisticAnalysisVOIPage);
 	}
 
-	@PostMapping("checkOrder")
+	@PostMapping("/checkOrder")
 	@RepeatSubmit
 	public R checkOrder(@RequestBody Order order) {
 		orderService.checkOrder(order);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderItemsController.java

@@ -16,19 +16,16 @@
  */
 package org.springblade.purchase.sales.controller;
 
-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.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springblade.client.entity.FeesDesc;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -40,11 +37,9 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.feign.IDeliveryClient;
 import org.springblade.purchase.sales.entity.Order;
-import org.springblade.purchase.sales.entity.OrderFees;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.excel.*;
 import org.springblade.purchase.sales.service.IOrderItemsService;
@@ -59,9 +54,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/dealer/DealerOrderController.java

@@ -19,11 +19,8 @@ package org.springblade.purchase.sales.dealer;
 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.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
@@ -31,17 +28,14 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.FeesDesc;
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IFeesDescClient;
 import org.springblade.client.feign.IStorageClient;
-import org.springblade.client.vo.CorpListVo;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -53,12 +47,12 @@ import org.springblade.deliver.goods.feign.IDeliveryClient;
 import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.purchase.sales.entity.Order;
-import org.springblade.purchase.sales.entity.OrderFees;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.excel.orderItemStat;
 import org.springblade.purchase.sales.excel.orderItemStatExcel;
 import org.springblade.purchase.sales.service.*;
-import org.springblade.purchase.sales.vo.*;
+import org.springblade.purchase.sales.vo.OrderItemsVO;
+import org.springblade.purchase.sales.vo.OrderVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -70,7 +64,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 国内销售或采购订单表 控制器

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingItemsServiceImpl.java

@@ -25,8 +25,6 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingServiceImpl.java

@@ -1,9 +1,6 @@
 package org.springblade.purchase.sales.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 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.service.impl.ServiceImpl;
 import io.seata.common.util.CollectionUtils;
@@ -24,7 +21,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.purchase.sales.entity.Biding;

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -430,14 +430,12 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 				orderDateVo.setOrderNumber(orderDateVoList.stream().filter(e -> e.getBelongToCorpId().longValue() == corpsDesc.getId().longValue()).map(OrderDateVo::getOrderNumber).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(0, BigDecimal.ROUND_HALF_UP));
 				list.add(orderDateVo);
 			}
-		} else if (CollectionUtils.isNotEmpty(corpsType) && CollectionUtils.isEmpty(orderDateVoList)) {
-			for (CorpsDesc corpsDesc : corpsType) {
+		} else if (CollectionUtils.isNotEmpty(corpsType) && CollectionUtils.isEmpty(orderDateVoList)) for (CorpsDesc corpsDesc : corpsType) {
 				OrderDateVo orderDateVo = new OrderDateVo();
 				orderDateVo.setBelongToCorpName(corpsDesc.getGoodtypes());
 				orderDateVo.setOrderNumber(BigDecimal.ZERO);
 				list.add(orderDateVo);
 			}
-		}
 		return list;
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -2520,6 +2520,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Override
 	public R returnGoodsRefund(Order order) {
 
 		Order selectOrder = baseMapper.selectById(order.getId());

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryAccessoryController.java

@@ -17,28 +17,27 @@
 package org.springblade.school.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.school.entity.SalaryItem;
+import org.springblade.school.entity.SalaryAccessory;
+import org.springblade.school.service.ISalaryAccessoryService;
+import org.springblade.school.vo.SalaryAccessoryVO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.school.entity.SalaryAccessory;
-import org.springblade.school.vo.SalaryAccessoryVO;
-import org.springblade.school.service.ISalaryAccessoryService;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 
 /**
  * 附件导入记录 控制器

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -43,11 +43,11 @@ import org.springblade.system.cache.SysCache;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.ITenantClient;
+import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
 import org.springblade.system.user.excel.UserImporter;
 import org.springblade.system.user.feign.IUserSearchClient;
-import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.vo.UserVO;
 import org.springblade.system.user.wrapper.UserWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -79,8 +79,7 @@ public class UserController {
 	private final ISysClient sysClient;
 	private final IUserSearchClient userSearchClient;
 
-	private final IRedisClient redisClient;//redis缓存处理
-
+	private final IRedisClient redisClient;
 	/**
 	 * 查询单条
 	 */

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -25,11 +25,11 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.entity.UserInfo;
 import org.springblade.system.user.entity.UserOauth;
 import org.springblade.system.user.enums.UserEnum;
-import org.springblade.system.user.service.IUserService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserSearchClient.java

@@ -20,8 +20,8 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.user.entity.User;
 import org.springblade.system.user.service.IUserSearchService;
+import org.springblade.system.user.entity.User;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 

blade-service/store-goods/src/main/java/com/store/goods/controller/OrderController.java

@@ -17,21 +17,22 @@
 package com.store.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.store.goods.entity.GoodsItems;
+import com.store.goods.entity.Order;
 import com.store.goods.entity.OrderItems;
 import com.store.goods.service.IGoodsItemsService;
 import com.store.goods.service.IOrderAddressService;
 import com.store.goods.service.IOrderItemsService;
+import com.store.goods.service.IOrderService;
 import com.store.goods.vo.ShoppingCartVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -40,12 +41,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.store.goods.entity.Order;
-import com.store.goods.vo.OrderVO;
-import com.store.goods.service.IOrderService;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -41,8 +41,6 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.deliver.goods.entity.Delivery;
-import org.springblade.deliver.goods.excel.SaleDeliveryExcel;
 import org.springblade.finance.dto.ApplyDTO;
 import org.springblade.finance.dto.SettlementDTO;
 import org.springblade.finance.entity.InvoiceItem;
@@ -57,8 +55,6 @@ import org.springblade.finance.vo.SettlementVO;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
-import org.springblade.purchase.sales.entity.Order;
-import org.springblade.purchase.sales.vo.OrderSettlementVo;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;

blade-service/trade-purchase/src/main/java/com/trade/purchase/dealer/PurchaseContract.java

@@ -14,7 +14,6 @@ import com.trade.purchase.order.entity.OrderFiles;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.service.*;
-import com.trade.purchase.order.vo.OrderDTO;
 import com.trade.purchase.order.vo.OrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,7 +24,6 @@ import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.feign.IStorageClient;
-import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/PurchaseEnquiry.java

@@ -19,7 +19,6 @@ import com.trade.purchase.order.service.IOrderService;
 import com.trade.purchase.order.vo.OrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -3,8 +3,6 @@ package com.trade.purchase.order.controller;
 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.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -26,7 +24,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import lombok.val;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
@@ -34,7 +31,6 @@ import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;