wlzboy
2025-09-21 7d81ce01560d384f15212edc40ebeaa9924913f9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -230,7 +230,16 @@
        model.setOrdType(tbOrders.getTypeCode().intValue());
        model.setCoPhone(tbOrders.getLinkTel()); // 客户联系电话
        model.setCoName(tbOrders.getLinkPerson()); // 客户姓名
        if(tbOrders.getLinkPerson() != null && !tbOrders.getLinkPerson().equals(""))
        {
            model.setCoName(tbOrders.getLinkPerson()); // 客户姓名
        }
        else
        {
            model.setCoName("联系人"); // 随机生成患者姓名
        }
//        model.setCoTies("家属"); // 随机设置客户联系人与患者关系
        // 设置预约时间为一天后
        Calendar calendar = Calendar.getInstance();
@@ -247,7 +256,15 @@
        }
        
        model.setPtAge(tbOrders.getAge()); // 随机生成患者年龄
        if(tbOrders.getAge()!=null && !tbOrders.getAge().equals(""))
        {
            model.setPtAge(tbOrders.getAge()); // 患者年龄
        }
        else {
            model.setPtAge("年龄");
        }
        model.setPtSex(tbOrders.getSex() == 1 ? "男" : "女");
//        model.setPtNat("中国"); // 设置患者国籍
        model.setOutHosp(tbOrders.getLocalAddress()); // 设置转出医院
@@ -322,6 +339,7 @@
            model.setAPPID(scApp.getMinAppId()); // 设置商户 APPID
            model.setServiceOrdID(cancelVo.getThirdOrderNo()); // 设置第三方订单号
            model.setDELRemarks(cancelVo.getReason()); // 设置取消原因
            logger.info("取消订单-{}",cancelVo.getThirdOrderNo());
            ServiceOrderDelResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
@@ -331,6 +349,7 @@
                tbOrders.setOrderID(cancelVo.getOrderID());
                tbOrders.setOrderStatus(2); // 2是取消
                tbOrdersService.updateTbOrders(tbOrders);
                logger.info("订单取消成功!");
                return AjaxResult.success(result);
            } else {
                return AjaxResult.error("取消订单失败",result);