后台优化

lb-module/src/main/java/com/ydd/module/mapper/OrderMapper.java

@@ -128,6 +128,13 @@ public interface OrderMapper extends BaseMapper<Order> {
      */
     Order getByOrderSn(String orderSn);
 
+    /**
+     * 根据订单号查找订单(包括异常单)
+     * @param orderSn
+     * @return
+     */
+    Order getAllOrderByOrderSn(String orderSn);
+
     List<DadaOrderListDto> queryDadaPageList(@Param("page") Page page, @Param("params") DadaOrderListQuery orderQuery);
 
     List<SystemOrderDto> selectDadaCountByStatus(@Param("params") DadaOrderListQuery orderQuery);

lb-module/src/main/java/com/ydd/module/service/IOrderService.java

@@ -180,6 +180,13 @@ public interface IOrderService extends IService<Order> {
      */
     Order getByOrderSn(String orderSn);
 
+    /**
+     * 根据订单号查找订单(包括异常单)
+     * @param orderSn
+     * @return
+     */
+    Order getAllOrderByOrderSn(String orderSn);
+
     Boolean orderRefund(SystemOrderDto order);
 
     /**

lb-module/src/main/java/com/ydd/module/service/impl/MemberBalanceLogServiceImpl.java

@@ -90,7 +90,7 @@ public class MemberBalanceLogServiceImpl extends ServiceImpl<MemberBalanceLogMap
 
         List<MemberBalanceLog> logList = this.list(lqw);
 
-        if (memberBalanceLog.getShowOther()) {
+        // if (memberBalanceLog.getShowOther()) {
             for (MemberBalanceLog log : logList) {
                 if (log.getOrderId() != null) {
                     Order order = orderMapper.selectById(log.getOrderId());
@@ -115,7 +115,7 @@ public class MemberBalanceLogServiceImpl extends ServiceImpl<MemberBalanceLogMap
                         }
                 }
             }
-        }
+        // }
         return logList;
     }
 

lb-module/src/main/java/com/ydd/module/service/impl/OrderServiceImpl.java

@@ -868,6 +868,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return baseMapper.getByOrderSn(orderSn);
     }
 
+    /**
+     * 根据订单号查找订单(包括异常单)
+     * @param orderSn
+     * @return
+     */
+    @Override
+    public Order getAllOrderByOrderSn(String orderSn) {
+        return baseMapper.getAllOrderByOrderSn(orderSn);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean orderRefund(SystemOrderDto order1) {

lb-module/src/main/resources/mapper/module/orderMapper.xml

@@ -1681,6 +1681,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id,order_sn,delivery_status from lb_order where order_sn = #{orderSn} and deleted = 0
     </select>
 
+    <select id="getAllOrderByOrderSn" resultType="com.ydd.module.domain.Order">
+        select id,order_sn,delivery_status from lb_order where order_sn = #{orderSn}
+    </select>
+
     <select id="queryDadaPageList" resultType="com.ydd.module.dto.DadaOrderListDto">
         SELECT
         o.id,

lb-web/src/main/java/com/ydd/web/controller/MemberBalanceLogController.java

@@ -54,8 +54,10 @@ public class MemberBalanceLogController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(MemberBalanceLog memberBalanceLog) {
         if(memberBalanceLog.getOrderSn() != null) {
-          Order order = iOrderService.getByOrderSn(memberBalanceLog.getOrderSn());
-          memberBalanceLog.setOrderId(order.getId());
+          Order order = iOrderService.getAllOrderByOrderSn(memberBalanceLog.getOrderSn());
+          if (order != null) {
+            memberBalanceLog.setOrderId(order.getId());
+          }
         }
         startPage();
         List<MemberBalanceLog> list = iMemberBalanceLogService.queryList(memberBalanceLog);