From 273d3891e1ec58bd8bb6f6830d0edb151ef68eec Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 16 Sep 2021 13:10:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/talkonlineweb/aop/ResubmitDataAspect.java | 4 +-- .../talkonlineweb/controller/OrderController.java | 39 ++++++++++++---------- .../controller/PatientController.java | 14 ++++---- .../com/lyms/talkonlineweb/lock/ResubmitLock.java | 4 +-- .../service/impl/LymsOrderServiceImpl.java | 17 +++++++--- 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/ResubmitDataAspect.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/ResubmitDataAspect.java index 8014cb4..908db18 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/ResubmitDataAspect.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/aop/ResubmitDataAspect.java @@ -8,7 +8,7 @@ import com.lyms.talkonlineweb.lock.ResubmitLock; import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.util.JsonUtil; import com.lyms.talkonlineweb.util.StringUtil; -import lombok.extern.slf4j.Slf4j; +import lombok.extern.log4j.Log4j2; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -22,7 +22,7 @@ import java.lang.reflect.Method; * @author lqy * 重复提交处理 */ -@Slf4j +@Log4j2 @Aspect @Component public class ResubmitDataAspect { diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java index 3e0f348..d345d0e 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java @@ -41,17 +41,21 @@ import java.util.*; @Log4j2 public class OrderController { + /** + * 问诊卡信息 + */ @Autowired - private LymsGoodsService lymsGoodsService;//问诊卡信息 - - @Autowired - private LymsPatientService lymsPatientService;//患者 + private LymsGoodsService lymsGoodsService; + /** + * 患者 + */ @Autowired - private LymsTcardService lymsTcardService;//问诊卡信息 + private LymsPatientService lymsPatientService; - @Autowired - private LymsLogsService lymsLogsService;//日志记录 + /** + * 订单 + */ @Autowired private LymsOrderService lymsOrderService; @@ -134,8 +138,7 @@ public class OrderController { baseResponse.setObject(data); return baseResponse; } - }catch (Exception e) - { + }catch (Exception e){ log.error("create order error.",e); } baseResponse.setErrorcode(1); @@ -146,7 +149,7 @@ public class OrderController { /** * 创建微信订单 */ - private Map createWxOrder(LymsOrder lymsOrder) + private Map createWxOrder(LymsOrder lymsOrder) throws Exception { try { String xml = buildRequestXml(lymsOrder); @@ -159,8 +162,8 @@ public class OrderController { return parseWxResult(result); } catch (Exception e) { log.error("createWxOrder error.",e); + throw e; } - return null; } @@ -220,7 +223,7 @@ public class OrderController { //交易类型 paramMap.put("trade_type", "JSAPI"); //用户标识 - paramMap.put("openid", "o4hf60FZzQ4PE-SXYk-jNaouGG-0"); + paramMap.put("openid", lymsOrder.getOpenid()); //商品描述 paramMap.put("body", "问诊支付"); @@ -253,13 +256,15 @@ public class OrderController { String payOrderId = paramMap.get("transaction_id"); //商户订单号 String mchOrderNo = paramMap.get("out_trade_no"); - lymsOrderService.handleOrder(payOrderId,mchOrderNo); - result.put("return_code",""); - result.put("return_msg",""); + boolean flag = lymsOrderService.handleOrder(payOrderId,mchOrderNo); + if (flag) + { + result.put("return_code",""); + result.put("return_msg",""); + } } outResult(response, XmlUtil.mapToXml(result)); - }catch (Exception e) - { + }catch (Exception e){ log.error("pay notify error.",e); try { diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java index a015956..6dc6050 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java @@ -441,13 +441,15 @@ public class PatientController { if (CollectionUtils.isNotEmpty(lymsTkrecords)) { for (LymsTkrecord record : lymsTkrecords) { LymsPcase pcase = lymsPcaseService.getById(record.getPcid()); + LymsHospital hospital = lymsHospitalService.getById(pcase.getHid()); + LymsDoctor doctor = lymsDoctorService.getById(pcase.getDtid()); Map data = new HashMap(20); data.put("hospitalName", pcase.getHname()); - data.put("hospitalLevel", ""); + data.put("hospitalLevel", hospital.getHlevel()); data.put("doctorName", pcase.getDtname()); data.put("departName", pcase.getDname()); - data.put("doctorLevel", ""); + data.put("doctorLevel", doctor.getLvl()); data.put("patientName", patients.getPname()); StringBuilder sb = new StringBuilder(); @@ -464,8 +466,6 @@ public class PatientController { data.put("iname", sb.toString()); data.put("createTime", DateUtil.getDateTime(record.getCreatedtime(), DateUtil.YYYY_MM_DD)); data.put("stat", record.getStat()); - - list.add(data); } } @@ -493,13 +493,13 @@ public class PatientController { if (CollectionUtils.isNotEmpty(lymsAttentions)) { for (LymsAttention attention : lymsAttentions) { LymsDoctor doctor = lymsDoctorService.getById(attention.getDid()); - + LymsHospital hospital = lymsHospitalService.getById(doctor.getHid()); Map data = new HashMap(20); data.put("doctorName", doctor.getDname()); data.put("departName", doctor.getDdname()); - data.put("doctorLevel", ""); + data.put("doctorLevel", doctor.getLvl()); data.put("hospitalName", doctor.getHname()); - data.put("hospitalLevel", ""); + data.put("hospitalLevel", hospital.getHlevel()); data.put("doctorDesc", doctor.getIntro()); list.add(data); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/lock/ResubmitLock.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/lock/ResubmitLock.java index b0e2004..2606220 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/lock/ResubmitLock.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/lock/ResubmitLock.java @@ -1,7 +1,7 @@ package com.lyms.talkonlineweb.lock; import com.lyms.talkonlineweb.util.MD5Util; -import lombok.extern.slf4j.Slf4j; +import lombok.extern.log4j.Log4j2; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; @@ -9,7 +9,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -@Slf4j +@Log4j2 public class ResubmitLock { private static final ConcurrentHashMap LOCK_CACHE = new ConcurrentHashMap<>(200); private static final ScheduledThreadPoolExecutor EXECUTOR = new ScheduledThreadPoolExecutor(5, new ThreadPoolExecutor.DiscardPolicy()); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java index 2c513dc..fd368e8 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java @@ -22,6 +22,7 @@ import java.util.Date; /** * + * @author Administrator */ @Service public class LymsOrderServiceImpl extends ServiceImpl @@ -43,23 +44,29 @@ public class LymsOrderServiceImpl extends ServiceImpl