..

ct/src/main/java/com/ruoyi/ct/service/CTService.java

@@ -25,6 +25,11 @@ public interface CTService {
                                  String county, String serialNumber, String number, String logiRemark, String pageUrl,
                                  String remark, String installAddress, String ynumber2, String images, String deliveryMethod, String sn) throws Exception;
 
+    CTResponse<String> saveOrder(String name, String idCard, String contactMobile, String installedAddress,
+                                 String saleId, String storeId, String personnelId, String province, String city,
+                                 String county, String serialNumber, String number, String logiRemark, String pageUrl,
+                                 String remark, String installAddress, String ynumber2, String images, String sn, String ip, boolean isIPV4) throws Exception;
+
     CTResponse<String> uploadFile(String serialNumber, String name, String idCard, String type, String msgId, String img) throws Exception;
 
     CTResponse<String> updateOrder(String name, String orderNum) throws Exception;

ct/src/main/java/com/ruoyi/ct/service/impl/CTServiceImpl.java

@@ -170,6 +170,8 @@ public class CTServiceImpl implements CTService {
             body.put("saleId", saleId);
             body.put("page", page);
             body.put("pageSize", pageSize);
+            System.out.println("body = " + body);
+            log.error("body:"+JSONUtil.toJsonStr(body));
             requestBody.setEncryption(JSONUtil.toJsonStr(body), publicKey);
             HttpResponse httpResponse = HttpRequest.post(url)
                 .header("token", token)
@@ -264,6 +266,80 @@ public class CTServiceImpl implements CTService {
         return null;
     }
 
+    /**
+     * 线上下单
+     */
+    @Override
+    public CTResponse<String> saveOrder(String name, String idCard, String contactMobile,
+                                        String installedAddress, String saleId, String storeId,
+                                        String personnelId, String province, String city,
+                                        String county, String serialNumber, String number,
+                                        String logiRemark, String pageUrl, String remark,
+                                        String installAddress, String ynumber2, String images, String sn, String ip, boolean isIPV4) throws Exception {
+        CTRequestBody requestBody = checkToken();
+        if (ObjectUtil.isNotNull(requestBody)) {
+            log.error(sn+" ------------------检查接口登录状态完成-------------------");
+            requestBody.setInterfaceName("SaveOrder");
+            Map<String, Object> body = new HashMap<>();
+            body.put("name", name);
+            body.put("idCard", idCard);
+            body.put("contactMobile", contactMobile);
+            body.put("installedAddress", installedAddress);
+            body.put("saleId", saleId);
+            body.put("storeId", storeId);
+            body.put("personnelId", personnelId);
+            body.put("province", province);
+            body.put("city", city);
+            body.put("county", county);
+            body.put("serialNumber", serialNumber);
+            body.put("number", number);
+            body.put("logiRemark", logiRemark);
+            body.put("pageUrl", pageUrl);
+            body.put("remark", remark);
+            body.put("installAddress", installAddress);
+//            body.put("ynumber2", ynumber2);
+//            body.put("images", images);
+            requestBody.setEncryption(JSONUtil.toJsonStr(body), publicKey);
+            log.error(sn+" 加密前数据："+body);
+            log.error(sn+" 加密后数据："+requestBody.toMap());
+            HttpResponse httpResponse = HttpRequest.post(url)
+                .header("token", token)
+                .form(requestBody.toMap())
+                .execute();
+//            log.error("body:"+httpResponse.body());
+            if (httpResponse.isOk()) {
+                if (ObjectUtil.isNotNull(httpResponse.body()) && ObjectUtil.isNull(JSONUtil.toBean(httpResponse.body(), JSONObject.class).getStr("status"))) {
+                    // 其他异常状态，如504等
+                    log.error(sn+" ------------------下单异常------------------- ");
+                    log.error(sn+" 请求电信异常，状态码："+httpResponse.getStatus());
+                    log.error(sn+" 返回："+httpResponse.body());
+                    LambdaQueryWrapper<AgentOrder> lqw = new LambdaQueryWrapper<>();
+                    lqw.eq(AgentOrder::getSerialNumber, serialNumber);
+                    lqw.last("limit 1");
+                    AgentOrderVo agentOrderVo = agentOrderMapper.selectVoOne(lqw);
+                    AgentOrder agentOrder = new AgentOrder();
+                    agentOrder.setId(agentOrderVo.getId());
+                    agentOrder.setStatus("-2");
+                    agentOrder.setHasError(1);
+                    agentOrderMapper.updateById(agentOrder);
+                    log.error(sn+" --------------------------------------------");
+                    throw new CTNetException();
+                }
+                CTResponse<String> response = JSONUtil.toBean(httpResponse.body(), CTResponse.class);
+                return response;
+            } else {
+                // 返回的不是200，或者没有返回
+                log.error(sn+" ------------------下单异常-------------------");
+                log.error(sn+" 请求电信异常，状态码："+httpResponse.getStatus());
+                log.error(sn+" 返回："+httpResponse.body());
+                log.error(sn+" --------------------------------------------");
+            }
+            return null;
+        }
+        log.error("token error");
+        return null;
+    }
+
     /**
      * 线下下单
      */

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

@@ -49,9 +49,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://43.140.198.163:3380/ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://localhost:3306/ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: qaHljgd123.
+          password: rPt5kirMS25S4N55
         # 从库数据源
         slave:
           lazy: true
@@ -102,13 +102,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: 43.140.198.163
+    host: 127.0.0.1
     # 端口，默认为6379
-    port: 3612
+    port: 6379
     # 数据库索引
     database: 4
     # 密码(如没有密码请注释掉)
-    password: qaRedisPass123.
+    password: 123456
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/CTResponse2.java

@@ -0,0 +1,22 @@
+package com.ruoyi.common.core.domain;
+
+import cn.hutool.json.JSONObject;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class CTResponse2<T> {
+
+    public static final String SUCCESS_STATUS = "success";
+
+    private String status;
+    private String message;
+    private String errorCode;
+    private T data;
+    private JSONObject decryptData;
+
+    public boolean isSuccess() {
+        return status.equals(SUCCESS_STATUS);
+    }
+}