yupeng
2025-04-17 910578c721db108297237f9b7ce7d78ff20ac853
feat: 创建订单返回H5二维码支付地址
5个文件已修改
42 ■■■■ 已修改文件
bankapi/src/main/java/com/taxi591/bankapi/BankProperties.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-prod.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-test.yml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/dto/MakeOrderResp.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
bankapi/src/main/java/com/taxi591/bankapi/BankProperties.java
@@ -1,7 +1,10 @@
package com.taxi591.bankapi;
import com.alibaba.fastjson2.JSONObject;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.net.URLEncoder;
import static com.taxi591.bankapi.BankProperties.PREFIX;
@@ -12,6 +15,8 @@
    public static final String PREFIX = "com.taxi591.bank";
    public static final String ENBALE_PREFIX = PREFIX+".enable";
    public static final String H5_BANK_URL="https://enjoy.abchina.com/jf-web/epayItem";
    private Boolean enable = true;
@@ -32,5 +37,13 @@
     */
    private String cerPath;
    public static void main(String[] args) {
        String url = "https://enjoy.abchina.com/jf-web/epayItem?code=JF-EPAY2025030510983&userInput=";
        JSONObject param = new JSONObject();
        param.put("input1","25041612464700100000000000096254");
        url+=URLEncoder.encode(param.toJSONString());
        url+="&showBill=0";
        System.out.println(url);
    }
}
ruoyi-admin/src/main/resources/application-prod.yml
@@ -217,9 +217,10 @@
  client:
    accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
    secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
    bucket: xzgttest-1305134071
    bucket: xzgt-1305134071
    bucketAddr: ap-chengdu
    rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
#    rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
    rootSrc: https://xzgt-1305134071.cos.ap-chengdu.myqcloud.com
    location: /xizang
sms:
  enable: true
ruoyi-admin/src/main/resources/application-test.yml
@@ -102,9 +102,12 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://xzgt.test.591taxi.cn:13306/xizang?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
        username: root
        password: 8f5z9g52gx4bg
#        url: jdbc:mysql://xzgt.test.591taxi.cn:13306/xizang?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
#        username: root
#        password: 8f5z9g52gx4bg
        url: jdbc:mysql://cd-cdb-mrjncn8m.sql.tencentcdb.com:20945/xizang?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
        username: xzgt
        password: changyun!6f2gshj6h3j
      # 从库数据源
      slave:
        # 从数据源开关/默认关闭
ruoyi-system/src/main/java/com/ruoyi/system/dto/MakeOrderResp.java
@@ -16,7 +16,7 @@
    private String orderNo;
    @ApiModelProperty("金额,分")
    private Long amount;
    @ApiModelProperty("微信小程序支付跳转链接,用于生成二维码")
    @ApiModelProperty("H5支付地址,用于生成二维码")
    private String appletUrl;
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.AmountConstant;
import com.ruoyi.common.exception.ServiceException;
@@ -15,12 +16,14 @@
import com.ruoyi.system.service.TOrderBillService;
import com.ruoyi.system.service.TPayOrderService;
import com.ruoyi.system.service.TTenantService;
import com.taxi591.bankapi.BankProperties;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -53,7 +56,15 @@
    public String createAppletUrl(String orderNo){
        return ""+orderNo;
        JSONObject param = new JSONObject();
        param.put("input1",orderNo);
        StringBuffer sb = new StringBuffer();
        sb.append(BankProperties.H5_BANK_URL)
                .append("?code=").append("JF-EPAY2025030510983")
                .append("&userInput=")
                .append(URLEncoder.encode(param.toJSONString()))
                .append("&showBill=0");
        return sb.toString();
    }
    @Override