Merge branch 'master-rentvehicle' into dev

5a7a11ae · jiaorz · c2344b68 · 19fcd9a2 · 5a7a11ae
Commit 5a7a11ae authored Apr 17, 2020 by jiaorz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

BackgroundBaseOrderBiz.java ...a/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java +1 -0

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java
@@ -71,6 +71,7 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder>
 		}
 		if (dto.getStatus()!=null && dto.getStatus() >= 7) {
 			dto.setRefundStatus(dto.getStatus());
+			dto.setStatus(null);
 		}
 		Query query = new Query(dto);
 		PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllOrderList(query.getSuper()));