代码优化

lb-app/src/main/java/com/ydd/app/controller/OrderOpenApi.java

@@ -4,10 +4,10 @@ import com.ydd.app.dto.OrderReq;
 import com.ydd.app.dto.PushOrderDto;
 import com.ydd.app.dto.ValuationRes;
 import com.ydd.app.service.OpenApiOrderService;
-import com.ydd.common.annotation.AccessToken;
+import com.ydd.app.service.OpenApiOrderValuationService;
 import com.ydd.common.annotation.ControllerLog;
 import com.ydd.common.annotation.RepeatSubmit;
-import com.ydd.common.core.domain.BaseResult;
+import com.ydd.common.core.domain.ResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -32,11 +32,13 @@ public class OrderOpenApi {
 
     private final OpenApiOrderService openApiOrderService;
 
-    @ApiOperation("开放接口-订单模块-计价")
+    private final OpenApiOrderValuationService openApiOrderValuationService;
+
+    @ApiOperation("开放接口-计价")
     @RequestMapping(value = "/valuation", method = RequestMethod.POST)
     @RepeatSubmit
-    @ControllerLog("开放接口-订单模块-计价")
-    public BaseResult<ValuationRes> valuation(@RequestBody OrderReq orderReq) {
+    @ControllerLog("开放接口-计价")
+    public ResponseResult<ValuationRes> valuation(@RequestBody OrderReq orderReq) {
         // 0骑手，1货运
 //        if (null == orderReq.getTransport()) {
 //            orderReq.setTransport(0);
@@ -49,12 +51,12 @@ public class OrderOpenApi {
 //        if (resultData.getCode() == 1) {
 //            return BaseResult.error(resultData.getMsg());
 //        }
-        return BaseResult.success(null);
+        return ResponseResult.success();
     }
 
-    @ApiOperation("开放接口-订单模块-推送订单")
+    @ApiOperation("开放接口-推送订单")
     @RequestMapping(value = "/push", method = RequestMethod.POST)
-    public BaseResult pushOrder(@Valid PushOrderDto orderDto) {
+    public ResponseResult pushOrder(@Valid PushOrderDto orderDto) {
         return openApiOrderService.pushOrder(orderDto);
     }
 

lb-app/src/main/java/com/ydd/app/controller/StoreApi.java

@@ -1,34 +1,26 @@
 package com.ydd.app.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.app.dto.ShopReq;
 import com.ydd.app.dto.StoreDto;
 import com.ydd.app.dto.StoreStatusDto;
-import com.ydd.app.service.ApiShopService;
 import com.ydd.app.service.ApiStoreService;
 import com.ydd.common.annotation.AccessToken;
+import com.ydd.common.annotation.ControllerLog;
 import com.ydd.common.core.controller.BaseController;
 import com.ydd.common.core.domain.BaseResult;
-import com.ydd.common.core.page.PageResult;
+import com.ydd.common.core.domain.ResponseResult;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.domain.Shop;
-import com.ydd.module.dto.ShopDto;
-import com.ydd.module.dto.ShopSelectDto;
 import com.ydd.module.expection.CustomAppException;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * Project：lb-server
  * Class：ShopApi
@@ -52,10 +44,10 @@ public class StoreApi extends BaseController {
     @ApiOperation("新增门店")
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @AccessToken
-    public BaseResult saveShop(StoreDto storeDto) {
-        logger.info("创建门店参数---" + JSONObject.toJSONString(storeDto));
+    @ControllerLog("开放接口-创建门店")
+    public ResponseResult saveShop(StoreDto storeDto) {
         Shop shop = apiStoreService.saveShop(getLoginId(), storeDto, false);
-        return BaseResult.success((Object) shop.getCode());
+        return ResponseResult.success(shop.getCode());
     }
 
 
@@ -65,19 +57,19 @@ public class StoreApi extends BaseController {
     @ApiOperation("更新门店资料")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @AccessToken
-    public BaseResult modify(StoreDto shopReq) {
-        logger.info("-----更新门店资料-提交数据----" + JSONObject.toJSONString(shopReq));
+    @ControllerLog("开放接口-更新门店")
+    public ResponseResult modify(StoreDto shopReq) {
         Shop shop = apiStoreService.modify(getLoginId(), shopReq);
-        return BaseResult.success((Object) shop.getCode());
+        return ResponseResult.success(shop.getCode());
     }
 
-
     /**
      * 第三方审核修改
      */
     @ApiOperation("门店运力禁用")
     @RequestMapping(value = "/delivery/status", method = RequestMethod.POST)
     @AccessToken
+    @ControllerLog("开放接口-门店运力禁用")
     public BaseResult changeShopDelivery(@Validated StoreStatusDto dto) {
         try {
             if (StringUtils.isNotBlank(dto.getDeliveryIdStr())) {
@@ -86,7 +78,6 @@ public class StoreApi extends BaseController {
             } else {
                 return BaseResult.error("运力id不能为空");
             }
-
         } catch (CustomAppException e) {
             return BaseResult.error(e.getMessage());
         }
@@ -95,6 +86,7 @@ public class StoreApi extends BaseController {
     @ApiOperation("门店运力查询")
     @RequestMapping(value = "/delivery", method = RequestMethod.POST)
     @AccessToken
+    @ControllerLog("开放接口-门店运力查询")
     public BaseResult delivery(@Validated StoreStatusDto dto) {
         try {
             if (StringUtils.isNotBlank(dto.getDeliveryIdStr())) {
@@ -103,9 +95,9 @@ public class StoreApi extends BaseController {
             } else {
                 return BaseResult.error("运力id不能为空");
             }
-
         } catch (CustomAppException e) {
             return BaseResult.error(e.getMessage());
         }
     }
+
 }

lb-app/src/main/java/com/ydd/app/dto/StoreStatusDto.java

@@ -1,6 +1,5 @@
 package com.ydd.app.dto;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -19,8 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-public class StoreStatusDto extends  BaseDto implements Serializable {
-
+public class StoreStatusDto extends BaseDto implements Serializable {
 
     /** 门店编号 */
     @NotBlank(message = "门店编号不能为空")

lb-app/src/main/java/com/ydd/app/service/OpenApiOrderService.java

@@ -1,7 +1,7 @@
 package com.ydd.app.service;
 
 import com.ydd.app.dto.PushOrderDto;
-import com.ydd.common.core.domain.BaseResult;
+import com.ydd.common.core.domain.ResponseResult;
 
 /**
  * 订单类开放接口 Service
@@ -15,6 +15,6 @@ public interface OpenApiOrderService {
      * @param orderDto 推送订单信息
      * @return 推送结果
      */
-    BaseResult pushOrder(PushOrderDto orderDto);
+    ResponseResult pushOrder(PushOrderDto orderDto);
 
 }

lb-app/src/main/java/com/ydd/app/service/OpenApiOrderValuationService.java

@@ -0,0 +1,12 @@
+package com.ydd.app.service;
+
+/**
+ * 开放接口-订单计价Service
+ * @author 叶君翔
+ * @date 2022/04/08 15:51
+ */
+public interface OpenApiOrderValuationService {
+
+
+
+}

lb-app/src/main/java/com/ydd/app/service/impl/OpenApiOrderServiceImpl.java

@@ -3,7 +3,7 @@ package com.ydd.app.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydd.app.dto.PushOrderDto;
 import com.ydd.app.service.OpenApiOrderService;
-import com.ydd.common.core.domain.BaseResult;
+import com.ydd.common.core.domain.ResponseResult;
 import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.domain.Order;
@@ -37,9 +37,9 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
     private final IShopService iShopService;
 
     @Override
-    public BaseResult pushOrder(PushOrderDto orderDto) {
+    public ResponseResult pushOrder(PushOrderDto orderDto) {
         // 特殊必填处理
-        BaseResult result = specialJudge(orderDto);
+        ResponseResult result = specialJudge(orderDto);
         if (result.getCode() == 1) {
             return result;
         }
@@ -78,7 +78,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
                 order.setShopId(shop.getId());
                 order.setShopName(shop.getName());
             }
-        }else {
+        } else {
             order.setSendContactName(orderDto.getSendName());
             order.setSendPhone(orderDto.getSendPhone());
             order.setSendProvinceName(orderDto.getSendProvinceName());
@@ -98,58 +98,48 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
 
         if (order.getId() == null) {
             iOrderService.save(order);
-        }else {
+        } else {
             iOrderService.updateById(order);
         }
 
-        Map map = new HashMap();
+        Map<String, Object> map = new HashMap<>();
         map.put("outOrderSn", orderDto.getOutOrderSn());
         map.put("orderSn", order.getOrderSn());
         result.setData(map);
         return result;
     }
 
-    private BaseResult specialJudge(PushOrderDto orderDto) {
-        BaseResult result = new BaseResult();
-        result.setCode(0);
-        result.setMsg("success");
+    private ResponseResult specialJudge(PushOrderDto orderDto) {
+        ResponseResult result = ResponseResult.success();
         if (StringUtils.isBlank(orderDto.getShopCode())) {
-
             if (StringUtils.isBlank(orderDto.getSendName())) {
                 result.setCode(1);
-                result.setMsg("发件人名称不能为空");
+                result.setMessage("发件人名称不能为空");
             }
-
             if (StringUtils.isBlank(orderDto.getSendPhone())) {
                 result.setCode(1);
-                result.setMsg("发件人联系电话不能为空");
+                result.setMessage("发件人联系电话不能为空");
             }
-
             if (StringUtils.isBlank(orderDto.getSendProvinceName())) {
                 result.setCode(1);
-                result.setMsg("发件人所在省不能为空");
+                result.setMessage("发件人所在省不能为空");
             }
-
             if (StringUtils.isBlank(orderDto.getSendCityName())) {
                 result.setCode(1);
-                result.setMsg("发件人所在市不能为空");
+                result.setMessage("发件人所在市不能为空");
             }
-
             if (StringUtils.isBlank(orderDto.getSendAddress())) {
                 result.setCode(1);
-                result.setMsg("发件人详细地址不能为空");
+                result.setMessage("发件人详细地址不能为空");
             }
-
             if (StringUtils.isBlank(orderDto.getSendLng())) {
                 result.setCode(1);
-                result.setMsg("发件人纬度不能为空");
+                result.setMessage("发件人纬度不能为空");
             }
-
             if (StringUtils.isBlank(orderDto.getSendLat())) {
                 result.setCode(1);
-                result.setMsg("发件人经度不能为空");
+                result.setMessage("发件人经度不能为空");
             }
-
         }
         return result;
     }

lb-app/src/main/java/com/ydd/app/service/impl/OpenApiOrderValuationServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ydd.app.service.impl;
+
+import com.ydd.app.service.OpenApiOrderValuationService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 开放接口-订单计价ServiceImpl
+ * @author 叶君翔
+ * @date 2022/04/08 15:51
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class OpenApiOrderValuationServiceImpl implements OpenApiOrderValuationService {
+
+}

lb-common/src/main/java/com/ydd/common/core/domain/ResponseResult.java

@@ -0,0 +1,75 @@
+package com.ydd.common.core.domain;
+
+import com.ydd.common.enums.ResponseResultCodeEnum;
+
+import java.io.Serializable;
+
+/**
+ * 开放接口-通用返回对象
+ * @author 叶君翔
+ * @date 2022/04/08 15:51
+ */
+public class ResponseResult<T> implements Serializable {
+
+    private int code;
+    private String message;
+    private T data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    //几种构造方法
+    public ResponseResult() {
+    }
+
+    public ResponseResult(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public ResponseResult(int code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        if (data != null) {
+            this.data = data;
+        }
+    }
+
+    public static <T> ResponseResult<T> success(T data) {
+        return new ResponseResult<T>(ResponseResultCodeEnum.SUCCESS.getCode(), ResponseResultCodeEnum.SUCCESS.getMessage(), data);
+    }
+
+    public static <T> ResponseResult<T> success() {
+        return success(null);
+    }
+
+    public static <T> ResponseResult<T> error(ResponseResultCodeEnum resultCodeEnum, T data) {
+        return new ResponseResult<T>(resultCodeEnum.getCode(), resultCodeEnum.getMessage(), data);
+    }
+
+    public static <T> ResponseResult<T> error(ResponseResultCodeEnum resultCodeEnum) {
+        return error(resultCodeEnum, null);
+    }
+
+}

lb-common/src/main/java/com/ydd/common/enums/ResponseResultCodeEnum.java

@@ -0,0 +1,47 @@
+package com.ydd.common.enums;
+
+/**
+ * 返回结果code枚举
+ *
+ * 请求成功: 0
+ * 系统异常: -1
+ * 接口验签、入参校验: 1xxx
+ * 订单、门店状态码: 2xxx
+ *
+ * @author 叶君翔
+ * @date 2022/04/08 17:17
+ */
+public enum ResponseResultCodeEnum {
+
+    // 通用状态码
+    FAIL(-1, "系统异常"),
+    SUCCESS(0, "SUCCESS"),
+
+    // 接口验签、入参校验状态码
+    TIMESTAMP_ERR(1001, "timestamp错误"),
+    APP_ID_ERR(1002, "appId无效"),
+    SIAN_ERR(1003, "签名验证失败"),
+
+    // 门店、订单类状态码
+    SHOP_NOT_EXIST(2001, "门店不存在"),
+
+
+    ;
+
+    private final int code;
+    private final String message;
+
+    ResponseResultCodeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}