Merge branch 'master-rentvehicle' into dev

c2344b68 · jiaorz · d60525c2 · 80f8302c · c2344b68
Commit c2344b68 authored Apr 17, 2020 by jiaorz
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

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
@@ -69,7 +69,7 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder>
 				dto.setEndTime(new Date().getTime());
 			}
 		}
-		if (dto.getStatus() >= 7) {
+		if (dto.getStatus()!=null && dto.getStatus() >= 7) {
 			dto.setRefundStatus(dto.getStatus());
 		}
 		Query query = new Query(dto);