Merge remote-tracking branch 'origin/holiday-price' into holiday-price

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderItem.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import javax.persistence.*;
 
@@ -146,6 +147,20 @@ public class OrderItem implements Serializable {
 		return calculateAmount;
 	}
 
+	public BigDecimal calculateVehicleUnitPrice(BigDecimal vehicleAmount, BigDecimal metaVehicleAmount, Boolean isSetRealAmount) {
+		BigDecimal unitPrice = vehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
+		BigDecimal metaUnitPrice = metaVehicleAmount.divide(new BigDecimal(getCalculateNum()+ ""), 2, RoundingMode.HALF_UP);
+
+		if(isSetRealAmount) {
+			setRealAmount(vehicleAmount);
+		}
+
+		setUnitPrice(unitPrice);
+		setMetaUnitPrice(metaUnitPrice);
+
+		return unitPrice;
+	}
+
 	public BigDecimal getBuyAmount() {
 		return getUnitPrice().multiply(new BigDecimal(getBuyNum() + ""));
 	}

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

@@ -190,8 +190,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      */
     public void refundSubProcess(BaseOrder baseOrder, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, Integer refundType, Integer refundStatus, OrderAccountDetail oad) {
         String refundTradeNo = null;
-        //0 小于 退款金额
-        if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
+        //退款金额 = 0 不退款，把refundTradeNo设置为 -1
+        if(BigDecimal.ZERO.compareTo(refundAmount) == 0) {
+            refundTradeNo = "-1";
+        }else if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
             OrderRefundVo orv = new OrderRefundVo();
             orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
             orv.setOrderNo(baseOrder.getNo());

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

@@ -328,6 +328,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         //查询列表数据
         Query query = baseOrderBiz.initQuery(dto.getNo());
         query.put("crtUser", null);
+        query.put("userId", null);
         PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         OrderPageVO orderPageVO = page.getData().get(0);
         if(null == orderPageVO) {

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

@@ -75,7 +75,7 @@ public class OrderRentVehicleController extends CommonBaseController {
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 //设置-1表示查询所有的车
-                bo.setUseType(-1);
+                //bo.setUseType(-1);
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

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

@@ -102,7 +102,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         //设置订单状态为3
         bo.getOrder().setStatus(OrderStatusEnum.ORDER_UNPAY.getCode());
         //设置订单图片
-        bo.getOrder().setPicture(bo.getBaseUserMemberLevel().getIcon());
+        bo.getOrder().setPicture(bo.getBaseUserMemberLevel().getItemImg());
         //设置订单名称
         bo.getOrder().setName(bo.getBaseUserMemberLevel().getName());
 

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

@@ -27,7 +27,6 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
-import com.xxfc.platform.order.pojo.order.OrderItemDetailDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
@@ -222,6 +221,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         BigDecimal orderAmount = BigDecimal.ZERO;
         BigDecimal goodsAmount = BigDecimal.ZERO;
         BigDecimal vehicleAmount = BigDecimal.ZERO;
+        BigDecimal metaVehicleAmount = BigDecimal.ZERO;
         BigDecimal driverAmount = BigDecimal.ZERO;
         BigDecimal damageSafeAmount = BigDecimal.ZERO;
         BigDecimal couponAmount = BigDecimal.ZERO;
@@ -241,7 +241,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
 
         //设置Item
-        OrderItem vehicleOrderItem = orderItemBiz.initOrderItem(vehicleModel.getPrice(), detail.getDayNum(), vehicleModel.getName(), vehicleModel.getId(), ItemTypeEnum.VEHICLE_MODEL);
+        OrderItem vehicleOrderItem = orderItemBiz.initOrderItem(vehicleModel.getPrice(), detail.getDayNum(), vehicleModel.getName(), vehicleModel.getId(), ItemTypeEnum.VEHICLE_MODEL, JSONUtil.parseArray(vmcpds).toString());
         OrderItem driverOrderItem = orderItemBiz.initOrderItem(DRIVER_PRICE, detail.getDayNum(), "平台司机", null, ItemTypeEnum.DRIVER);
         OrderItem damageSafeOrderItem = orderItemBiz.initOrderItem(DAMAGE_SAFE, detail.getDayNum(), "免赔费用", null, ItemTypeEnum.DAMAGE_SAFE);
 
@@ -286,27 +286,37 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             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);
-                    detail.getOrder().setHasMemberRight(SYS_TRUE);
-                break;
-                case GOLD:
-                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, GOLD);
-                    detail.getOrder().setHasMemberRight(SYS_TRUE);
-                    break;
-                case DIAMOND:
-                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, DIAMOND);
-                    detail.getOrder().setHasMemberRight(SYS_TRUE);
-                    break;
-                default:
-                    break;
+//            HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
+//            handleDiscountDTO.setRebate(100);
+//            handleDiscountDTO.setModelAmount(vehicleModel.getPrice());
+//            switch (MemberEnum.getByCode(dto.getMemberLevel())) {
+//                case NORMAL:
+//                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, NORMAL);
+//                    detail.getOrder().setHasMemberRight(SYS_TRUE);
+//                break;
+//                case GOLD:
+//                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, GOLD);
+//                    detail.getOrder().setHasMemberRight(SYS_TRUE);
+//                    break;
+//                case DIAMOND:
+//                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, DIAMOND);
+//                    detail.getOrder().setHasMemberRight(SYS_TRUE);
+//                    break;
+//                default:
+//                    break;
+//            }
+            detail.setRebate(dto.getDiscount());
+//            vehicleOrderItem.setUnitPrice(handleDiscountDTO.getModelAmount());
+        }
+
+        //计算价格
+        if(vehicleDayNum > 0) {
+            for(int i = cutDayNum; i < vmcpds.size(); i++) {
+                vehicleAmount.add(vmcpds.get(i).getPrice());
+                metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
             }
-            detail.setRebate(handleDiscountDTO.getRebate());
-            vehicleOrderItem.setUnitPrice(handleDiscountDTO.getModelAmount());
+        }else {
+            vehicleOrderItem.setUnitPrice(BigDecimal.ZERO);
         }
 
         //如果有使用会员权益或者优惠券，则设置订单已优惠
@@ -314,8 +324,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             detail.getOrder().setHasDiscount(SYS_TRUE);
         }
 
-        //单价 * （购买天数 - 减免天数）
-        vehicleAmount = vehicleAmount.add(vehicleOrderItem.getCalculateAmount(Boolean.TRUE));
+        //平均单价 = 总价 / 实际消费天数
+        vehicleOrderItem.calculateVehicleUnitPrice(vehicleAmount, metaVehicleAmount, Boolean.TRUE);
 
         if(DRIVER_TYPE_COMPANY.equals(detail.getDriverType())) {
             //计算司机费用

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/GwTourController.java

@@ -4,12 +4,17 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.tour.entity.TourTag;
 import com.xxfc.platform.tour.feign.TourFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("app/unauth/tour")
 @Slf4j
@@ -47,8 +52,9 @@ public class GwTourController extends CommonBaseController {
     @GetMapping("/tagList")
     @IgnoreUserToken
     public ObjectRestResponse getTagList(@RequestParam(value = "isHot", defaultValue = "0") Integer isHot) {
-
-        return ObjectRestResponse.succ(tourFeign.tagList(isHot));
+        List<TourTag> tourTags = tourFeign.tagList(isHot);
+        tourTags = tourTags.stream().filter(x -> !x.getName().contains("全部")).sorted(Comparator.comparing(TourTag::getRank)).collect(Collectors.toList());
+        return ObjectRestResponse.succ(tourTags);
     }
 
 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/MemberLevelController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/17 9:37
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/member_level/app/unauth")
+public class MemberLevelController {
+
+     private final UserFeign userFeign;
+     @GetMapping("/list")
+     public ObjectRestResponse<BaseUserMemberLevel> listMemberLevels(){
+          List<BaseUserMemberLevel> levels = userFeign.levels();
+          return ObjectRestResponse.succ(levels);
+     }
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1209,7 +1209,15 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public PageDataVO<UsableVehicleModelVO> searchUsableModel(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params);
+            initBookSearchParam(dto, params, Boolean.TRUE);
+        }
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+    }
+
+    public PageDataVO<UsableVehicleModelVO> searchUsableModelBackStage(UsableVeicleDTO dto) {
+        Map<String, Object> params = BeanUtil.beanToMap(dto);
+        if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
+            initBookSearchParam(dto, params, Boolean.FALSE);
         }
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
@@ -1220,14 +1228,17 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 
-    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params) {
+    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getStartDate()) &&
                 StringUtils.isNotBlank(dto.getEndDate())) {
-//            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
-//                    dto.getEndDate());
+            if(needDateExtend) {
                 notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
                         dto.getEndDateExtend());
+            }else {
+                notBookedDates = convertDatePeriod2List(dto.getStartDate(),
+                    dto.getEndDate());
+            }
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -142,8 +142,8 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         }
         //设置显示是否有车
         dto.setYearNo4Where(Boolean.TRUE);
-        dto.setUseType(null);
-        return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
+        //dto.setUseType(null);
+        return ObjectRestResponse.succ(vehicleBiz.searchUsableModelBackStage(dto));
     }
 
     /**

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -91,6 +91,6 @@
         <if test="cityCode != null">
            AND  `addr_city`=#{cityCode}
         </if>
-        ) AS `cb` ON cb.id = bc.company_base_id
+        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY `id`
     </select>
 </mapper>
\ No newline at end of file