From 09892cb8b391914c7c78a61c79503456d9958137 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 21 十月 2025 14:31:57 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 349 +++++++++++++--------------------------------------------
1 files changed, 83 insertions(+), 266 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
index 43c9faa..96660c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
@@ -1,44 +1,32 @@
package com.ruoyi.web.controller.api;
-import com.alibaba.fastjson.JSONObject;
-import com.lkl.laop.sdk.exception.SDKException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.query.TErpGoodsWarehouseQuery;
-import com.ruoyi.system.service.*;
-import com.ruoyi.web.core.config.LakalaConfig;
+import com.ruoyi.system.dto.TSysOrderDto;
+import com.ruoyi.system.model.TCrmClinic;
+import com.ruoyi.system.model.TSysAppUser;
+import com.ruoyi.system.model.TSysOrder;
+import com.ruoyi.system.model.TSysOrderGoods;
+import com.ruoyi.system.query.TSysAppUserQuery;
+import com.ruoyi.system.query.TSysOrderQuery;
+import com.ruoyi.system.service.TCrmClinicService;
+import com.ruoyi.system.service.TSysAppUserService;
+import com.ruoyi.system.service.TSysOrderGoodsService;
+import com.ruoyi.system.service.TSysOrderService;
+import com.ruoyi.system.vo.TSysOrderDetailVo;
+import com.ruoyi.system.vo.TSysOrderPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.SneakyThrows;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.security.*;
-import java.security.cert.*;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.List;
/**
* <p>
@@ -49,270 +37,99 @@
* @since 2025-08-20
*/
@RestController
-@RequestMapping("/t-sys-order")
+@RequestMapping("/sys-order")
@Api(tags = "订单管理")
public class TSysOrderController {
- private final TErpProcurementService erpProcurementService;
+ private final TSysOrderService sysOrderService;
private final TokenService tokenService;
+ private final TCrmClinicService crmClinicService;
+ private final TSysAppUserService sysAppUserService;
+ private final TSysOrderGoodsService sysOrderGoodsService;
+
+
@Autowired
- public TSysOrderController(TErpProcurementService erpProcurementService, TokenService tokenService) {
- this.erpProcurementService = erpProcurementService;
+ public TSysOrderController(TokenService tokenService, TSysOrderService sysOrderService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TSysOrderGoodsService sysOrderGoodsService) {
+ this.sysOrderService = sysOrderService;
this.tokenService = tokenService;
+ this.crmClinicService = crmClinicService;
+ this.sysAppUserService = sysAppUserService;
+ this.sysOrderGoodsService = sysOrderGoodsService;
+
}
- private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
/**
- * API schema ,固定 LKLAPI-SHA256withRSA
+ * 获取诊所患者诊疗 订单列表
*/
- public final static String SCHEMA = "LKLAPI-SHA256withRSA";
+ @ApiOperation(value = "获取诊所患者诊疗订单列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TSysOrderPageVo>> pageList(@RequestBody TSysOrderQuery query) {
- /**
- * 字符集固定 utf-8
- */
- public static final String ENCODING = "utf-8";
-
-
- private static final SecureRandom RANDOM = new SecureRandom();
-
-
- @ApiOperation(value = "支付")
- @PostMapping(value = "/payOrder")
- @SneakyThrows
- public R<?> payOrder(@RequestBody @Valid TErpGoodsWarehouseQuery query, HttpServletRequest request) {
SysUser user = tokenService.getLoginUser().getUser();
- try {
-
- // 查出采购单 算出价格 下单 算出应该分佣金额 应该分给谁
-
- String apiPath = "/api/v3/labs/trans/preorder";
- String body = "{\n" +
- "\t\"req_time\": \"20250915115329\",\n" +
- "\t\"version\": \"3.0\",\n" +
- "\t\"req_data\": {\n" +
- "\t\t\"out_trade_no\": \"c13c493182e1ee84\",\n" +
- "\t\t\"merchant_no\": \"822290059430BFA\",\n" +
- "\t\t\"term_no\": \"D9261078\",\n" +
- "\t\t\"notify_url\": \"http://221.182.45.100:8089/t-sys-order/messageHandle\",\n" +
- "\t\t\"location_info\": {\n" +
- "\t\t\t\"request_ip\": \"180.157.249.160\"\n" +
- "\t\t},\n" +
- "\t\t\"subject\": \"cc测试\",\n" +
- "\t\t\"total_amount\": 1,\n" +
- "\t\t\"account_type\": \"ALIPAY\",\n" +
- "\t\t\"trans_type\": \"41\"\n" +
- "\t}\n" +
- "}";
- String authorization = getAuthorization(body);
- org.apache.http.HttpResponse response = post(LakalaConfig.getServerUrl() + apiPath, body, authorization);
- if (response.getStatusLine().getStatusCode() != 200) {
- return R.fail(500, "请求失败，statusCode " + response.getStatusLine()
- + IOUtils.toString(response.getEntity().getContent(), ENCODING));
- }
- String responseStr = IOUtils.toString(response.getEntity().getContent(), ENCODING);
- return R.ok(responseStr);
- } catch (SDKException e) {
- e.printStackTrace();
+ Integer roleType = user.getRoleType();
+ if(roleType == 5){
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ query.setClinicId(crmClinic.getId());
}
- return R.fail(500, "调用支付宝支付预下单接口错误");
+ return R.ok(sysOrderService.pageList(query));
}
- @RequestMapping("/messageHandle")
- @ApiOperation(value = "拉卡拉支付信息回调接口")
- public Object messageHandle(HttpServletRequest request) throws Exception {
- String body = this.getBody(request);
- String authorization = request.getHeader("Authorization");
- String timestamp = null;
- String nonce = null;
- String signature = null;
- authorization = authorization.replaceAll("LKLAPI-SHA256withRSA ", "");
- String[] split = authorization.split(",");
- for (String s : split) {
- if (s.startsWith("timestamp")) {
- timestamp = s.split("=")[1].replaceAll("\"", "");
- }
- if (s.startsWith("nonce")) {
- nonce = s.split("=")[1].replaceAll("\"", "");
- }
- if (s.startsWith("signature")) {
- // 取出签名
- signature = s.split("signature=")[1].replaceAll("\"", "");
- }
+ @ApiOperation(value = "获取诊所患者诊疗--搜索用户")
+ @PostMapping(value = "/userList")
+ public R<List<TSysAppUser>> pageList(@RequestBody TSysAppUserQuery query) {
+ LambdaQueryWrapper<TSysAppUser> eq = new LambdaQueryWrapper<TSysAppUser>().eq(TSysAppUser::getStatus, 1);
+ if(query.getNickName() != null && !query.getNickName().isEmpty()){
+ eq.and(e->e.like(TSysAppUser::getNickName, query.getNickName()).or().like(TSysAppUser::getPhone, query.getNickName()));
}
- X509Certificate lklCertificate = loadCertificate(new FileInputStream(new File(LakalaConfig.getLklNotifyCerStr())));
- String preSignData = timestamp + "\n" + nonce + "\n" + body + "\n";
- boolean verify = verify(lklCertificate, preSignData.getBytes(ENCODING), signature);
+// if(query.getPhone() != null && !query.getPhone().isEmpty()){
+// eq.like(TSysAppUser::getPhone, query.getPhone());
+// }
+ List<TSysAppUser> list = sysAppUserService.list(eq);
+ return R.ok(list);
+ }
- if (verify) {
- // 先处理支付完成 修改状态 后处理分账 后走分账回调
- // 响应success
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("code", "SUCCESS");
- jsonObject.put("message", "执行成功");
- return jsonObject;
+ @ApiOperation(value = "诊所患者诊疗--确认添加")
+ @PostMapping(value = "/add")
+ public R<String> add(@RequestBody @Valid TSysOrderDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+
+ if(roleType == 5){
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ sysOrderService.add(dto,crmClinic,user.getNickName(),user.getUserId().toString());
+ return R.ok("添加成功");
}
- return null;
+ return R.fail("添加失败");
}
- public org.apache.http.HttpResponse post(String url, String message, String authorization) throws Exception {
- SSLContext ctx = SSLContext.getInstance("TLS");
- X509TrustManager tm = new X509TrustManager() {
- public X509Certificate[] getAcceptedIssuers() {
- return null;
- }
+ @ApiOperation(value = "诊所患者诊疗--详情")
+ @GetMapping(value = "/detail/{id}")
+ public R<TSysOrderDetailVo> detail(@PathVariable String id) {
+ TSysOrder tSysOrder = sysOrderService.getById(id);
- public void checkClientTrusted(X509Certificate[] xcs, String str) {
- }
+ TSysOrderDetailVo detail = new TSysOrderDetailVo();
+ detail.setId(tSysOrder.getId());
+ String appUserId = tSysOrder.getAppUserId();
+ TSysAppUser appUser = sysAppUserService.getById(appUserId);
+ detail.setUserName(appUser.getNickName());
+ detail.setCheckTime(tSysOrder.getCheckTime());
+ detail.setTotalMoney(tSysOrder.getTotalMoney());
- public void checkServerTrusted(X509Certificate[] xcs, String str) {
- }
- };
- HttpClient http = new DefaultHttpClient();
- ClientConnectionManager ccm = http.getConnectionManager();
- ctx.init(null, new TrustManager[]{tm}, null);
- SSLSocketFactory ssf = new SSLSocketFactory(ctx);
- ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
- SchemeRegistry registry = ccm.getSchemeRegistry();
- registry.register(new Scheme("https", ssf, 443));
- HttpPost post = new HttpPost(url);
- StringEntity myEntity = new StringEntity(message, ENCODING);
- post.setEntity(myEntity);
- post.setHeader("Authorization", SCHEMA + " " + authorization);
- post.setHeader("Accept", "application/json");
- post.setHeader("Content-Type", "application/json");
- return http.execute(post);
- }
+ List<TSysOrderGoods> list = sysOrderGoodsService.list(new LambdaQueryWrapper<TSysOrderGoods>().eq(TSysOrderGoods::getOrderId, id));
+ detail.setList(list);
- public final String getAuthorization(String body) throws IOException {
- String nonceStr = generateNonceStr();
- long timestamp = generateTimestamp();
-
- String message = LakalaConfig.getAppId() + "\n" + LakalaConfig.getMerchantNo() + "\n" + timestamp + "\n" + nonceStr + "\n" + body + "\n";
-
- System.out.println("getToken message : " + message);
-
- PrivateKey merchantPrivateKey = loadPrivateKey(new FileInputStream(new File(LakalaConfig.getPriKeyStr())));
-
- String signature = this.sign(message.getBytes(ENCODING), merchantPrivateKey);
-
- String authorization = "appid=\"" + LakalaConfig.getAppId() + "\"," + "serial_no=\"" + LakalaConfig.getMerchantNo() + "\"," + "timestamp=\""
- + timestamp + "\"," + "nonce_str=\"" + nonceStr + "\"," + "signature=\"" + signature + "\"";
- System.out.println("authorization message :" + authorization);
-
- return authorization;
- }
-
- public long generateTimestamp() {
- return System.currentTimeMillis() / 1000;
- }
-
- public String generateNonceStr() {
- char[] nonceChars = new char[32];
- for (int index = 0; index < nonceChars.length; ++index) {
- nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
- }
- return new String(nonceChars);
- }
-
- public static PrivateKey loadPrivateKey(InputStream inputStream) {
- try {
- ByteArrayOutputStream array = new ByteArrayOutputStream();
- byte[] buffer = new byte[1024];
- int length;
- while ((length = inputStream.read(buffer)) != -1) {
- array.write(buffer, 0, length);
- }
-
- String privateKey = array.toString("utf-8").replace("-----BEGIN PRIVATE KEY-----", "")
- .replace("-----END PRIVATE KEY-----", "").replaceAll("\\s+", "");
- KeyFactory kf = KeyFactory.getInstance("RSA");
- return kf.generatePrivate(new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKey)));
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("当前Java环境不支持RSA", e);
- } catch (InvalidKeySpecException e) {
- throw new RuntimeException("无效的密钥格式");
- } catch (IOException e) {
- throw new RuntimeException("无效的密钥");
- }
- }
-
- public String sign(byte[] message, PrivateKey privateKey) {
- try {
- Signature sign = Signature.getInstance("SHA256withRSA");
- sign.initSign(privateKey);
- sign.update(message);
- return new String(Base64.encodeBase64(sign.sign()));
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("当前Java环境不支持SHA256withRSA", e);
- } catch (SignatureException e) {
- throw new RuntimeException("签名计算失败", e);
- } catch (InvalidKeyException e) {
- throw new RuntimeException("无效的私钥", e);
- }
- }
-
-
-
- public final String getBody(HttpServletRequest request) {
- InputStreamReader in = null;
- try {
- in = new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8);
- StringBuffer bf = new StringBuffer();
- int len;
- char[] chs = new char[1024];
- while ((len = in.read(chs)) != -1) {
- bf.append(new String(chs, 0, len));
- }
- return bf.toString();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (null != in) {
- try {
- in.close();
- } catch (Exception e) {
- }
- }
- }
- return null;
- }
-
- public static X509Certificate loadCertificate(InputStream inputStream) {
- try {
- CertificateFactory cf = CertificateFactory.getInstance("X509");
- X509Certificate cert = (X509Certificate) cf.generateCertificate(inputStream);
-
- cert.checkValidity();
- return cert;
- } catch (CertificateExpiredException e) {
- throw new RuntimeException("证书已过期", e);
- } catch (CertificateNotYetValidException e) {
- throw new RuntimeException("证书尚未生效", e);
- } catch (CertificateException e) {
- throw new RuntimeException("无效的证书", e);
- }
- }
-
- private static boolean verify(X509Certificate certificate, byte[] message, String signature) {
- try {
- Signature sign = Signature.getInstance("SHA256withRSA");
- sign.initVerify(certificate);
- sign.update(message);
- byte[] signatureB = Base64.decodeBase64(signature);
- return sign.verify(signatureB);
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("当前Java环境不支持SHA256withRSA", e);
- } catch (SignatureException e) {
- throw new RuntimeException("签名验证过程发生了错误", e);
- } catch (InvalidKeyException e) {
- throw new RuntimeException("无效的证书", e);
- }
+ return R.ok(detail);
}
--
Gitblit v1.7.1