总业绩统计

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

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.pojo.Achievement;
 import com.xxfc.platform.order.pojo.QueryCriteria;
 import com.xxfc.platform.order.pojo.ReturnOrderAmount;
@@ -127,21 +128,27 @@ public class TotalPerformanceBiz {
             //判断押金退还是否大于0
             if ( depositAmount.compareTo(BigDecimal.ZERO)>0) {
                 ReturnOrderAmount returnOrderAmountClone = ObjectUtil.clone(returnOrderAmount);
+
                 //判断是违章还是租车
-                if (AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode().equals(returnOrderAmount.getAccountType())) {
-                    returnOrderAmountClone.setRefundInstruction("违章押金");
-                    returnOrderAmountClone.setRefundAmount(accountDetailStr.getDepositAmount());
-                }else {
-                    returnOrderAmountClone.setRefundInstruction("租车押金");
-                    returnOrderAmountClone.setRefundAmount(accountDetailStr.getDepositAmount());
+                if (OrderTypeEnum.RENT_VEHICLE.equals(returnOrderAmount.getType())) {
+                    if (AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode().equals(returnOrderAmount.getAccountType())) {
+                        returnOrderAmountClone.setRefundInstruction("违章押金");
+                        returnOrderAmountClone.setRefundAmount(accountDetailStr.getDepositAmount());
+                    }else {
+                        returnOrderAmountClone.setRefundInstruction("租车押金");
+                        returnOrderAmountClone.setRefundAmount(accountDetailStr.getDepositAmount());
+                    }
                 }
                 arrayList.add(returnOrderAmountClone);
+
             }
+
             //判断订单退款是否大于0
             if (orderAmount.compareTo(BigDecimal.ZERO)>0) {
                 ReturnOrderAmount returnOrderAmountClone = ObjectUtil.clone(returnOrderAmount);
                 returnOrderAmountClone.setRefundInstruction("订单退款");
                 returnOrderAmountClone.setRefundAmount(accountDetailStr.getOrderAmount());
+                arrayList.add(returnOrderAmountClone);
             }
 
         }