修改优惠券和会员bug

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

@@ -14,12 +14,10 @@ public class AddRentVehicleDTO{
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
     //开始时间
-    @Column(name = "start_time")
     @ApiModelProperty(value = "开始时间")
     private Long startTime;
 
     //结束时间
-    @Column(name = "end_time")
     @ApiModelProperty(value = "结束时间")
     private Long endTime;
 
@@ -36,12 +34,10 @@ public class AddRentVehicleDTO{
     private String bookEndDate;
 
     //天数
-    @Column(name = "day_num")
     @ApiModelProperty(value = "天数")
     private Integer dayNum;
 
     //取车地点
-    @Column(name = "start_addr")
     @ApiModelProperty(value = "取车地点")
     private String startAddr;
 
@@ -51,7 +47,6 @@ public class AddRentVehicleDTO{
     private String endAddr;
 
     //取车城市编号
-    @Column(name = "start_city")
     @ApiModelProperty(value = "取车城市编号")
     private Integer startCity;
 
@@ -61,7 +56,6 @@ public class AddRentVehicleDTO{
     private Integer endCity;
 
     //取车城市名称
-    @Column(name = "start_city_name")
     @ApiModelProperty(value = "取车城市名称")
     private String startCityName;
 
@@ -71,30 +65,34 @@ public class AddRentVehicleDTO{
     private String endCityName;
 
     //司机类型 1--公司司机；2--自己司机
-    @Column(name = "driver_type")
     @ApiModelProperty(value = "司机类型 1--公司司机；2--自己司机")
     private Integer driverType;
 
     //自己司机ids
-    @Column(name = "my_driver_ids")
     @ApiModelProperty(value = "自己司机ids")
     private String myDriverIds;
 
     //出发公司Id
-    @Column(name = "start_company_id")
     @ApiModelProperty(value = "出发公司Id")
     private Integer startCompanyId;
 
     //结束公司Id
-    @Column(name = "end_company_id")
     @ApiModelProperty(value = "结束公司Id")
     private Integer endCompanyId;
 
     //车型id
-    @Column(name = "model_id")
     @ApiModelProperty(value = "车型id")
     private Integer modelId;
 
+    //车型id
+    @ApiModelProperty(value = "是否购买免赔")
+    private Integer damageSafe;
+
+    /**
+     * 是否使用出租免费天数
+     */
+    private Integer rentFreeDay;
+
     public void setStartTime(Long startTime) {
         this.startTime = startTime;
         this.bookStartDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startTime), ZoneOffset.ofHours(8)));

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

@@ -129,12 +129,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
      */
     public void cancel(BaseOrder baseOrder) {
         if(cancelAble.get(baseOrder.getType()).contains(baseOrder.getStatus())) {
-            int updateResult = this.updateSelectiveByIdRe(new BaseOrder(){{
+            BaseOrder updateOrder = new BaseOrder(){{
                 setId(baseOrder.getId());
                 setStatus(OrderStatusEnum.ORDER_CANCEL.getCode());
                 setCancelReason(baseOrder.getCancelReason());
                 setVersion(baseOrder.getVersion());
-            }});
+            }};
+            int updateResult = this.updateSelectiveByIdRe(updateOrder);
 
             //如果取消失败，则抛异常
             if(updateResult <= 0) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitConsumer.java

@@ -56,7 +56,7 @@ public class RabbitConsumer {
              * 其中的参数如果为true是把消息退回到queue但是有可能被其它的consumer(集群)接收到，
              * 设置为false是只补发给当前的consumer
              */
-            channel.basicRecover(false);
+            channel.basicRecover(true);
         }
     }
 }

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

@@ -38,7 +38,7 @@ public class OrderTourVerificationController extends CommonBaseController {
     @Autowired
     UserFeign userFeign;
 
-    public UserDTO getUserInfo(){ return   userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();}
+    public UserDTO getUserInfo(){ return userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();}
 
     @RequestMapping(value = "/verification/orderlist",method = RequestMethod.GET)
     @ApiOperation(value = "旅游核销订单列表")

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

@@ -87,31 +87,12 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         detail.setOrderId(detail.getOrder().getId());
         detailBiz.insertSelective(detail);
         detail.getOrder().setDetailId(detail.getId());
-        baseOrderBiz.updateSelectiveById(detail.getOrder());
+        int updateResult =baseOrderBiz.updateSelectiveByIdRe(detail.getOrder());
+        if(updateResult > 0) {
+            detail.getOrder().setVersion(detail.getOrder().getVersion() + 1);
+        }
     }
 
-//    /**
-//     * 创建订单及其多子项
-//     * @param details
-//     */
-//    public void createOrder(List<Detail> details) {
-//        BaseOrder order = createOrder();
-//        for(Detail detail : details) {
-//            preHandleDetail(order, detail);
-//        }
-//        handleDetail(details);
-//    }
-//
-//    /**
-//     * 处理订单多子项
-//     * @param details
-//     */
-//    public void handleDetail(List<Detail> details){
-//        for(Detail detail : details) {
-//            detailBiz.insertSelective(detail);
-//        }
-//    }
-
     /**
      * 计算价格
      * @param detail

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

@@ -92,7 +92,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         super.handleDetail(bo);
 
         //发送定时取消订单(30分钟)
-        rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 30);
+        //rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 30);
+        rabbitProduct.sendDelayMessage(bo.getOrder(), 100L * 6 * 3);
     }
 
     @Override
@@ -136,7 +137,7 @@ 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(",");
-            switch (MemberEnum.getByCode(detail.getAppUserDTO().getIsMember())) {
+            switch (MemberEnum.getByCode(detail.getAppUserDTO().getMemberLevel())) {
                 case NORMAL:
                     modelAmount = handleDiscount(vehicleModel, prices, NORMAL);
                 break;
@@ -199,7 +200,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     private BigDecimal handleDiscount(VehicleModel vehicleModel, String[] prices, MemberEnum memberEnum) {
         BigDecimal modelAmount;//会员比例
         if(DISCOUNT_STATUS_MEMBER.equals(vehicleModel.getRentDiscountStatus())) {
-            modelAmount = new BigDecimal(String.valueOf((memberEnum.getPercent()/100))).multiply(vehicleModel.getPrice());
+            modelAmount = new BigDecimal(String.valueOf((memberEnum.getPercent()/100d))).multiply(vehicleModel.getPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
         }else {
             //会员固定价列表
             modelAmount = new BigDecimal(prices[(memberEnum.getCode() - 1)]);
@@ -220,7 +221,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             childrenStr.append(",${tem_0104}");
         }
         if(childrenStr.length() > 0){
-            childrenStr.deleteCharAt(1);
+            childrenStr.deleteCharAt(0);
         }
         return childrenStr.toString();
     }
@@ -242,6 +243,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     private void acquireVehicle(RentVehicleBO detail) {
         //根据车型、时间、距离，门店，预定车辆
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
+        rentVehicleBookDTO.setModelId(detail.getModelId());
         rentVehicleBookDTO.setUserName(BaseContextHandler.getName());
         ObjectRestResponse<VehicleBookRecord> orr = vehicleFeign.rentApplyVehicle(rentVehicleBookDTO);
         detail.setVehicleId(orr.getData().getVehicleId());

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

@@ -209,11 +209,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
             childrenStr.append(",${tem_0203}");
         }
 
-        String str = childrenStr.toString();
-        if(str.length() > 0) {
-            str = str.substring(1, str.length());
+        if(childrenStr.length() > 0){
+            childrenStr.deleteCharAt(0);
         }
-        return str;
+        return childrenStr.toString();
     }
 
     /**

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

@@ -66,7 +66,7 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
-        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id	58	left join branch_company bc on v.`subordinate_branch` = bc.id
+        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         where
         v.is_del=0

xx-vehicle/xx-vehicle-server/src/test/java/com/xxfc/platform/vehicle/RegionTest.java

@@ -59,6 +59,8 @@ public class RegionTest {
     public class NewData{
         Long id;
         String name;
+        String lat;
+        String lon;
     }
 
     @Data
@@ -131,34 +133,34 @@ public class RegionTest {
         System.out.println("test");
     }
 
-    @Test
-    public  void test1() {
-        int i = DateTime.now().getMinuteOfDay() / 5;
-        System.out.println("DateTime.now().getMinuteOfDay() / 5++++++++++++"+i);
-        String redisLockKey = RedisKey.SYS_REGION_REFRESH_LOCK +i;//同一日每5分钟只刷新一次
-        System.out.println("redisLockKey++++++++++++++++"+redisLockKey);
-        String s = String.valueOf(DateTime.now().getMillis());
-        System.out.println("s++++++++++++++++++"+s);
-        Boolean suc = customRedisTemplate.opsForValue().setIfAbsent(redisLockKey, s);
-        Boolean test1 = customRedisTemplate.opsForValue().setIfAbsent("1", "2");
-        Boolean test2 = customRedisTemplate.opsForValue().setIfAbsent("1", "3");
-        System.out.println("test1///////////////////////////////"+test1);
-        System.out.println("test2///////////////////////////////"+test2);
-        System.out.println("suc++++++++++++++++++++"+suc);
-    }
-
-    @Test
-    public  void testRedis() {
-        SysRegion sysRegion = getSysRegion(1);
-        System.out.println("sysRegion+++++++++"+sysRegion);
-        System.out.println("TEST_REDIS_KEY+++++++++++" + TEST_REDIS_KEY);
-    }
-
-    @Cache(key = TEST_REDIS_KEY)
-    private SysRegion getSysRegion(int id){
-        SysRegion sysRegion = sysRegionBiz.selectById(2);
-        return sysRegion;
-    }
+//    @Test
+//    public  void test1() {
+//        int i = DateTime.now().getMinuteOfDay() / 5;
+//        System.out.println("DateTime.now().getMinuteOfDay() / 5++++++++++++"+i);
+//        String redisLockKey = RedisKey.SYS_REGION_REFRESH_LOCK +i;//同一日每5分钟只刷新一次
+//        System.out.println("redisLockKey++++++++++++++++"+redisLockKey);
+//        String s = String.valueOf(DateTime.now().getMillis());
+//        System.out.println("s++++++++++++++++++"+s);
+//        Boolean suc = customRedisTemplate.opsForValue().setIfAbsent(redisLockKey, s);
+//        Boolean test1 = customRedisTemplate.opsForValue().setIfAbsent("1", "2");
+//        Boolean test2 = customRedisTemplate.opsForValue().setIfAbsent("1", "3");
+//        System.out.println("test1///////////////////////////////"+test1);
+//        System.out.println("test2///////////////////////////////"+test2);
+//        System.out.println("suc++++++++++++++++++++"+suc);
+//    }
+//
+//    @Test
+//    public  void testRedis() {
+//        SysRegion sysRegion = getSysRegion(1);
+//        System.out.println("sysRegion+++++++++"+sysRegion);
+//        System.out.println("TEST_REDIS_KEY+++++++++++" + TEST_REDIS_KEY);
+//    }
+//
+//    @Cache(key = TEST_REDIS_KEY)
+//    private SysRegion getSysRegion(int id){
+//        SysRegion sysRegion = sysRegionBiz.selectById(2);
+//        return sysRegion;
+//    }
 
 
 }