fix: 修复md5加密规则 增加介绍人字段

wzp

2025-05-19 7aad41284d522002584383aaa9e34caa14a2b2aa

fix:
修复md5加密规则
增加介绍人字段

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

@@ -133,7 +133,6 @@
            model.setMethod("ServiceOrder_APP"); // 设置接口名称
            model.setAppId(scApp.getMinAppId()); // 设置商户 APPID


            model.setOrdType(tbOrders.getTypeCode().intValue());
            model.setCoPhone(tbOrders.getLinkTel()); // 客户联系电话
            model.setCoName(tbOrders.getLinkPerson()); // 客户姓名
@@ -167,7 +166,7 @@
//        model.setDoctor("医生" + (int) (Math.random() * 10)); // 随机设置患者医生
//        model.setDoctorPhone("13" + (int) (Math.random() * 900000000 + 100000000)); // 随机生成患者医生电话
            model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 生成报价
//        model.setReferrals("推介人" + (int) (Math.random() * 10)); // 随机设置推介人信息
          model.setReferrals(scApp.getReferrals()); // 设置推介人名称为机构名称
//        model.setUnitRemarks("商户随机备注信息"); // 随机设置商户备注
          model.setPayQRcodeURL(scApp.getPayUrl());


 ruoyi-admin/src/main/resources/application-dev.yml

@@ -86,4 +86,4 @@
              instanceId: AUTO
# 民航接口地址
min:
  apiUrl: http://120.25.98.119:8084/v1/   #测试环境：localhost:8011
  apiUrl: http://120.25.98.119:8084/v1/   #测试环境：localhost:8011  #http://120.25.98.119:8084/v1/

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -6,9 +6,9 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://127.0.0.1:3307/mhyl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://127.0.0.1:3306/mhyl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: abcd1234
        password: 2025@@gdmh$$
      # 从库数据源
      # SQL Server数据源
      sqlserver:

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

@@ -132,6 +132,8 @@
     * 民航字典orderClass
     */
    private String ordClass;


    /**
     * 民航分公司Id
     */

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

@@ -294,8 +294,8 @@
            String value = params.get(key);
            if (value != null && !value.isEmpty()) {
                // 将参数名首字母大写
                String capitalizedKey = StringUtils.capitalize(key);
                stringA.append(capitalizedKey).append(value);
//                String capitalizedKey = StringUtils.capitalize(key);
                stringA.append(key).append(value);
            }
        }


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

@@ -63,7 +63,17 @@
            try {
                Object value = field.get(model);
                if (value != null) {
                    params.put(field.getName(),URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));

                    // 将字段名首字母大写
                    String fieldName = field.getName();

                    String capitalizedFieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
                    if(fieldName.contains("method"))
                    {
                        capitalizedFieldName = fieldName;
                    }

                    params.put(capitalizedFieldName,URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
                }
            } catch (IllegalAccessException e) {
                // log.error("获取对象属性值时出错", e);
@@ -89,7 +99,13 @@
                    }
                    // 将字段名首字母大写
                    String fieldName = field.getName();

                    String capitalizedFieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);

                    if(fieldName.contains("method"))
                    {
                        capitalizedFieldName = fieldName;
                    }

                    formData.append(capitalizedFieldName)
                            .append("=")
@@ -145,7 +161,14 @@
            try {
                Object value = field.get(model);
                if (value != null) {
                    params.put(field.getName(),URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
                    // 将字段名首字母大写
                    String fieldName = field.getName();
                    String capitalizedFieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
                    if(fieldName.contains("method"))
                    {
                        capitalizedFieldName = fieldName;
                    }
                    params.put(capitalizedFieldName,URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));
                }
            } catch (IllegalAccessException e) {
                // log.error("获取对象属性值时出错", e);
@@ -170,7 +193,10 @@
                    // 将字段名首字母大写
                    String fieldName = field.getName();
                    String capitalizedFieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);

                    if(fieldName.contains("method"))
                    {
                        capitalizedFieldName = fieldName;
                    }
                    formData.append(capitalizedFieldName)
                            .append("=")
                            .append(URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.toString()));

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -106,7 +106,7 @@


                    //获取车牌号
                    String carLicense = "";
                    String carLicense = "-";
                    StringBuilder driverNames = new StringBuilder();
                    StringBuilder driverMobiles = new StringBuilder();
                    try{
@@ -185,6 +185,13 @@

                    String callbackUrl = clientApp.getCallbackUrl();
                    try {

                        String carLicenseStr = "-";
                        if(carLicense!=null && carLicense.length()>0){
                            carLicenseStr = carLicense;
                        }


                        // 构建请求参数
                        Map<String, String> map = new HashMap<>();
                        map.put("orderID", tbOrders.getOrderID().toString());
@@ -196,10 +203,14 @@
                            .findFirst()
                            .orElse("0"));
                        map.put("orderRemark", orderStatus.getMsg());
                        map.put("plateNo",carLicense);
                        map.put("plateNo",carLicenseStr);
                        map.put("driverMobile",driverMobiles.toString());
                        map.put("driverName", driverNames.toString());

                        log.info("【监测】[" + tbOrders.getOrderID() + "]车牌号：" + carLicenseStr);
                        //打印map
                        log.info("【监测】[" + tbOrders.getOrderID() + "]回调请求参数：" + map);

                        // 第一次尝试
                        String response = sendCallback(callbackUrl, map);
                        

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientApp.java

@@ -75,6 +75,11 @@
    @Excel(name = "用户ID")
    private Long userId;


    /** 推介人信息 */
    @Excel(name = "推介人信息")
    private String referrals;

    public Long getAppId() {
        return appId;
    }
@@ -187,6 +192,14 @@
        this.userId = userId;
    }

    public String getReferrals() {
        return referrals;
    }

    public void setReferrals(String referrals) {
        this.referrals = referrals;
    }   

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

 ruoyi-system/src/main/resources/mapper/system/SysClientAppMapper.xml

@@ -24,10 +24,11 @@
        <result property="payUrl"    column="pay_url"    />
        <result property="orderClass"    column="order_class"    />
        <result property="userId"    column="user_id"    /> 
        <result property="referrals"    column="referrals"    />
    </resultMap>

    <sql id="selectSysClientAppVo">
        select app_id, client_name, app_key, security_key, valid_start_time, valid_end_time, status, del_flag, create_by, create_time, update_by, update_time, remark, min_app_id, min_app_secret, callback_url, pay_url, order_class, user_id from sys_client_app
        select app_id, client_name, app_key, security_key, valid_start_time, valid_end_time, status, del_flag, create_by, create_time, update_by, update_time, remark, min_app_id, min_app_secret, callback_url, pay_url, order_class, user_id, referrals from sys_client_app
    </sql>

    <select id="selectSysClientAppList" parameterType="SysClientApp" resultMap="SysClientAppResult">
@@ -72,6 +73,7 @@
            <if test="payUrl != null">pay_url,</if>
            <if test="orderClass != null">order_class,</if>
            <if test="userId != null">user_id,</if>
            <if test="referrals != null">referrals,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="clientName != null">#{clientName},</if>
@@ -92,6 +94,7 @@
            <if test="payUrl != null">#{payUrl},</if>
            <if test="orderClass != null">#{orderClass},</if>
            <if test="userId != null">#{userId},</if>
            <if test="referrals != null">#{referrals},</if>
         </trim>
    </insert>

@@ -111,6 +114,7 @@
            <if test="payUrl != null">pay_url = #{payUrl},</if>
            <if test="orderClass != null">order_class = #{orderClass},</if>
            <if test="userId != null">user_id = #{userId},</if>
            <if test="referrals != null">referrals = #{referrals},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            update_time = sysdate()
        </set>

 ruoyi-ui/src/views/system/clientApp/index.vue

@@ -108,6 +108,7 @@
      <el-table-column label="支付地址" align="center" prop="payUrl" />
      <el-table-column label="民航字典orderClass" align="center" prop="orderClass" />
      <el-table-column label="民航分公司Id" align="center" prop="userId" />
      <el-table-column label="推介人信息" align="center" prop="referrals" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -186,6 +187,9 @@
        <el-form-item label="民航分公司Id" prop="userId">
          <el-input v-model="form.userId" placeholder="请输入民航分公司Id" />
        </el-form-item>
        <el-form-item label="推介人信息" prop="referrals">
          <el-input v-model="form.referrals" placeholder="请输入推介人信息" />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
        </el-form-item>