fix:修复广交集团订单

wzp

2025-05-14 64bfdd5d310d07c69deead7ebafc9b00fcb3258b

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java

@@ -8,9 +8,7 @@
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppResultVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderAppVo;
import com.ruoyi.common.core.domain.entity.ServiceOrderDelVo;
import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.utils.civilAviation.ServiceOrderUtil;
import com.ruoyi.system.domain.SysClientApp;
import com.ruoyi.system.service.ISysClientAppService;
@@ -30,7 +28,6 @@
import com.ruoyi.system.service.ITbOrdersService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.entity.OrderCancelVo;

/**
 * ordersController
@@ -118,7 +115,14 @@
            tbOrders.setAppId(appId);
            tbOrders.setCreateTime(new Date());

            tbOrdersService.insertTbOrders(tbOrders);
            try
            {
                tbOrdersService.insertTbOrders(tbOrders);
            }
            catch (Exception ex)
            {
                return AjaxResult.error("订单号不能重复");
            }


            SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
@@ -128,6 +132,8 @@
            ServiceOrderAppVo model = new ServiceOrderAppVo();
            model.setMethod("ServiceOrder_APP"); // 设置接口名称
            model.setAppId(scApp.getMinAppId()); // 设置商户 APPID
            model.setOrdClass(scApp.getOrderClass()); // 设置民航字典orderClass
            model.setUserID(scApp.getUserId()); // 设置民航分公司Id
            model.setOrdType(tbOrders.getTypeCode().intValue());
            model.setCoPhone(tbOrders.getLinkTel()); // 客户联系电话
            model.setCoName(tbOrders.getLinkPerson()); // 客户姓名
@@ -144,8 +150,20 @@
            model.setOutHosp(tbOrders.getLocalAddress()); // 设置转出医院
            model.setInHosp(tbOrders.getSendAddress()); // 设置转入医院
//        model.setPtServices("科室" + (int) (Math.random() * 10)); // 随机设置患者所在科室
            model.setPtDiagnosis(tbOrders.getComplaint()); // 设置诊断信息
            model.setCondition(tbOrders.getRemark()); // 设置备注信息

            //如果诊断信息为空，则不设置诊断信息
            if(tbOrders.getComplaint() != null && !tbOrders.getComplaint().equals(""))
            {
                model.setPtDiagnosis(tbOrders.getComplaint()); // 设置诊断信息
            }

            //如果备注信息为空，则不设置备注信息
            if(tbOrders.getRemark() != null && !tbOrders.getRemark().equals(""))
            {
                model.setCondition(tbOrders.getRemark()); // 设置备注信息
            }


//        model.setDoctor("医生" + (int) (Math.random() * 10)); // 随机设置患者医生
//        model.setDoctorPhone("13" + (int) (Math.random() * 900000000 + 100000000)); // 随机生成患者医生电话
            model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 生成报价
@@ -185,12 +203,12 @@
            return AjaxResult.error("订单状态已取消");
        }

        SysClientApp scApp = clientAppService.selectSysClientAppByAppKey("appId1");
        SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());


        ServiceOrderAppVo model = new ServiceOrderAppVo();
        model.setMethod("ServiceOrder_APP"); // 设置接口名称
        model.setAppId(scApp.getMinAppId()); // 设置商户 APPID
        model.setAppId(tbOrders.getAppId()); // 设置商户 APPID
        model.setOrdType(tbOrders.getTypeCode().intValue());
        model.setCoPhone(tbOrders.getLinkTel()); // 客户联系电话
        model.setCoName(tbOrders.getLinkPerson()); // 客户姓名
@@ -240,9 +258,9 @@
        @ApiImplicitParam(name = "thirdOrderNo", value = "第三方订单号", required = true, dataType = "String"),
        @ApiImplicitParam(name = "reason", value = "取消原因", required = true, dataType = "String")
    })
    @Anonymous
    @Anonymous(needSign = true)
    @PostMapping("/cancelOrder")
    public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo)
    public AjaxResult cancelOrder(@RequestBody OrderCancelVo cancelVo,String appId)
    {
        try {
            if (cancelVo == null || cancelVo.getOrderID() == null || 
@@ -250,7 +268,7 @@
                return AjaxResult.error("必要参数不能为空！");
            }

            SysClientApp scApp = clientAppService.selectSysClientAppByAppId(1L);
            SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(appId);

            ServiceOrderDelVo model = new ServiceOrderDelVo();
            model.setMethod("ServiceOrder_DEL"); // 设置接口名称
@@ -258,7 +276,7 @@
            model.setServiceOrdID(cancelVo.getThirdOrderNo()); // 设置第三方订单号
            model.setDELRemarks(cancelVo.getReason()); // 设置取消原因

            ServiceOrderAppResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());
            ServiceOrderDelResultVo result = ServiceOrderUtil.CancelServiceOrder(model,scApp.getMinAppSecret());

            if (result.getResult() == 1) {
                // 更新本地订单状态
@@ -268,7 +286,7 @@
                tbOrdersService.updateTbOrders(tbOrders);
                return AjaxResult.success(result);
            } else {
                return AjaxResult.error("取消订单失败");
                return AjaxResult.error("取消订单失败",result);
            }
        } catch (Exception e) {
            return AjaxResult.error("取消订单失败:" + e.getMessage());