Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/DeductionTypeEnum.java

@@ -8,6 +8,7 @@ public enum DeductionTypeEnum {
     VIOLATE_CANCEL(101, "提前取消违约金"),
     VIOLATE_ADVANCE(102, "提前还车违约金"),
     VIOLATE_DELAY(103, "延迟还车违约金"),
+    VIOLATE_CHANGE_C(104, "更换还车公司费用"),
     CONSUME(201, "消费金额"),
     DAMAGES(301, "赔偿金（定损）"),
     VIOLATE_TRAFFIC_DEDUCT(401, "违章扣款"),

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -482,12 +482,18 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     private void handleCrosstownDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad, CancelStartedVO csv) {
         try{
             if(null != crosstown.getViolateDetail()) {
-                DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
-
-                if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio, csv);
-                }else if(OrderViolateEnum.AFTER.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio, csv);
+                //修改代码
+                List<DedDetailDTO> vios = JSONUtil.toList(JSONUtil.parseArray(crosstown.getViolateDetail()), DedDetailDTO.class);
+                //DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
+
+                for(DedDetailDTO vio : vios) {
+                    if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
+                        handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio, csv);
+                    }else if(OrderViolateEnum.AFTER.getCode().equals(vio.getType())) {
+                        handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio, csv);
+                    }else if(OrderViolateEnum.CHANGE.getCode().equals(vio.getType())) {
+                        handleViolateDetail(DeductionTypeEnum.VIOLATE_CHANGE_C, oad, vio, csv);
+                    }
                 }
             }
         }catch (Exception e) {
@@ -496,6 +502,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     }
 
     private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio, CancelStartedVO csv) {
+        Boolean flag = Boolean.FALSE;
         for(OrderAccountDeduction deduction : oad.getDeductions()) {
             if(dte.getCode().equals(deduction.getType())) {
                 deduction.setName(vio.getDeductions());
@@ -505,10 +512,24 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 deduction.setAmount(vio.getCost());
 
                 //设置订单明细参数
-                csv.setViolateAmount(deduction.getAmount());
-                csv.setViolateDesc(deduction.getName());
+                csv.setViolateAmount(csv.getViolateAmount().add(diff));
+                csv.setViolateDesc(csv.getViolateDesc()+ deduction.getName());
+                flag = Boolean.TRUE;
+                break;
             }
         }
+
+        //如果没有修改，则添加
+        if(Boolean.FALSE.equals(flag)) {
+            OrderAccountDeduction oadNew = initDeduction(vio.getCost(), vio.getDeductions(), dte, OrderAccountDeduction.ORIGIN_DEPOSIT);
+            oad.getDeductions().add(oadNew);
+            //修改归还押金金额
+            oad.setDepositAmount(oad.getDepositAmount().subtract(oadNew.getAmount()));
+
+            //设置订单明细参数
+            csv.setViolateAmount(csv.getViolateAmount().add(oadNew.getAmount()));
+            csv.setViolateDesc(csv.getViolateDesc()+ oadNew.getName());
+        }
     }
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -197,51 +197,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 3) { //待出行
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus3(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 5) { //出行中
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus5(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //已完成
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query =  new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus7(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
         Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
@@ -261,47 +216,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
     }
-
-    //筛选未出车的记录
-    public void removeStatus3(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(3);
-            }
-        }
-    }
-
-    //筛选已出车未还车记录
-    public void removeStatus5(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() ==1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
-    //筛选已完成记录
-    public void removeStatus7(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() !=1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
     /**
      * 获取随身物品
      */

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -490,7 +490,7 @@
                     #{id}
                 </foreach>)
             </if>
-            <if test="status != null and status != 0 and status != -1 and status != -2">
+            <if test="status != null and status != 0 and status != -1 and status != -2 and status != 3 and status != 5 and status != 7">
                 and v1.status = #{status}
             </if>
             <if test="status != null and status == 0 ">
@@ -499,6 +499,15 @@
             <if test="status != null and status == -1 ">
                 and v4.state = 1
             </if>
+            <if test="status != null and status == 3 ">
+                and v4.id is null and v1.status = 2
+            </if>
+            <if test="status != null and status == 5 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 0
+            </if>
+            <if test="status != null and status == 7 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 1
+            </if>
             <if test="code != null">
                 and v3.code = #{code}
             </if>