Quellcode durchsuchen

1:添加订单请求接口
2:添加审核通知请求接口
3:添加支付回调接口
4:其他

wangming vor 2 Jahren
Ursprung
Commit
8e0281d768

+ 8 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/opt/OptController.java

@@ -33,15 +33,14 @@ import java.util.HashMap;
 @Slf4j
 public class OptController {
 
+    @Value("testHttps")
+    private String testHttps;
+    @Value("prodHttps")
+    private String prodHttps;
     //订单信息请求接口
     @Value("processUrl")
     private String processUrl;
-    //审核通知接口
-    @Value("checkUrl")
-    private String checklUrl;
-    //支付通知接口
-    @Value("payUrl")
-    private String payUrl;
+
 
     @Autowired
     private ISysInfoConfigService sysInfoConfigService;
@@ -72,7 +71,9 @@ public class OptController {
             HashMap<String, String> process = new HashMap<>();
             process.put("processId", processId);
             String string = JSONObject.valueAsStr(process);
-            String processResult = HttpUtils.sendPost(processUrl, string);
+            String testProcessUrl = testHttps + processUrl;
+            String prodProcessUrl = processUrl + processUrl;
+            String processResult = HttpUtils.sendPost(testProcessUrl, string);
             //拿到解析结果,进行解析
             ProcessInfoReq processInfoReq = JSON.parseObject(processResult, ProcessInfoReq.class);
             if (StringUtils.isNotNull(processInfoReq)){

+ 11 - 6
ruoyi-admin/src/main/resources/application.yml

@@ -13,21 +13,24 @@ ruoyi:
   # 获取ip地址开关
   addressEnabled: false
 
-# 代码内使用的参数配置
+# 测试地址
+testHttps: https://www2.laikuaidian.cn
+#生产地址
+prodHttps: https://hezuo.cyc-fund.com.cn
 
 # 请求订单信息的url
-processUrl: https://www.cyc-fund.com.cn/
+processUrl: /guaranteeJSONCtrl/JSONQuerybidder.do
 # www审核通知接口url
-checkUrl:
+checkUrl: /guaranteeJSONCtrl/JSONNotifications.do
 # www支付回调接口通知
-payUrl:
+payUrl: /guaranteeJSONCtrl/JSONPayInfoInterface.do
 # www承保回调接口通知
 
 
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为80
-  port: 80
+  port: 89
   servlet:
     # 应用的访问路径
     context-path: /
@@ -41,7 +44,9 @@ server:
       max: 800
       # Tomcat启动初始化的线程数,默认值10
       min-spare: 100
- 
+
+  http2:
+    enabled:
 # 日志配置
 logging:
   level:

+ 13 - 5
ruoyi-system/src/main/java/com/ruoyi/opt/service/impl/ProcessInfoServiceImpl.java

@@ -42,6 +42,10 @@ public class ProcessInfoServiceImpl implements IProcessInfoService
     private ProcessInfoMapper processInfoMapper;
     @Autowired
     private CompanyInfoMapper companyInfoMapper;
+    @Value("testHttps")
+    private String testHttps;
+    @Value("prodHttps")
+    private String prodHttps;
     //审核通知接口
     @Value("checkUrl")
     private String checklUrl;
@@ -99,11 +103,11 @@ public class ProcessInfoServiceImpl implements IProcessInfoService
             String status = processInfo.getProcessStsCd();
             CompanyInfo companyInfo = companyInfoMapper.selectCompanyInfoByCompanyId(processInfo.getCompanyId());
             processInfo.setUpdateTime(DateUtils.getNowDate());
-            //判断是什么操作,如果是02 03表示是审核操作   05表示已支付操作
-            if ("02".equals(status) || "03".equals(status)){
+            //判断是什么操作,如果是03 04表示是审核操作   05表示已支付操作
+            if ("03".equals(status) || "04".equals(status)){
                 //审核操作,先组装参数
                 CheckInformBo checkInformBo = new CheckInformBo();
-                if ("02".equals(status)){   //审核通过
+                if ("04".equals(status)){   //审核通过
                     checkInformBo.setCode("01");
                 } else {   //审核不通过
                     checkInformBo.setCode("02");
@@ -121,7 +125,9 @@ public class ProcessInfoServiceImpl implements IProcessInfoService
                 checkInformBo.setPostscript(processInfo.getPostscript());
                 String checkJsonString = JSONObject.valueAsStr(checkInformBo);
                 //http请求调用
-                String checkResult = HttpUtils.sendPost(checklUrl, checkJsonString);
+                String testCheckUrl = testHttps + checklUrl;
+                String prodCheckUrl = prodHttps + checklUrl;
+                String checkResult = HttpUtils.sendPost(testCheckUrl, checkJsonString);
                 //解析json结果
                 Map<String, Object> resultMap = JSON.parseObject(checkResult, Map.class);
                 if ("0000".equals(resultMap.get("code").toString())){
@@ -145,7 +151,9 @@ public class ProcessInfoServiceImpl implements IProcessInfoService
                 payInfomBo.setCost(null);
                 String payJsonString = JSONObject.valueAsStr(payInfomBo);
                 //http请求调用
-                String payResult = HttpUtils.sendPost(payUrl, payJsonString);
+                String testPayUrl = testHttps + payUrl;
+                String prodPayUrl = prodHttps + payUrl;
+                String payResult = HttpUtils.sendPost(testPayUrl, payJsonString);
                 //解析json结果
                 Map<String, Object> resultMap = JSON.parseObject(payResult, Map.class);
                 if ("0000".equals(resultMap.get("code").toString())){

+ 1 - 1
ruoyi-system/src/main/resources/mapper/opt/ProjectInfoMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            project_Id
+            project_id
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectCd != null">#{projectCd},</if>