Merge remote-tracking branch 'origin/master'

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

@@ -105,7 +105,7 @@ public class OptController {
             String testProcessUrl = testHttps + processUrl;
             String prodProcessUrl = processUrl + processUrl;
             String zUrl = zeUrl + processUrl;
-            String processResult = HttpUtils.JSONdoPost(testProcessUrl, string);
+            String processResult = HttpUtils.JSONdoPost(testHttps, string);
             //拿到解析结果，进行解析
             Map<String, Object> resultMap = JSON.parseObject(processResult, Map.class);
             String resultData = resultMap.get("data").toString();

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

@@ -120,6 +120,7 @@ public class ProcessInfoServiceImpl /*extends ServiceImpl<ProcessInfoMapper, Pro
         //先去查询一下订单信息
         ProcessInfo processInfo = processInfoMapper.selectProcessInfoByPId(processInfoParam.getpId());
         processInfo.setProcessStsCd(processInfoParam.getProcessStsCd());
+        processInfo.setRejectReason(processInfoParam.getRejectReason());
         try {
             String status = processInfo.getProcessStsCd();
             processInfo.setUpdateTime(DateUtils.getNowDate());