From bf301aee433d4a3dbe5b43236d8ec775a9ac67a7 Mon Sep 17 00:00:00 2001 From: cfl Date: Mon, 4 Dec 2023 10:25:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E7=94=A8=E5=AD=95?= =?UTF-8?q?=E4=BA=A7=E5=A9=B4=E5=B9=B3=E5=8F=B0=E5=BC=80=E9=80=9A=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../talkonlineweb/controller/OrderController.java | 28 ++++++++++++++++++ .../lyms/talkonlineweb/domain/LymsOrderRefund.java | 15 ++++++++++ .../talkonlineweb/service/LymsOrderService.java | 2 +- .../task/HisPatientsAutoUploadTask.java | 2 +- .../java/com/lyms/talkonlineweb/util/Constant.java | 9 +++++- .../resources/mapper/LymsOrderRefundMapper.xml | 33 ++++++++++++++++++++++ 6 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 talkonlineweb/src/main/resources/mapper/LymsOrderRefundMapper.xml 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 99c8f07..d914efa 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java @@ -70,6 +70,12 @@ public class OrderController { @Value("${notify.url}") private String notifyUrl; + /** + * 孕产婴平台地址 + */ + @Value("${platform.url}") + private String platformUrl; + @GetMapping("/queryGoods") public BaseResponse getGoods(String type){ QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -383,8 +389,30 @@ public class OrderController { //再次查询 lymsOrders = lymsOrderService.getOne(lymsOrderWrapper); boolean flag = lymsOrderService.handleOrder(lymsOrders,true); + final Integer pid = lymsOrders.getPid(); + final Integer cnt = lymsOrders.getCnt(); + final Integer pcid = lymsOrders.getPcid(); if (flag) { + //调用开通孕产婴系统的服务 + new Thread(()->{ + try{ + LymsPatient patient = lymsPatientService.getById(pid); + Map map = new HashMap<>(); + map.put("idno",patient.getIdno()); + map.put("name",patient.getPname()); + map.put("weeks",cnt*4); + map.put("renew",pcid == null ? 0 : 1); + log.info("自动开通服务参数:{}",JsonUtil.obj2Str(map)); + String resposne = HttpUtil.doGetPost(platformUrl + Constant.PLATFORM_AUTO_OPEN_SERVICE_URL, "POST", map); + log.info("自动开通服务结果:{}",resposne); + + }catch (Exception e){ + log.error("自动开通服务异常",e); + } + + }).start(); + result.put("return_code","SUCCESS"); result.put("return_msg","OK"); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsOrderRefund.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsOrderRefund.java index 2d9ef2b..4367cb8 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsOrderRefund.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsOrderRefund.java @@ -36,18 +36,33 @@ public class LymsOrderRefund extends BaseModel implements Serializable { @TableField(value = "orderno") private String orderno; + /** + * 退费订单号 + */ @TableField(value = "out_fund_no") private String outFundNo; + /** + * 退费原因 + */ @TableField(value = "reason") private String reason; + /** + * 可退费金额 + */ @TableField(value = "can_return_money") private Integer canReturnMoney; + /** + * 实际退费金额 + */ @TableField(value = "real_return_money") private Integer realReturnMoney; + /** + * 备注 + */ @TableField(value = "remark") private String remark; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java index 1c04be5..33287dd 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java @@ -17,7 +17,7 @@ public interface LymsOrderService extends IService { /** * * @param lymsOrder - * @param isPayCallBack 是否支付回调 + * @param isPayCallBack 是否支付回调，支付回调时该参数为true； his患者上传时也会调用该方法，此时参数为false * @return */ boolean handleOrder(LymsOrder lymsOrder,boolean isPayCallBack); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/HisPatientsAutoUploadTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/HisPatientsAutoUploadTask.java index 394c800..0ac5003 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/HisPatientsAutoUploadTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/HisPatientsAutoUploadTask.java @@ -38,7 +38,7 @@ public class HisPatientsAutoUploadTask { private LymsHospitalService lymsHospitalService; //医院 @Scheduled(cron = "0 0 13,21 * * ?") - public void autoEndChatTask(){ + public void hisPatientsAutoUploadTask(){ if(!on_off){ return; } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java index d399375..4ea8813 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java @@ -92,6 +92,13 @@ public class Constant { public static final String GZ_SECRET_CS ="1c4b5543a54c74dd363a6655ca1cbffe"; - + /** + * 获取孕产婴系统孕周或高危疾病名称接口地址 + */ public static String PLATFORM_QUERY_PREGNANT_URL = "/patientDueWeekAndRisk"; + + /** + * 自动开通孕产婴精准医疗服务和围产小助理服务 + */ + public static String PLATFORM_AUTO_OPEN_SERVICE_URL = "/yxzh/patSer"; } diff --git a/talkonlineweb/src/main/resources/mapper/LymsOrderRefundMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsOrderRefundMapper.xml new file mode 100644 index 0000000..dc693d4 --- /dev/null +++ b/talkonlineweb/src/main/resources/mapper/LymsOrderRefundMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 1.8.3.1