修复bug

ruoyi-admin/src/main/resources/application-druid-root-prod.yml

@@ -45,8 +45,8 @@ scheduling:
     enabled: false
 #操作oss需要的一些参数
 aliyun:
-    accessKeyId: LTAI5tQSs47izVy8DLVdwUU9       # 阿里云的accessKeyId
-    secretAccessKey: qHI7C3PaXYZySr84HTToviC71AYlFq   # accessKey 密码
+    accessKeyId: LTAI5tESEdx8bQjkSC9UHnmE       # 阿里云的accessKeyId
+    secretAccessKey: cClMLIzTkYW5cxyY3iuz8InIECujMC   # accessKey 密码
     oss:
         endPoint: oss-cn-shenzhen.aliyuncs.com     # Endpoint:在阿里云oss控制台查看自己使用的endpoint
         bucketName: hanhaiimage   # bucket 名称
@@ -97,8 +97,8 @@ sms:
   enabled: true
   # 阿里云 dysmsapi.aliyuncs.com
   endpoint: dysmsapi.aliyuncs.com
-  accessKeyId: LTAI5tKHcnnn2Ydue8ZSXwaN #阿里云短信服务控制台查看
-  accessKeySecret: 6qvhtCb9MkswKEGmRmlpOXwtKwKJFv #同上
+  accessKeyId: LTAI5tESEdx8bQjkSC9UHnmE #阿里云短信服务控制台查看
+  accessKeySecret: cClMLIzTkYW5cxyY3iuz8InIECujMC #同上
   signName: 猫妈狗爸
   #猫妈狗爸
   templateId: SMS_301225389

ruoyi-admin/src/main/resources/application-druid-root.yml

@@ -45,8 +45,8 @@ scheduling:
     enabled: false
 #操作oss需要的一些参数
 aliyun:
-    accessKeyId: LTAI5tQSs47izVy8DLVdwUU9       # 阿里云的accessKeyId
-    secretAccessKey: qHI7C3PaXYZySr84HTToviC71AYlFq   # accessKey 密码
+    accessKeyId: LTAI5tESEdx8bQjkSC9UHnmE       # 阿里云的accessKeyId
+    secretAccessKey: cClMLIzTkYW5cxyY3iuz8InIECujMC   # accessKey 密码
     oss:
         endPoint: oss-cn-shenzhen.aliyuncs.com     # Endpoint:在阿里云oss控制台查看自己使用的endpoint
         bucketName: hanhaiimage   # bucket 名称
@@ -98,8 +98,8 @@ sms:
   enabled: true
   # 阿里云 dysmsapi.aliyuncs.com
   endpoint: dysmsapi.aliyuncs.com
-  accessKeyId: LTAI5tKHcnnn2Ydue8ZSXwaN #阿里云短信服务控制台查看
-  accessKeySecret: 6qvhtCb9MkswKEGmRmlpOXwtKwKJFv #同上
+  accessKeyId: LTAI5tESEdx8bQjkSC9UHnmE #阿里云短信服务控制台查看
+  accessKeySecret: cClMLIzTkYW5cxyY3iuz8InIECujMC #同上
   signName: 猫妈狗爸
   #猫妈狗爸
   templateId: SMS_301225389

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java

@@ -694,6 +694,7 @@ public class ApiAppletOrderController extends BaseController {
 
         if (omsOrder != null && omsOrder.getStatus() == Constants.H5OrderStatus.NOT_DELIVERED){
             omsOrder.setStatus(Constants.H5OrderStatus.DELIVERED);
+            omsOrder.setAcceptAppUserId(order.getUserId());
             orderMapper.updateById(omsOrder);
         }else {
             throw new ServiceException("订单已被接单");

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java

@@ -22,11 +22,10 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisService;
+import com.ruoyi.common.core.sms.AliyunSmsUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.config.LocalDataUtil;
-import com.ruoyi.model.domain.AppUsers;
-import com.ruoyi.model.domain.AppletAddress;
-import com.ruoyi.model.domain.AppletUsersTeacher;
-import com.ruoyi.model.domain.OmsOrderEvaluation;
+import com.ruoyi.model.domain.*;
 import com.ruoyi.model.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -68,6 +67,9 @@ public class ApiMallOrderController extends BaseController {
     @Autowired
     private OrderOperateHistoryService orderOperateHistoryService;
 
+    @Autowired
+    private IAppletOrderService appletOrderService;
+
     @Autowired
     private OrderMapper orderMapper;
 
@@ -188,16 +190,34 @@ public class ApiMallOrderController extends BaseController {
         if (oldOrderStatus == 5){
             return AjaxResult.error("无效订单");
         }
-        if (oldOrderStatus > 1){
-            return AjaxResult.error("订单已被接单无法取消/修改");
+        if (oldOrderStatus > 2){
+            return AjaxResult.error("订单进行中无法取消/修改");
         }
 
         try {
             // 先取消订单
             String cancelResult = service.orderBatchCancel(request, null);
 
-            //TODO 短信通知
+            //TODO 短信通知 通知内容需要修改一下
+
+            AppletOrder appletOrder = appletOrderService.lambdaQuery()
+                    .eq(AppletOrder::getOrderId, order.getId()).one();
+
+            if(appletOrder != null){
+
+                AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletOrder.getUserId());
 
+                AliyunSmsUtils.sendOrderUpdate(appUsers.getUserTelephone(), "取消订单", order.getId() + "");
+
+            }
+            AppletConfig appletConfig = appletConfigService.getByCode("admin_phone_list");
+
+            String adminPhoneList = appletConfig.getParamValueText();
+            if(StringUtils.isNotEmpty(adminPhoneList)){
+                for (String phone : adminPhoneList.split(",")) {
+                    AliyunSmsUtils.sendOrderUpdate(phone, "取消订单", order.getId() + "");
+                }
+            }
 
             return AjaxResult.success(cancelResult);
         } catch (Exception e) {

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletOrderDateFrequencyAppletController.java

@@ -79,7 +79,7 @@ public class AppletOrderDateFrequencyAppletController extends BaseController {
     }
 
     /**
-     * 获取日订单详细信息
+     * 打卡
      */
     @PostMapping(value = "/check")
     @RepeatSubmit

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/H5AppointmentController.java

@@ -87,13 +87,13 @@ public class H5AppointmentController {
                 if (oldOrderStatus == 5){
                     return AjaxResult.error("无效订单");
                 }
-                if (oldOrderStatus > 1){
-                    return AjaxResult.error("订单已被接单无法取消/修改");
+                if (oldOrderStatus > 2){
+                    return AjaxResult.error("订单服务中无法取消/修改");
                 }
 
                 apiMallOrderService.orderBatchCancel(CancelOrderRequest.builder()
                         .id(form.getOrderId())
-                        .remark("退回修改订单的钱")
+                        .remark("修改订单退回上一笔钱")
                         .build(), null);
             }
 

ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java

@@ -47,8 +47,10 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.LocalDataUtil;
 import com.ruoyi.model.domain.AppletOrder;
 import com.ruoyi.model.domain.AppletOrderDateFrequency;
+import com.ruoyi.model.domain.AppletOrderItem;
 import com.ruoyi.model.domain.OmsOrderEvaluation;
 import com.ruoyi.model.service.IAppletOrderDateFrequencyService;
+import com.ruoyi.model.service.IAppletOrderItemService;
 import com.ruoyi.model.service.IAppletOrderService;
 import com.ruoyi.model.service.IOmsOrderEvaluationService;
 import lombok.extern.slf4j.Slf4j;
@@ -140,6 +142,9 @@ public class IApiMallOrderServiceImpl implements IApiMallOrderService {
     @Autowired
     private IAppletOrderService appletOrderService;
 
+    @Autowired
+    private IAppletOrderItemService appletOrderItemService;
+
     @Autowired
     private IOmsOrderEvaluationService orderEvaluationService;
 
@@ -379,6 +384,10 @@ public class IApiMallOrderServiceImpl implements IApiMallOrderService {
             appletOrderService.updateById(appletOrder);
         }
 
+        //取消日订单
+        appletOrderItemService.remove(Wrappers.<AppletOrderItem>lambdaQuery()
+                .eq(AppletOrderItem::getOrderId, order.getId()));
+
         //取消日订单
         appletOrderDateFrequencyService.remove(Wrappers.<AppletOrderDateFrequency>lambdaQuery()
                 .eq(AppletOrderDateFrequency::getOrderId, order.getId()));

ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java

@@ -111,7 +111,12 @@ public class IMallOrderServiceImpl implements IMallOrderService {
             appletOrder.setCreateType(appletOrder.getType());//开始接单类型
             appletOrder.setNewOrderTime(LocalDateTime.now());//最新派单时间
 
-            appletOrderService.insertAppletOrder(appletOrder);
+            if (h5OrderVO.getOldOrderId() != null && h5OrderVO.getOldOrderId() != 0){//修改订单
+                appletOrderService.insertAppletOrder(appletOrder, false);
+            }else {
+                appletOrderService.insertAppletOrder(appletOrder, true);//需要短信
+            }
+
 
 
 //            //根据服务频率 服务日期 生成日订单
@@ -182,8 +187,12 @@ public class IMallOrderServiceImpl implements IMallOrderService {
         appletOrder.setCreateType(appletOrder.getType());//开始接单类型
         appletOrder.setNewOrderTime(LocalDateTime.now());//最新派单时间
 
-        appletOrderService.insertAppletOrder(appletOrder);
 
+        if (h5OrderVO.getOldOrderId() != null && h5OrderVO.getOldOrderId() != 0){//修改订单
+            appletOrderService.insertAppletOrder(appletOrder, false);
+        }else {
+            appletOrderService.insertAppletOrder(appletOrder, true);//需要短信
+        }
 
 
 //        //根据服务频率 服务日期 生成日订单
@@ -201,11 +210,6 @@ public class IMallOrderServiceImpl implements IMallOrderService {
 //        }
 
 
-
-
-
-
-
         return AjaxResult.success();
     }
 

ruoyi-catdog/src/main/java/com/ruoyi/applet/tencent/TaskConsumer.java

@@ -5,6 +5,7 @@ import com.cyl.h5.service.H5MemberService;
 import com.cyl.h5.service.H5OrderService;
 import com.cyl.manager.oms.domain.OmsOrderService;
 import com.cyl.manager.oms.domain.Order;
+import com.cyl.manager.oms.mapper.OrderMapper;
 import com.cyl.manager.oms.service.OmsOrderServiceService;
 import com.cyl.manager.oms.service.OrderService;
 import com.cyl.manager.staff.service.IDispatchOrderService;
@@ -17,15 +18,20 @@ import com.cyl.tencent.OrderMessageModel;
 import com.cyl.tencent.QueueConsumer;
 import com.ruoyi.applet.service.IMallOrderService;
 import com.ruoyi.common.config.properties.SmsProperties;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.sms.AliyunSmsUtils;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.model.domain.*;
+import com.ruoyi.model.service.*;
 import com.wechat.pay.java.core.util.GsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -43,6 +49,8 @@ import java.util.concurrent.atomic.AtomicReference;
 @Component
 public class TaskConsumer implements QueueConsumer {
 
+    @Autowired
+    private OrderMapper orderMapper;
 
     @Autowired
     @Qualifier("taskQueue")
@@ -82,7 +90,23 @@ public class TaskConsumer implements QueueConsumer {
     private boolean run;
     private TaskThread[] taskThreads;
 
- 
+
+    @Autowired
+    private IAppletOrderDateFrequencyService appletOrderDateFrequencyService;
+
+    @Autowired
+    private IAppUsersService appUsersService;
+    @Autowired
+    private IAppletConfigService configService;
+    @Autowired
+    private IAppletOrderService appletOrderService;
+    @Autowired
+    private IAppletOrderItemService appletOrderItemService;
+    @Autowired
+    private IAppletUsersTeacherService appletUsersTeacherService;
+
+    @Autowired
+    private IAppletConfigService appletConfigService;
  
     private class TaskThread extends Thread {
 
@@ -113,10 +137,16 @@ public class TaskConsumer implements QueueConsumer {
                         log.info("指定派单---------------------------------------");
                         mallOrderService.acceptDispatch(model.getOrder().getTeacherId(), h5OrderVO);
                     }
+
+
+
                     //进行派单操作
-                     dispatchedOrdersService.dispatch(model.getOrder().getId());
+//                     dispatchedOrdersService.dispatch(model.getOrder().getId());
                     //TODO 等待订单逻辑完成
                     smsHandler(model.getOrder());
+
+                    startOrder(h5OrderVO, model.getOrder());
+
                 } catch (Exception e) {
                     log.error("task消费异常：{}", e);
                 }
@@ -260,6 +290,99 @@ public class TaskConsumer implements QueueConsumer {
         return memberPointHistory;
     }
 
+
+    private void startOrder(H5OrderVO h5OrderVO, Order omsOrder){
+        try {
+            if (h5OrderVO.getOldOrderId() != null && h5OrderVO.getOldOrderId() != 0){
+                log.info("修改订单startOrder(H5OrderVO {}, Order {})", h5OrderVO, omsOrder);
+                //按照原订单进行接单
+                H5OrderVO oldOrder = h5OrderService.orderDetail(h5OrderVO.getOldOrderId());
+                if(oldOrder != null && oldOrder.getAcceptAppUserId() != null
+                        && oldOrder.getAcceptAppUserId() != 0){
+
+                    if (omsOrder != null && omsOrder.getStatus() == Constants.H5OrderStatus.NOT_DELIVERED){
+                        omsOrder.setStatus(Constants.H5OrderStatus.DELIVERED);
+                        omsOrder.setAcceptAppUserId(oldOrder.getAcceptAppUserId());
+                        orderMapper.updateById(omsOrder);
+                    }else {
+                        throw new ServiceException("订单已被接单");
+                    }
+
+                    AppletOrder appletOrder = appletOrderService.lambdaQuery()
+                            .eq(AppletOrder::getOrderId, omsOrder.getId()).one();
+
+                    if (appletOrder == null){
+                        throw new ServiceException("无效订单");
+                    }
+                    if(appletOrder.getStatus() == 1){
+                        throw new ServiceException("该订单已被接单");
+                    }
+
+                    appletOrder.setUserId(oldOrder.getAcceptAppUserId());
+                    appletOrder.setStatus(1);
+                    appletOrderService.updateById(appletOrder);
+
+                    //生成我的订单信息
+                    AppletOrderItem appletOrderItem = new AppletOrderItem();
+                    long id = System.currentTimeMillis();
+                    appletOrderItem.setId(id);
+                    appletOrderItem.setCreateTime(appletOrder.getCreateTime());
+                    appletOrderItem.setType(appletOrder.getType());
+                    appletOrderItem.setStatus(1);
+                    //        appletOrderItem.setReason(appletOrder.getReason());
+                    appletOrderItem.setStartTime(LocalDateTime.now());
+                    appletOrderItem.setUserId(appletOrder.getUserId());
+                    //根据用户标识查询用户认证信息
+                    AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletOrder.getUserId());
+                    AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(appletOrder.getUserId());
+                    appletOrderItem.setName(appletUsersTeacher.getName());
+                    appletOrderItem.setPhone(appletUsersTeacher.getPhone());
+                    appletOrderItem.setOrderStatus(0);
+
+                    //得到当前用户的伴宠师等级
+                    Integer userBcs = appUsers.getUserBcs();
+                    //查询用户的当前分配比例
+                    AppletConfig petPaymentBcs = configService.selectAppletConfigByClassAndNum("pet_payment_bcs", userBcs);
+                    //得到配置百分比
+                    BigDecimal percent = petPaymentBcs.getParamValueNo();
+                    //得到订单支付金额
+                    BigDecimal orderPrice = appletOrder.getPrice();
+                    //计算订单佣金 = 支付金额 * 百分比
+                    BigDecimal orderGivePrice = orderPrice.multiply(percent);
+                    appletOrderItem.setPrice(orderPrice);
+                    appletOrderItem.setOrderGiveProportion(percent);
+                    appletOrderItem.setOrderGivePrice(orderGivePrice);
+                    appletOrderItem.setAddress(appletOrder.getAddress());
+                    appletOrderItem.setOrderSn(appletOrder.getOrderSn());
+                    appletOrderItem.setOrderId(appletOrder.getOrderId());
+                    appletOrderItem.setIsPet(1);
+                    appletOrderItem.setIsDate(1);
+                    appletOrderItem.setIsAddress(1);
+
+                    appletOrderItemService.insertAppletOrderItem(appletOrderItem);
+
+                    // 生成日订单数据
+                    appletOrderDateFrequencyService.aceptOrdersGenerateDayOrdersByOrderVO(h5OrderVO,
+                            oldOrder.getAcceptAppUserId());
+
+                    //TODO 短信通知 系统和接单的伴宠师 通知内容需要修改一下
+                    AliyunSmsUtils.sendOrderUpdate(appUsers.getUserTelephone(), "修改订单", omsOrder.getId() + "");
+
+                    AppletConfig appletConfig = appletConfigService.getByCode("admin_phone_list");
+
+                    String adminPhoneList = appletConfig.getParamValueText();
+                    if(StringUtils.isNotEmpty(adminPhoneList)){
+                        for (String phone : adminPhoneList.split(",")) {
+                            AliyunSmsUtils.sendOrderUpdate(phone, "修改订单", omsOrder.getId() + "");
+                        }
+                    }
+                }
+            }
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+    }
+
     @Override
     public void start() {
         run = true;

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderItemMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.model.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.model.domain.AppletOrderItem;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2025-03-28
  */
-public interface AppletOrderItemMapper
+public interface AppletOrderItemMapper extends BaseMapper<AppletOrderItem>
 {
     /**
      * 查询订单信息

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderItemService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.model.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.model.domain.AppletOrder;
 import com.ruoyi.model.domain.AppletOrderItem;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2025-03-28
  */
-public interface IAppletOrderItemService
+public interface IAppletOrderItemService extends IService<AppletOrderItem>
 {
     /**
      * 查询订单信息

ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderService.java

@@ -37,7 +37,7 @@ public interface IAppletOrderService extends IService<AppletOrder>
      * @param appletOrder 订单信息
      * @return 结果
      */
-    public int insertAppletOrder(AppletOrder appletOrder);
+    public int insertAppletOrder(AppletOrder appletOrder, boolean sms);
 
     /**
      * 修改订单信息

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderItemServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.model.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.model.domain.AppletOrder;
 import com.ruoyi.model.domain.AppletOrderItem;
 import com.ruoyi.model.mapper.AppletOrderItemMapper;
@@ -18,7 +19,8 @@ import java.util.List;
  * @date 2025-03-28
  */
 @Service
-public class AppletOrderItemServiceImpl implements IAppletOrderItemService
+public class AppletOrderItemServiceImpl extends ServiceImpl<AppletOrderItemMapper, AppletOrderItem>
+        implements IAppletOrderItemService
 {
     @Autowired
     private AppletOrderItemMapper appletOrderItemMapper;

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderServiceImpl.java

@@ -86,13 +86,16 @@ public class AppletOrderServiceImpl extends ServiceImpl<AppletOrderMapper, Apple
      * @return 结果
      */
     @Override
-    public int insertAppletOrder(AppletOrder appletOrder)
+    public int insertAppletOrder(AppletOrder appletOrder, boolean sms)
     {
 //        appletOrder.setCreateTime(new Date());
         appletOrder.setNoticeSystemFlag(0L);
         appletOrder.setNum(1);
         int i = appletOrderMapper.insert(appletOrder);
-        noticePersonalByOrderIds(Collections.singletonList(appletOrder.getId()));
+
+        if (sms){
+            noticePersonalByOrderIds(Collections.singletonList(appletOrder.getId()));
+        }
         return i;
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/core/sms/AliyunSmsUtils.java

@@ -188,4 +188,17 @@ public class AliyunSmsUtils {
         }
         return null;
     }
+
+    public static SmsResult sendOrderUpdate(String phones, String type, String orderId) {
+        try {
+            log.info("【短信发送】通知管理员长时间无人接单，请处理！");
+            Map<String, String> param = new HashMap<>();
+//            param.put("type", type);//取消订单/修改订单
+            param.put("order_id", orderId);
+            return send(phones, longTimeNoOrderAccepted, param);
+        }catch (Exception e){
+            log.error("短信发生失败：", e);
+        }
+        return null;
+    }
 }

ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/H5OrderVO.java

@@ -121,6 +121,11 @@ public class H5OrderVO {
 
     private Boolean needPreFamiliarize;
 
-
     private boolean evaluation;
+
+    // 修改订单原订单id
+    private  Long oldOrderId;
+
+    //接单的伴宠师id
+    private Long acceptAppUserId;
 }

ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java

@@ -256,6 +256,9 @@ public class H5OrderService {
             order.setOrderMethod(form.getOrderMethod());
         }
 
+        if(form.getOrderId() != null && form.getOrderId() != 0){
+            order.setOldOrderId(form.getOrderId());
+        }
 
         /*
         //优惠券优惠

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java

@@ -207,4 +207,10 @@ public class Order extends BaseAudit {
     /** 再来一单加价 */
     private BigDecimal moreOrderPrice;
 
+    /** 修改订单原订单id */
+    private Long oldOrderId;
+
+    //接单的伴宠师id
+    private Long acceptAppUserId;
+
 }

ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml

@@ -50,6 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="addressId" column="address_id"/>
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
+        <result property="oldOrderId" column="old_order_id"/>
+        <result property="acceptAppUserId" column="accept_app_user_id"/>
     </resultMap>
 
     <sql id="selectOrderVo">
@@ -324,7 +326,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         old_price,
         pre_familiarize_price,
         need_pre_familiarize,
-        companion_level_price
+        companion_level_price,
+        old_order_id,
+        accept_app_user_id
         from oms_order
         where
         delete_status=0