更新sql和代码规范修改

yshop-module-express/yshop-module-express-api/src/main/java/co/yixiang/yshop/module/express/kdniao/model/dto/KdniaoApiBaseDTO.java

@@ -27,7 +27,7 @@ public class KdniaoApiBaseDTO {
     //API key
     private String apiKey;
 
-   //请求url
+    //请求url
     //https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
     private String reqURL;
 

yshop-module-express/yshop-module-express-api/src/main/java/co/yixiang/yshop/module/express/kdniao/model/dto/KdniaoElectronicsOrderDTO.java

@@ -183,11 +183,8 @@ public class KdniaoElectronicsOrderDTO extends KdniaoApiBaseDTO {
 
     /**
      * 体积
-     *
      */
     private Double volume;
 
 
-
-
 }

yshop-module-express/yshop-module-express-api/src/main/java/co/yixiang/yshop/module/express/kdniao/model/dto/KdniaoElectronicsOrderGoodsDTO.java

@@ -46,7 +46,4 @@ public class KdniaoElectronicsOrderGoodsDTO {
     private Double GoodsVol;
 
 
-
-
-
 }

yshop-module-express/yshop-module-express-api/src/main/java/co/yixiang/yshop/module/express/kdniao/model/vo/KdniaoApiVO.java

@@ -16,6 +16,7 @@ import java.util.List;
  * <p>
  * 快递鸟-物流-响应参数
  * </p>
+ *
  * @author hupeng
  */
 @Data

yshop-module-express/yshop-module-express-api/src/main/java/co/yixiang/yshop/module/express/kdniao/model/vo/KdniaoOrderVO.java

@@ -11,6 +11,7 @@ import lombok.experimental.SuperBuilder;
  * <p>
  * 快递鸟-面单-响应参数
  * </p>
+ *
  * @author hupeng
  * @date 2023/7/22
  */
@@ -50,7 +51,6 @@ public class KdniaoOrderVO {
     private OrderInfo Order;
 
 
-
     @Data
     @Builder
     @NoArgsConstructor

yshop-module-express/yshop-module-express-api/src/main/java/co/yixiang/yshop/module/express/kdniao/util/KdniaoUtil.java

@@ -40,10 +40,10 @@ public class KdniaoUtil {
      * @param queryDTO 请求参数
      * @return 物流信息
      */
-    public static KdniaoApiVO getLogisticInfo(KdniaoApiDTO queryDTO){
+    public static KdniaoApiVO getLogisticInfo(KdniaoApiDTO queryDTO) {
         KdniaoApiVO kdniaoApiVO = new KdniaoUtil().getLogisticBase(queryDTO);
-        if (Objects.equals(kdniaoApiVO.getSuccess(), "false")){
-           throw ServiceExceptionUtil.exception(new ErrorCode(999999,kdniaoApiVO.getReason()));
+        if (Objects.equals(kdniaoApiVO.getSuccess(), "false")) {
+            throw ServiceExceptionUtil.exception(new ErrorCode(999999, kdniaoApiVO.getReason()));
         }
 
         kdniaoApiVO.handleData();
@@ -55,11 +55,11 @@ public class KdniaoUtil {
      */
     public static KdniaoOrderVO getOrderInfo(KdniaoElectronicsOrderDTO queryDTO,
                                              List<KdniaoElectronicsOrderGoodsDTO> kdniaoElectronicsOrderGoodsDTOList) {
-        KdniaoOrderVO kdniaoOrderVO = new KdniaoUtil().getEleCtBase(queryDTO,kdniaoElectronicsOrderGoodsDTOList);
+        KdniaoOrderVO kdniaoOrderVO = new KdniaoUtil().getEleCtBase(queryDTO, kdniaoElectronicsOrderGoodsDTOList);
         //todo 由于目前快递鸟订单打印需要申请当地营业网店账号 所有目前这个没法测试 如果有其他用户有可以测试反馈给我们官方
-        if (Objects.equals(kdniaoOrderVO.getSuccess(), "false")){
+        if (Objects.equals(kdniaoOrderVO.getSuccess(), "false")) {
             log.error(kdniaoOrderVO.getReason());
-            throw ServiceExceptionUtil.exception(new ErrorCode(999999,kdniaoOrderVO.getReason()));
+            throw ServiceExceptionUtil.exception(new ErrorCode(999999, kdniaoOrderVO.getReason()));
         }
 
         return kdniaoOrderVO;
@@ -84,7 +84,7 @@ public class KdniaoUtil {
         requestParamMap.put("LogisticCode", logisticCode);
         String RequestData = JSON.toJSONString(requestParamMap);
         // 组装系统级参数
-        Map<String, String> params =  new HashMap<>();
+        Map<String, String> params = new HashMap<>();
         params.put("RequestData", this.urlEncoder(RequestData));
         params.put("EBusinessID", EBusinessID);
         params.put("RequestType", "1002");//免费1002 收费8001
@@ -109,8 +109,8 @@ public class KdniaoUtil {
         String ApiKey = queryDTO.getApiKey();
 
 
-        Map<String, Object> requestParamMap = this.doMap(queryDTO,kdniaoElectronicsOrderGoodsDTOList);
-        System.out.println("map:"+requestParamMap);
+        Map<String, Object> requestParamMap = this.doMap(queryDTO, kdniaoElectronicsOrderGoodsDTOList);
+        System.out.println("map:" + requestParamMap);
         String RequestData = JSON.toJSONString(requestParamMap);
         // 组装系统级参数
         Map<String, String> params = new HashMap<>();
@@ -127,7 +127,7 @@ public class KdniaoUtil {
 
     //组合数据
     private Map<String, Object> doMap(KdniaoElectronicsOrderDTO queryDTO,
-                                      List<KdniaoElectronicsOrderGoodsDTO> kdniaoElectronicsOrderGoodsDTOList){
+                                      List<KdniaoElectronicsOrderGoodsDTO> kdniaoElectronicsOrderGoodsDTOList) {
 
         // 组装应用级参数
         Map<String, Object> requestParamMap = new HashMap<>();

yshop-module-express/yshop-module-express-biz/pom.xml

@@ -66,7 +66,6 @@
         </dependency>
 
 
-
     </dependencies>
 
 </project>

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/ElectronicsOrderController.java

@@ -1,7 +1,9 @@
 package co.yixiang.yshop.module.express.controller.admin.electronicsorder;
 
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,11 +18,13 @@ import java.io.IOException;
 
 import co.yixiang.yshop.framework.common.pojo.PageResult;
 import co.yixiang.yshop.framework.common.pojo.CommonResult;
+
 import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
 
 import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
 
 import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
+
 import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
 
 import co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo.*;
@@ -91,7 +95,7 @@ public class ElectronicsOrderController {
     @PreAuthorize("@ss.hasPermission('express:electronics-order:export')")
     @OperateLog(type = EXPORT)
     public void exportElectronicsOrderExcel(@Valid ElectronicsOrderExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
+                                            HttpServletResponse response) throws IOException {
         List<ElectronicsOrderDO> list = electronicsOrderService.getElectronicsOrderList(exportReqVO);
         // 导出 Excel
         List<ElectronicsOrderExcelVO> datas = ElectronicsOrderConvert.INSTANCE.convertList02(list);

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/vo/ElectronicsOrderBaseVO.java

@@ -2,15 +2,16 @@ package co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import javax.validation.constraints.*;
 
 /**
-* 电子面单 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 电子面单 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class ElectronicsOrderBaseVO {
 

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/vo/ElectronicsOrderCreateReqVO.java

@@ -1,8 +1,11 @@
 package co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo;
 
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
+
 import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 电子面单创建 Request VO")

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/vo/ElectronicsOrderExcelVO.java

@@ -2,6 +2,7 @@ package co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/vo/ElectronicsOrderExportReqVO.java

@@ -1,10 +1,14 @@
 package co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo;
 
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import co.yixiang.yshop.framework.common.pojo.PageParam;
+
 import java.time.LocalDateTime;
+
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/vo/ElectronicsOrderPageReqVO.java

@@ -1,10 +1,13 @@
 package co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo;
 
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import co.yixiang.yshop.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/vo/ElectronicsOrderRespVO.java

@@ -2,6 +2,7 @@ package co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 电子面单 Response VO")

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/electronicsorder/vo/ElectronicsOrderUpdateReqVO.java

@@ -2,6 +2,7 @@ package co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
 import javax.validation.constraints.*;
 

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/express/ExpressController.java

@@ -97,7 +97,7 @@ public class ExpressController {
     @PreAuthorize("@ss.hasPermission('order:express:export')")
     @OperateLog(type = EXPORT)
     public void exportExpressExcel(@Valid ExpressExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
+                                   HttpServletResponse response) throws IOException {
         List<ExpressDO> list = expressService.getExpressList(exportReqVO);
         // 导出 Excel
         List<ExpressExcelVO> datas = ExpressConvert.INSTANCE.convertList02(list);
@@ -108,7 +108,7 @@ public class ExpressController {
     @Operation(summary = "获得快递鸟配置")
     public CommonResult<KdniaoApiBaseDTO> getExpressSet() {
         KdniaoApiBaseDTO kdniaoApiBaseDTO = expressRedisDAO.get();
-        if(Objects.isNull(kdniaoApiBaseDTO)){
+        if (Objects.isNull(kdniaoApiBaseDTO)) {
             kdniaoApiBaseDTO = new KdniaoApiBaseDTO();
             kdniaoApiBaseDTO.setApiKey("");
             kdniaoApiBaseDTO.setReqURL("");

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/admin/express/vo/ExpressBaseVO.java

@@ -6,9 +6,9 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 /**
-* 快递公司 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 快递公司 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class ExpressBaseVO {
 

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/controller/app/express/vo/ExpressBaseVO.java

@@ -6,9 +6,9 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 /**
-* 快递公司 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 快递公司 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class ExpressBaseVO {
 

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/dal/dataobject/electronicsorder/ElectronicsOrderDO.java

@@ -1,9 +1,11 @@
 package co.yixiang.yshop.module.express.dal.dataobject.electronicsorder;
 
 import lombok.*;
+
 import java.util.*;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.*;
 import co.yixiang.yshop.framework.mybatis.core.dataobject.BaseDO;
 

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/dal/redis/RedisKeyConstants.java

@@ -18,6 +18,4 @@ public interface RedisKeyConstants {
             STRING, KdniaoApiBaseDTO.class, RedisKeyDefine.TimeoutTypeEnum.FOREVER);
 
 
-
-
 }

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/dal/redis/express/ExpressRedisDAO.java

@@ -33,12 +33,11 @@ public class ExpressRedisDAO {
     }
 
     public void delete() {
-        String redisKey =YSHOP_EXPRESS_CACHE_KEY.getKeyTemplate();
+        String redisKey = YSHOP_EXPRESS_CACHE_KEY.getKeyTemplate();
         stringRedisTemplate.delete(redisKey);
     }
 
 
-
     private static String formatKey() {
         return String.format(YSHOP_EXPRESS_CACHE_KEY.getKeyTemplate());
     }

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/service/electronicsorder/ElectronicsOrderService.java

@@ -2,6 +2,7 @@ package co.yixiang.yshop.module.express.service.electronicsorder;
 
 import java.util.*;
 import javax.validation.*;
+
 import co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo.*;
 import co.yixiang.yshop.module.express.dal.dataobject.electronicsorder.ElectronicsOrderDO;
 import co.yixiang.yshop.framework.common.pojo.PageResult;

yshop-module-express/yshop-module-express-biz/src/main/java/co/yixiang/yshop/module/express/service/electronicsorder/ElectronicsOrderServiceImpl.java

@@ -1,10 +1,13 @@
 package co.yixiang.yshop.module.express.service.electronicsorder;
 
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
+
 import co.yixiang.yshop.module.express.controller.admin.electronicsorder.vo.*;
 import co.yixiang.yshop.module.express.dal.dataobject.electronicsorder.ElectronicsOrderDO;
 import co.yixiang.yshop.framework.common.pojo.PageResult;