Merge branch 'dev-chw-vehicle' into dev-chw

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderViolation.java

@@ -35,21 +35,8 @@ public class OrderViolation {
     @Column(name = "picture")
     private String picture;
 
-    /**
-     * 违章日期
-     */
-    @Column(name = "violate_date")
-    private Long violateDate;
 
-    /**
-     * 违章地点
-     */
-    private String area;
-
-    /**
-     * 违章行为
-     */
-    private String act;
+    private String violateJson;
 
     /**
      * 创建人id

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderViolationController.java

@@ -78,7 +78,10 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
 				.where(WeekendSqls.<OrderViolation>custom().andEqualTo(OrderViolation::getDetailId, detailId)
 						.andEqualTo(OrderViolation::getIsDel, 0)).build();
 		List<OrderViolation> orderViolations = getBaseBiz().selectByExample(exa);
-		return ObjectRestResponse.succ(orderViolations);
+		if (orderViolations != null && orderViolations.size() > 0) {
+			return ObjectRestResponse.succ(orderViolations.get(0));
+		}
+		return ObjectRestResponse.succ();
 	}
 
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderViolateService.java

@@ -151,20 +151,42 @@ public class OrderViolateService {
 		if (response.isRel() && response.getData() != null) {
 			List<OrderViolateVo>  list = JSONArray.parseArray(response.getData().toString(), OrderViolateVo.class);
 			if (list != null) {
-				list.parallelStream().forEach(orderViolateVo -> {
+				Map<Integer, List<OrderViolateVo>> map = new HashMap<>();
 					if (orderRentVehicleDetailList.size() > 0) {
-						orderRentVehicleDetailList.parallelStream().forEach(orderRentVehicleDetail -> {
-							OrderViolation orderViolation = new OrderViolation();
-							orderViolation.setDetailId(orderRentVehicleDetail.getId());
-							orderViolation.setViolateDate(orderViolateVo.getDate().getTime());
-							orderViolation.setArea(orderViolateVo.getArea());
-							orderViolation.setAct(orderViolateVo.getAct());
-							orderViolation.setPrice(new BigDecimal(orderViolateVo.getMoney()));
-							orderViolationList.add(orderViolation);
+							orderRentVehicleDetailList.parallelStream().forEach(orderRentVehicleDetail -> {
+							List<OrderViolateVo> orderViolateVoList = map.get(orderRentVehicleDetail.getId());
+							if (orderViolateVoList == null) {
+								orderViolateVoList = new ArrayList<>();
+							}
+
+							List<OrderViolateVo> finalOrderViolateVoList = orderViolateVoList;
+							list.parallelStream().forEach(orderViolateVo -> {
+								if (orderViolateVo.getDate().getTime() >= orderRentVehicleDetail.getDeliveryTime() && orderViolateVo.getDate().getTime() <= orderRentVehicleDetail.getCollectTime()) {
+									finalOrderViolateVoList.add(orderViolateVo);
+								}
+							});
+							map.put(orderRentVehicleDetail.getId(), orderViolateVoList);
 						});
 					}
-
-				});
+				for (Map.Entry<Integer, List<OrderViolateVo>> entry : map.entrySet()) {
+					List<OrderViolateVo> orderViolateVoList = entry.getValue();
+
+					OrderViolation orderViolation = new OrderViolation();
+					orderViolation.setViolateJson(response.getData().toString());
+					if(orderViolateVoList != null && orderViolateVoList.size() > 0) {
+						Double amount = orderViolateVoList.stream().mapToDouble(e->Double.parseDouble(e.getMoney())).reduce(0, Double::sum);
+						if (amount != null) {
+							orderViolation.setPrice(new BigDecimal(amount));
+						} else {
+							orderViolation.setPrice(BigDecimal.ZERO);
+						}
+
+					} else {
+						orderViolation.setPrice(BigDecimal.ZERO);
+					}
+					orderViolation.setDetailId(entry.getKey());
+					orderViolationList.add(orderViolation);
+				}
 			}
 		}
 		log.error("违章查询失败: {}", response.getMessage());