取消接口

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

@@ -113,4 +113,23 @@ public class DevelopmentApi extends BaseController {
         startPage();
         return apiDevelopService.rechargeList(getLoginId(), startTime, endTime);
     }
+
+//    @ApiOperation("收支明细")
+//    @RequestMapping(value = "/balance/detail")
+//    @AccessToken
+//    public ResponseResult balanceDetail(@RequestParam(required = false, name = "orderSn") String orderSn,
+//                                        @RequestParam(required = false, name = "cityName") String cityName,
+//                                        @RequestParam(required = false, name = "shopName") String shopName,
+//                                        @RequestParam(required = false, name = "startTime") String startTime,
+//                                        @RequestParam(required = false, name = "endTime") String endTime) {
+//        startPage();
+//        return apiDevelopService.balanceDetail(getLoginId(), orderSn, cityName, shopName, startTime, endTime);
+//    }
+
+//    @ApiOperation("优惠卷")
+//    @RequestMapping(value = "/member/coupon")
+//    @AccessToken
+//    public ResponseResult memberCoupon() {
+//        return apiDevelopService.selectMemberCoupon(getLoginId());
+//    }
 }

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

@@ -223,8 +223,14 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
     public ResponseResult cancelOrder(OrderCancelReq cancelReq) {
         ResponseResult result = ResponseResult.success();
         if (StringUtils.isBlank(cancelReq.getOrderSn()) || StringUtils.isBlank(cancelReq.getOutOrderSn())) {
-            return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "订单", null);
+            return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "猎豹订单号", null);
         }
+
+        if (StringUtils.isBlank(cancelReq.getOutOrderSn())) {
+            return ResponseResult.error(ResponseResultCodeEnum.FIELD_EMPTY, "接入方订单编号", null);
+        }
+
+
         Order order = iOrderService.selectOrderBySn(cancelReq.getOrderSn(), cancelReq.getOutOrderSn());
 
         if (Objects.isNull(order)) {
@@ -236,7 +242,7 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
             return ResponseResult.error(ResponseResultCodeEnum.ORDER_HAS_BEEN_CANCEL);
         }
 
-        if (1 != cancelReq.getCancelType() && 4 !=cancelReq.getCancelType()) {
+        if (1 != cancelReq.getCancelType() && 4 != cancelReq.getCancelType()) {
             return ResponseResult.error(ResponseResultCodeEnum.ORDER_CANCEL_TYPE_NOT_EXIST);
         }