修改订单因逻辑删除后，不能正常回调

share-common/src/main/java/share/common/enums/OrderStatusEnum.java

@@ -12,7 +12,6 @@ public enum OrderStatusEnum {
     CANCEL(3, "已取消"),
     REFUNDING(4, "退款中"),
     REFUNDED(5, "已退款"),
-    UNUSED_AND_INUSE(10, "待使用/已预约/使用中"),
     ;
 
 

share-system/src/main/java/share/system/mapper/SOrderMapper.java

@@ -64,4 +64,6 @@ public interface SOrderMapper extends BaseMapper<SOrder>
     SOrder selectSOrderByNo(String orderNo);
 
     List<SOrder> queryList(Long roomId);
+
+    SOrder getInfoByEntity(SOrder orderParam);
 }

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1081,9 +1081,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
     @Override
     public SOrder getInfoByEntity(SOrder orderParam) {
-        LambdaQueryWrapper<SOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.setEntity(orderParam);
-        return getOne(lambdaQueryWrapper);
+        return baseMapper.getInfoByEntity(orderParam);
     }
 
     @DSTransactional

share-system/src/main/resources/mapper/system/SOrderMapper.xml

@@ -146,6 +146,10 @@
         AND (room_id = #{roomId} AND pay_status = 1 AND status IN (0, 1))
         ORDER BY status DESC , pre_start_date
     </select>
+    <select id="getInfoByEntity" resultType="share.system.domain.SOrder" parameterType="SOrder">
+        <include refid="selectSOrderVo"/>
+        where out_trade_no=#{outTradeNo} and consumer_id=#{consumerId}
+    </select>
 
     <insert id="insertSOrder" parameterType="SOrder" useGeneratedKeys="true" keyProperty="id">
         insert into s_order