总业绩统计

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

@@ -53,6 +53,9 @@ public class ReturnOrderAmount implements Serializable {
     public String getType() {
         return orderTypeMap.get(type);
     }
+    public Integer getTypeInt() {
+     return this.type;
+    }
 
     public String getTime() {
         Date date = new Date(this.time);

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

@@ -128,9 +128,8 @@ public class TotalPerformanceBiz {
             //判断押金退还是否大于0
             if ( depositAmount.compareTo(BigDecimal.ZERO)>0) {
                 ReturnOrderAmount returnOrderAmountClone = ObjectUtil.clone(returnOrderAmount);
-
                 //判断是违章还是租车
-                if (OrderTypeEnum.RENT_VEHICLE.equals(returnOrderAmount.getType())) {
+                if (OrderTypeEnum.RENT_VEHICLE.equals(returnOrderAmount.getTypeInt())) {
                     if (AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode().equals(returnOrderAmount.getAccountType())) {
                         returnOrderAmountClone.setRefundInstruction("违章押金");
                         returnOrderAmountClone.setRefundAmount(accountDetailStr.getDepositAmount());