修改通用子订单查询业务接口

pz-system/src/main/java/com/pz/system/mapper/DbmyOrderMapper.java

@@ -2,6 +2,7 @@ package com.pz.system.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.system.domain.DbmyOrder;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.bo.DbmyOrderBo;
@@ -9,6 +10,7 @@ import com.pz.system.domain.bo.DbwzOrderBo;
 import com.pz.system.domain.vo.DbmyOrderVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
 import com.pz.system.domain.vo.DbwzOrderVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -17,6 +19,14 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2023-09-11
  */
+@Mapper
 public interface DbmyOrderMapper extends BaseMapperPlus<DbmyOrderMapper, DbmyOrder, DbmyOrderVo> {
     Page<DbmyOrderVo> findDbmyOrderVoPage(IPage<DbmyOrder> iPage, @Param("bo") DbmyOrderBo bo);
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/service/impl/DbmyOrderServiceImpl.java

@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.merchant.domain.vo.SonOrderVo;
+import com.pz.merchant.service.ISonOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.DbmyOrderBo;
@@ -27,7 +29,7 @@ import java.util.Collection;
  */
 @RequiredArgsConstructor
 @Service
-public class DbmyOrderServiceImpl implements IDbmyOrderService {
+public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService {
 
     private final DbmyOrderMapper baseMapper;
 
@@ -35,7 +37,7 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService {
      * 查询代办买药订单
      */
     @Override
-    public DbmyOrderVo queryById(Integer id){
+    public DbmyOrderVo queryById(Integer id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -108,8 +110,8 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(DbmyOrder entity){
-        //TODO 做一些数据校验,如唯一约束
+    private void validEntityBeforeSave(DbmyOrder entity) {
+        // TODO 做一些数据校验,如唯一约束
     }
 
     /**
@@ -117,9 +119,14 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) {
+        return baseMapper.selectSonOrderInfoByTotalId(totalId);
+    }
 }

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -51,12 +51,11 @@
     </select>
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
-        select user.nick_name    as userName,
+        select user.name         as userName,
                dbgh_order.status as orderStatus
         from dbgh_order
-                 left join sys_user as user on user.user_id = dbgh_order.visitor
+                 left join user_vsitor as user on user.id = dbgh_order.visitor
         where dbgh_order.order_id = #{id}
-
     </select>
 
 

pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml

@@ -52,5 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN employees AS e ON e.id = tlo.em_id
     </select>
 
+    <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
+        select dbmy_order.status  as orderStatus,
+               sys_user.nick_name as userName
+        from dbmy_order
+                 left join total_order on total_order.id = dbmy_order.order_id
+                 left join sys_user on sys_user.user_id = total_order.uid
+        where dbmy_order.order_id = #{id}
+    </select>
+
 
 </mapper>

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -56,12 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
-        select user.nick_name    as userName,
+        select user_vsitor.name  as userName,
                dbwz_order.status as orderStatus
         from dbwz_order
-                 left join sys_user as user on user.user_id = dbwz_order.visitor
+            left join user_vsitor on user_vsitor.id = dbwz_order.visitor
         where dbwz_order.order_id = #{id}
-
     </select>
 
 

pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml

@@ -53,10 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
-        select user.nick_name    as userName,
+        select user.name         as userName,
                yypz_order.status as orderStatus
         from yypz_order
-                 left join sys_user as user on user.user_id = yypz_order.visitor
+                 left join user_vsitor as user on user.id = yypz_order.visitor
         where yypz_order.order_id = #{id}
     </select>
 </mapper>

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -57,10 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
-        select user.nick_name    as userName,
+        select user.name         as userName,
                zyph_order.status as orderStatus
         from zyph_order
-                 left join sys_user as user on user.user_id = zyph_order.visitor
+                 left join user_vsitor as user on user.id = zyph_order.visitor
         where zyph_order.order_id = #{id}
     </select>