diff --git a/ct/src/main/java/com/ruoyi/ct/controller/AgentAccountController.java b/ct/src/main/java/com/ruoyi/ct/controller/AgentAccountController.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/controller/AgentAccountGoodController.java b/ct/src/main/java/com/ruoyi/ct/controller/AgentAccountGoodController.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/controller/AgentAccountGoodUserController.java b/ct/src/main/java/com/ruoyi/ct/controller/AgentAccountGoodUserController.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/controller/AgentController.java b/ct/src/main/java/com/ruoyi/ct/controller/AgentController.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/controller/AgentOrderController.java b/ct/src/main/java/com/ruoyi/ct/controller/AgentOrderController.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/controller/ApiLogController.java b/ct/src/main/java/com/ruoyi/ct/controller/ApiLogController.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/controller/GoodController.java b/ct/src/main/java/com/ruoyi/ct/controller/GoodController.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/Agent.java b/ct/src/main/java/com/ruoyi/ct/domain/Agent.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/AgentAccount.java b/ct/src/main/java/com/ruoyi/ct/domain/AgentAccount.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/AgentAccountGood.java b/ct/src/main/java/com/ruoyi/ct/domain/AgentAccountGood.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/AgentAccountGoodUser.java b/ct/src/main/java/com/ruoyi/ct/domain/AgentAccountGoodUser.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/AgentOrder.java b/ct/src/main/java/com/ruoyi/ct/domain/AgentOrder.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/ApiLog.java b/ct/src/main/java/com/ruoyi/ct/domain/ApiLog.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/Good.java b/ct/src/main/java/com/ruoyi/ct/domain/Good.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentAccountBo.java b/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentAccountBo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentAccountGoodBo.java b/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentAccountGoodBo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentAccountGoodUserBo.java b/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentAccountGoodUserBo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentBo.java b/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentBo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentOrderBo.java b/ct/src/main/java/com/ruoyi/ct/domain/bo/AgentOrderBo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/bo/ApiLogBo.java b/ct/src/main/java/com/ruoyi/ct/domain/bo/ApiLogBo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/bo/GoodBo.java b/ct/src/main/java/com/ruoyi/ct/domain/bo/GoodBo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentAccountGoodUserVo.java b/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentAccountGoodUserVo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentAccountGoodVo.java b/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentAccountGoodVo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentAccountVo.java b/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentAccountVo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentOrderVo.java b/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentOrderVo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentVo.java b/ct/src/main/java/com/ruoyi/ct/domain/vo/AgentVo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/vo/ApiLogVo.java b/ct/src/main/java/com/ruoyi/ct/domain/vo/ApiLogVo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/domain/vo/GoodVo.java b/ct/src/main/java/com/ruoyi/ct/domain/vo/GoodVo.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/mapper/AgentAccountGoodMapper.java b/ct/src/main/java/com/ruoyi/ct/mapper/AgentAccountGoodMapper.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/mapper/AgentAccountGoodUserMapper.java b/ct/src/main/java/com/ruoyi/ct/mapper/AgentAccountGoodUserMapper.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/mapper/AgentAccountMapper.java b/ct/src/main/java/com/ruoyi/ct/mapper/AgentAccountMapper.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/mapper/AgentMapper.java b/ct/src/main/java/com/ruoyi/ct/mapper/AgentMapper.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/mapper/AgentOrderMapper.java b/ct/src/main/java/com/ruoyi/ct/mapper/AgentOrderMapper.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/mapper/ApiLogMapper.java b/ct/src/main/java/com/ruoyi/ct/mapper/ApiLogMapper.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/mapper/GoodMapper.java b/ct/src/main/java/com/ruoyi/ct/mapper/GoodMapper.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/CTService.java b/ct/src/main/java/com/ruoyi/ct/service/CTService.java index a922fe0..8ba54da 100644 --- a/ct/src/main/java/com/ruoyi/ct/service/CTService.java +++ b/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 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 uploadFile(String serialNumber, String name, String idCard, String type, String msgId, String img) throws Exception; CTResponse updateOrder(String name, String orderNum) throws Exception; diff --git a/ct/src/main/java/com/ruoyi/ct/service/IAgentAccountGoodService.java b/ct/src/main/java/com/ruoyi/ct/service/IAgentAccountGoodService.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/IAgentAccountGoodUserService.java b/ct/src/main/java/com/ruoyi/ct/service/IAgentAccountGoodUserService.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/IAgentAccountService.java b/ct/src/main/java/com/ruoyi/ct/service/IAgentAccountService.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/IAgentOrderService.java b/ct/src/main/java/com/ruoyi/ct/service/IAgentOrderService.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/IAgentService.java b/ct/src/main/java/com/ruoyi/ct/service/IAgentService.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/IApiLogService.java b/ct/src/main/java/com/ruoyi/ct/service/IApiLogService.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/IGoodService.java b/ct/src/main/java/com/ruoyi/ct/service/IGoodService.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/AgentAccountGoodServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/AgentAccountGoodServiceImpl.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/AgentAccountGoodUserServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/AgentAccountGoodUserServiceImpl.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/AgentAccountServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/AgentAccountServiceImpl.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/AgentOrderServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/AgentOrderServiceImpl.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/AgentServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/AgentServiceImpl.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/ApiLogServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/ApiLogServiceImpl.java old mode 100755 new mode 100644 diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/CTServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/CTServiceImpl.java index f0b0838..34c4b4b 100644 --- a/ct/src/main/java/com/ruoyi/ct/service/impl/CTServiceImpl.java +++ b/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 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 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 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 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; + } + /** * 线下下单 */ diff --git a/ct/src/main/java/com/ruoyi/ct/service/impl/GoodServiceImpl.java b/ct/src/main/java/com/ruoyi/ct/service/impl/GoodServiceImpl.java old mode 100755 new mode 100644 diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 9a2dd42..a6afb6a 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/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 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/CTResponse2.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/CTResponse2.java new file mode 100644 index 0000000..8268643 --- /dev/null +++ b/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 { + + 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); + } +} diff --git a/ruoyi-ui/src/api/ct/agent.js b/ruoyi-ui/src/api/ct/agent.js old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/api/ct/agentAccount.js b/ruoyi-ui/src/api/ct/agentAccount.js old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/api/ct/agentAccountGood.js b/ruoyi-ui/src/api/ct/agentAccountGood.js old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/api/ct/agentAccountGoodUser.js b/ruoyi-ui/src/api/ct/agentAccountGoodUser.js old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/api/ct/agentOrder.js b/ruoyi-ui/src/api/ct/agentOrder.js old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/api/ct/apiLog.js b/ruoyi-ui/src/api/ct/apiLog.js old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/api/ct/good.js b/ruoyi-ui/src/api/ct/good.js old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/views/ct/agent/index.vue b/ruoyi-ui/src/views/ct/agent/index.vue old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/views/ct/agentAccount/index.vue b/ruoyi-ui/src/views/ct/agentAccount/index.vue old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/views/ct/agentAccountGood/index.vue b/ruoyi-ui/src/views/ct/agentAccountGood/index.vue old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/views/ct/agentAccountGoodUser/index.vue b/ruoyi-ui/src/views/ct/agentAccountGoodUser/index.vue old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/views/ct/agentOrder/index.vue b/ruoyi-ui/src/views/ct/agentOrder/index.vue old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/views/ct/apiLog/index.vue b/ruoyi-ui/src/views/ct/apiLog/index.vue old mode 100755 new mode 100644 diff --git a/ruoyi-ui/src/views/ct/good/index.vue b/ruoyi-ui/src/views/ct/good/index.vue old mode 100755 new mode 100644