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

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/UserCouponVo.java

@@ -149,6 +149,12 @@ public class UserCouponVo {
 	 */
 	@ApiModelProperty(value = "跳转链接")
 	private String url;
+
+	/**
+	 *  是否选中
+	 */
+	@ApiModelProperty(value = "是否选中")
+	private Integer isChecked;
 	
 
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -160,15 +160,31 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             }
            // list.sort(Comparator.comparing(UserCouponVo::getStatus));
         }
-        if (list1.size()>0){
-            list1.sort(Comparator.comparing(UserCouponVo::getStatus));
-        }
+        BigDecimal mAmount=BigDecimal.ZERO;
         if (list2.size()>0){
+            if (mAmount.compareTo(BigDecimal.ZERO)==0){
+                UserCouponVo userCouponVo=list2.get(0);
+                if (userCouponVo!=null){
+                    mAmount=userCouponVo.getUsedAmount();
+                    userCouponVo.setIsChecked(1);
+                    list2.set(0,userCouponVo);
+                }
+            }
             list2.sort(Comparator.comparing(UserCouponVo::getStatus));
         }
+        if (list1.size()>0){
+            UserCouponVo userCouponVo=list1.get(0);
+            if (userCouponVo!=null){
+                mAmount=userCouponVo.getUsedAmount();
+                userCouponVo.setIsChecked(1);
+                list1.set(0,userCouponVo);
+            }
+            list1.sort(Comparator.comparing(UserCouponVo::getStatus));
+        }
         JSONObject object=new JSONObject();
-        object.put("type1",list1);
-        object.put("type2",list2);
+        object.put("1",list1);
+        object.put("3",list2);
+        object.put("mAmount",mAmount);
         return  ObjectRestResponse.succ(object);
     }
 

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);