feat: 优化接口

wzp

2025-05-07 c3253952bd256b1d6dd5ffd1e823bad521364a0e

feat: 优化接口

 doc/¹ãÖݷǼ±¾ÈתÔ˶ԽӵÚÈý·½½Ó¿ÚÎĵµ(1).docx

Binary files differ

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java

@@ -8,9 +8,7 @@
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppResultVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderDelVo;
import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.utils.civilAviation.ServiceOrderUtil;
import com.ruoyi.system.domain.SysClientApp;
import com.ruoyi.system.service.ISysClientAppService;
@@ -30,7 +28,6 @@
import com.ruoyi.system.service.ITbOrdersService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.entity.OrderCancelVo;

/**
 * ordersController
@@ -185,12 +182,12 @@
            return AjaxResult.error("订单状态已取消");
        }

        SysClientApp scApp = clientAppService.selectSysClientAppByAppKey("appId1");
        SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());


        ServiceOrderAppVo model = new ServiceOrderAppVo();
        model.setMethod("ServiceOrder_APP"); // è®¾ç½®æŽ¥å£åç§°
        model.setAppId(scApp.getMinAppId()); // è®¾ç½®å•†æˆ· APPID
        model.setAppId(tbOrders.getAppId()); // è®¾ç½®å•†æˆ· APPID
        model.setOrdType(tbOrders.getTypeCode().intValue());
        model.setCoPhone(tbOrders.getLinkTel()); // å®¢æˆ·è”系电话
        model.setCoName(tbOrders.getLinkPerson()); // å®¢æˆ·å§“名
@@ -240,9 +237,9 @@
        @ApiImplicitParam(name = "thirdOrderNo", value = "第三方订单号", required = true, dataType = "String"),
        @ApiImplicitParam(name = "reason", value = "取消原因", required = true, dataType = "String")
    })
    @Anonymous
    @Anonymous(needSign = true)
    @PostMapping("/cancelOrder")
    public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo)
    public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo,String appId)
    {
        try {
            if (cancelVo == null || cancelVo.getOrderID() == null || 
@@ -250,7 +247,7 @@
                return AjaxResult.error("必要参数不能为空！");
            }

            SysClientApp scApp = clientAppService.selectSysClientAppByAppId(1L);
            SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(appId);

            ServiceOrderDelVo model = new ServiceOrderDelVo();
            model.setMethod("ServiceOrder_DEL"); // è®¾ç½®æŽ¥å£åç§°
@@ -258,7 +255,7 @@
            model.setServiceOrdID(cancelVo.getThirdOrderNo()); // è®¾ç½®ç¬¬ä¸‰æ–¹è®¢å•å·
            model.setDELRemarks(cancelVo.getReason()); // è®¾ç½®å–消原因

            ServiceOrderAppResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
            ServiceOrderDelResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());

            if (result.getResult() == 1) {
                // æ›´æ–°æœ¬åœ°è®¢å•çŠ¶æ€
@@ -268,7 +265,7 @@
                tbOrdersService.updateTbOrders(tbOrders);
                return AjaxResult.success(result);
            } else {
                return AjaxResult.error("取消订单失败");
                return AjaxResult.error("取消订单失败",result);
            }
        } catch (Exception e) {
            return AjaxResult.error("取消订单失败:" + e.getMessage());

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ServiceOrderDelResultVo.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.common.core.domain.entity;

import lombok.Data;

/**
 * æœåŠ¡å•æŽ¥å£è°ƒç”¨ç»“æžœ
 */
@Data
public class ServiceOrderDelResultVo {
    private String method;
    private Integer result;
    private String ServiceOrdID;
    private Long errcode;
    private String errmsg;
}

 ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppResultVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderDelResultVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderDelVo;
import com.ruoyi.common.utils.http.HttpUtils;
import org.slf4j.Logger;
@@ -126,7 +127,7 @@
     * @param model æœåŠ¡è®¢å•åˆ é™¤è¯·æ±‚值对象
     * @return æœåŠ¡è®¢å•åˆ é™¤æŽ¥å£è°ƒç”¨ç»“æžœ
     */
    public static ServiceOrderAppResultVo CancelServiceOrder(ServiceOrderDelVo model,String appSecret) {
    public static ServiceOrderDelResultVo CancelServiceOrder(ServiceOrderDelVo model,String appSecret) {
        if (addServiceOrederAPI.isEmpty()) {
            // log.info("AddServiceOrederAPI æœªè®¾ç½®ï¼Œè¯·å…ˆè®¾ç½®æŽ¥å£åœ°å€ã€‚");
            return null;
@@ -144,10 +145,12 @@
            try {
                Object value = field.get(model);
                if (value != null) {
                    params.put(field.getName(), value.toString());
                    params.put(field.getName(),URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
                }
            } catch (IllegalAccessException e) {
                // log.error("获取对象属性值时出错", e);
            } catch (UnsupportedEncodingException e) {
                throw new RuntimeException(e);
            }
        }

@@ -166,9 +169,11 @@
                    }
                    // å°†å­—段名首字母大写
                    String fieldName = field.getName();
                    formData.append(fieldName)
                           .append("=")
                           .append(URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
                    String capitalizedFieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);

                    formData.append(capitalizedFieldName)
                            .append("=")
                            .append(URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
                }
            } catch (Exception e) {
                // log.error("拼接表单数据时出错", e);
@@ -180,7 +185,7 @@
        if (responseData != null && !responseData.isEmpty()) {
            // log.info("接口响应: " + responseData);
            try {
                return JSON.parseObject(responseData, ServiceOrderAppResultVo.class);
                return JSON.parseObject(responseData, ServiceOrderDelResultVo.class);
            } catch (Exception e) {
                // log.info("解析接口响应数据失败: " + e.getMessage());
            }