Commit b962ceb6 by 吕明尚

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

parent 527f1bcb
...@@ -12,7 +12,6 @@ public enum OrderStatusEnum { ...@@ -12,7 +12,6 @@ public enum OrderStatusEnum {
CANCEL(3, "已取消"), CANCEL(3, "已取消"),
REFUNDING(4, "退款中"), REFUNDING(4, "退款中"),
REFUNDED(5, "已退款"), REFUNDED(5, "已退款"),
UNUSED_AND_INUSE(10, "待使用/已预约/使用中"),
; ;
......
...@@ -64,4 +64,6 @@ public interface SOrderMapper extends BaseMapper<SOrder> ...@@ -64,4 +64,6 @@ public interface SOrderMapper extends BaseMapper<SOrder>
SOrder selectSOrderByNo(String orderNo); SOrder selectSOrderByNo(String orderNo);
List<SOrder> queryList(Long roomId); List<SOrder> queryList(Long roomId);
SOrder getInfoByEntity(SOrder orderParam);
} }
...@@ -1081,9 +1081,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -1081,9 +1081,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
@Override @Override
public SOrder getInfoByEntity(SOrder orderParam) { public SOrder getInfoByEntity(SOrder orderParam) {
LambdaQueryWrapper<SOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>(); return baseMapper.getInfoByEntity(orderParam);
lambdaQueryWrapper.setEntity(orderParam);
return getOne(lambdaQueryWrapper);
} }
@DSTransactional @DSTransactional
......
...@@ -146,6 +146,10 @@ ...@@ -146,6 +146,10 @@
AND (room_id = #{roomId} AND pay_status = 1 AND status IN (0, 1)) AND (room_id = #{roomId} AND pay_status = 1 AND status IN (0, 1))
ORDER BY status DESC , pre_start_date ORDER BY status DESC , pre_start_date
</select> </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 id="insertSOrder" parameterType="SOrder" useGeneratedKeys="true" keyProperty="id">
insert into s_order insert into s_order
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment