优化代码

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

@@ -60,4 +60,11 @@ public class OrderOpenApi {
         return openApiOrderService.pushOrder(orderDto);
     }
 
+    @ApiOperation("开放接口-取消订单")
+    @RequestMapping(value = "/cancel", method = RequestMethod.POST)
+    public ResponseResult cancelOrder(@RequestBody OrderReq orderReq) {
+        openApiOrderService.cancelOrder(orderReq);
+        return ResponseResult.success();
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.ydd.app.service;
 
+import com.ydd.app.dto.OrderReq;
 import com.ydd.app.dto.PushOrderDto;
 import com.ydd.common.core.domain.ResponseResult;
 
@@ -17,4 +18,10 @@ public interface OpenApiOrderService {
      */
     ResponseResult pushOrder(PushOrderDto orderDto);
 
+    /**
+     * 取消订单
+     * @param orderReq 取消订单请求参数
+     * @return 取消结果
+     */
+    Boolean cancelOrder(OrderReq orderReq);
 }

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

@@ -1,9 +1,11 @@
 package com.ydd.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydd.app.dto.OrderReq;
 import com.ydd.app.dto.PushOrderDto;
 import com.ydd.app.service.OpenApiOrderService;
 import com.ydd.common.core.domain.ResponseResult;
+import com.ydd.common.enums.ResponseResultCodeEnum;
 import com.ydd.common.utils.SnCodeUtils;
 import com.ydd.common.utils.StringUtils;
 import com.ydd.module.domain.Order;
@@ -109,12 +111,19 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
         return result;
     }
 
+    @Override
+    public Boolean cancelOrder(OrderReq orderReq) {
+        // Order order = iOrderService.selectOrderBySn(orderReq.getOrderSn(), orderReq.getoutt);
+        return null;
+    }
+
     private ResponseResult specialJudge(PushOrderDto orderDto) {
         ResponseResult result = ResponseResult.success();
         if (StringUtils.isBlank(orderDto.getShopCode())) {
             if (StringUtils.isBlank(orderDto.getSendName())) {
-                result.setCode(1);
-                result.setMessage("发件人名称不能为空");
+                return ResponseResult.error(ResponseResultCodeEnum.SHOP_NOT_EXIST);
+//                result.setCode(1);
+//                result.setMessage("发件人名称不能为空");
             }
             if (StringUtils.isBlank(orderDto.getSendPhone())) {
                 result.setCode(1);

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

@@ -72,4 +72,12 @@ public class ResponseResult<T> implements Serializable {
         return error(resultCodeEnum, null);
     }
 
+    public static <T> ResponseResult<T> emptyError(ResponseResultCodeEnum resultCodeEnum, T data, String message) {
+        return new ResponseResult<T>(resultCodeEnum.getCode(), message.concat(resultCodeEnum.getMessage()), data);
+    }
+
+    public static <T> ResponseResult<T> emptyError(ResponseResultCodeEnum resultCodeEnum, String message) {
+        return emptyError(resultCodeEnum, null, message);
+    }
+
 }

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

@@ -22,10 +22,12 @@ public enum ResponseResultCodeEnum {
     APP_ID_ERR(1002, "appId无效"),
     SIAN_ERR(1003, "签名验证失败"),
 
+
     // 门店、订单类状态码
     SHOP_NOT_EXIST(2001, "门店不存在"),
 
-
+    // 字段不能为空状态码
+    FIELD_NOT_EMPTY(3001, "不能为空"),
     ;
 
     private final int code;