Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/DedDetailDTO.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.pojo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class DedDetailDTO {
@@ -24,4 +25,13 @@ public class DedDetailDTO {
 
     //1、延期， 2、车辆损坏 3、其他
     Integer type;
+
+    //小雨都不知道什么东西
+    Integer statusIndex;
+
+    //定损凭证
+    List<String> picList;
+
+    //type对应的中文
+    String statusName;
 }

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

@@ -109,11 +109,15 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
             BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
-            if(null != crosstown.getDedDetail()) {
-                List<DedDetailDTO> dddList = JSONUtil.toBean(crosstown.getDedDetail(), List.class);
-                for(DedDetailDTO ddd : dddList) {
-                    refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
+            try{
+                if(null != crosstown.getDedDetail()) {
+                    List<DedDetailDTO> dddList = JSONUtil.toBean(crosstown.getDedDetail(), List.class);
+                    for(DedDetailDTO ddd : dddList) {
+                        refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
+                    }
                 }
+            }catch (Exception e) {
+                log.error("crosstown.getDedDetail() crosstown id :"+crosstown.getId() +" 转换失败");
             }
             refundDesc += ")";
             refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), RefundTypeEnum.PART_DEPOSIT);