Merge branch 'master-zjw'

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -79,7 +79,7 @@ public class AppUserDTO {
 	private Integer buyCount;
 	private Integer lockDays;
 	private Integer discount;
-	private Integer memberLevel;
+	private Integer memberLevel = 0;
 	private String memberName;
 	//图标
 	private String icon;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java

@@ -16,6 +16,7 @@ import com.xxfc.platform.order.biz.OrderRefundBiz;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderCancelBiz;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderRefund;
@@ -155,10 +156,12 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         OrderRefundPriceVO orpv = new OrderRefundPriceVO();
         orpv.setRealAmount(orderPageVO.getRealAmount());
         orpv.setRefundAmount(totalRefundAmount);
-        if(totalDeductAmount.compareTo(BigDecimal.ZERO) > 0) {
-            orpv.setRefundDesc(StrUtil.format("本次取消操作需要扣除{}元违约金，实际退款金额为{}元，您确定要取消订单吗？", totalDeductAmount, totalRefundAmount));
+        if(orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_UNPAY.getCode())
+                || orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_CRT.getCode())
+                || totalDeductAmount.compareTo(BigDecimal.ZERO) <= 0) {
+            orpv.setRefundDesc("是否确定取消订单");
         }else {
-            orpv.setRefundDesc("取消操作可能会产生额外费用，是否确定取消订单");
+            orpv.setRefundDesc(StrUtil.format("本次取消操作需要扣除{}元违约金，实际退款金额为{}元，您确定要取消订单吗？", totalDeductAmount, totalRefundAmount));
         }
         return ObjectRestResponse.succ(orpv);
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -261,11 +261,15 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             //计算车辆费用
 
         //如果用户存在，并且为会员，并且车辆有优惠价
+        //默认折扣默认100
+        detail.setRebate(100);
         if(null != dto && SYS_TRUE.equals(dto.getIsMember()) && !NONE.getCode().equals(dto.getMemberLevel()) && !DISCOUNT_STATUS_NONE.equals(vehicleModel.getRentDiscountStatus())) {
             String[] prices = StrUtil.isBlank(vehicleModel.getRentDiscountPrice())
                     ?new String[]{vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString()}
                     :vehicleModel.getRentDiscountPrice().split(",");
             HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
+            handleDiscountDTO.setRebate(100);
+            handleDiscountDTO.setModelAmount(vehicleModel.getPrice());
             switch (MemberEnum.getByCode(dto.getMemberLevel())) {
                 case NORMAL:
                     handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, NORMAL);
@@ -279,6 +283,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
                     handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, DIAMOND);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                     break;
+                default:
+                    break;
             }
             detail.setRebate(handleDiscountDTO.getRebate());
             vehicleOrderItem.setUnitPrice(handleDiscountDTO.getModelAmount());