Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/GroupBiz.java

@@ -131,23 +131,27 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
     @CacheClear(keys = {"permission:menu","permission:u","app:permission:u"})
     public void modifyAuthorityMenu(int groupId, String[] menus) {
         resourceAuthorityMapper.deleteByAuthorityIdAndResourceType(groupId + "", AdminCommonConstant.RESOURCE_TYPE_MENU);
-        List<Menu> menuList = menuMapper.selectAll();
-        Map<String, String> map = new HashMap<String, String>();
-        for (Menu menu : menuList) {
-            map.put(menu.getId().toString(), menu.getParentId().toString());
-        }
-        Set<String> relationMenus = new HashSet<String>();
-        relationMenus.addAll(Arrays.asList(menus));
-        ResourceAuthority authority = null;
-        for (String menuId : menus) {
-            findParentID(map, relationMenus, menuId);
-        }
-        for (String menuId : relationMenus) {
-            authority = new ResourceAuthority(AdminCommonConstant.AUTHORITY_TYPE_GROUP, AdminCommonConstant.RESOURCE_TYPE_MENU);
-            authority.setAuthorityId(groupId + "");
-            authority.setResourceId(menuId);
-            authority.setParentId("-1");
-            resourceAuthorityMapper.insertSelective(authority);
+        if (menus.length>0){
+            List<Menu> menuList = menuMapper.selectAll();
+            Map<String, String> map = new HashMap<String, String>();
+            for (Menu menu : menuList) {
+                map.put(menu.getId().toString(), menu.getParentId().toString());
+            }
+            Set<String> relationMenus = new HashSet<String>();
+            relationMenus.addAll(Arrays.asList(menus));
+            ResourceAuthority authority = null;
+            for (String menuId : menus) {
+                findParentID(map, relationMenus, menuId);
+            }
+
+            for (String menuId : relationMenus) {
+                authority = new ResourceAuthority(AdminCommonConstant.AUTHORITY_TYPE_GROUP, AdminCommonConstant.RESOURCE_TYPE_MENU);
+                authority.setAuthorityId(groupId + "");
+                authority.setResourceId(menuId);
+                authority.setParentId("-1");
+                resourceAuthorityMapper.insertSelective(authority);
+
+            }
         }
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/GroupController.java

@@ -73,11 +73,15 @@ public class GroupController extends BaseController<GroupBiz, Group> {
     @RequestMapping(value = "/{id}/authority/menu", method = RequestMethod.PUT)
     @ResponseBody
     public ObjectRestResponse modifyMenuAuthority(@PathVariable  int id, String menuTrees){
-        String [] menus = menuTrees.split(",");
+        String [] menus =new String[]{};
+        if (StringUtils.isNotBlank(menuTrees)){
+            menus= menuTrees.split(",");
+        }
         baseBiz.modifyAuthorityMenu(id, menus);
         return new ObjectRestResponse().rel(true);
     }
 
+
     @RequestMapping(value = "/{id}/authority/menu", method = RequestMethod.GET)
     @ResponseBody
     public ObjectRestResponse<List<AuthorityMenuTree>> getMenuAuthority(@PathVariable  int id){

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

@@ -252,31 +252,31 @@ public class BaseOrder implements Serializable {
 	@Column(name = "member_level")
 	private Integer memberLevel;
 
-	/**
-	 * 违约金
-	 */
-	@ApiModelProperty(value = "违约金")
-	@Column(name = "violate_amount")
-	BigDecimal ViolateAmount;
-
-	/**
-	 * 赔偿金
-	 */
-	@ApiModelProperty(value = "赔偿金")
-	@Column(name = "damages_amount")
-	BigDecimal damagesAmount;
-
-	/**
-	 * 额外费用
-	 */
-	@ApiModelProperty(value = "额外费用")
-	@Column(name = "extra_amount")
-	BigDecimal extraAmount;
-
-	/**
-	 * 返还的优惠券
-	 */
-	@ApiModelProperty(value = "返回的优惠券")
-	@Column(name = "back_coupon")
-	String backCoupon;
+//	/**
+//	 * 违约金
+//	 */
+//	@ApiModelProperty(value = "违约金")
+//	@Column(name = "violate_amount")
+//	BigDecimal ViolateAmount;
+//
+//	/**
+//	 * 赔偿金
+//	 */
+//	@ApiModelProperty(value = "赔偿金")
+//	@Column(name = "damages_amount")
+//	BigDecimal damagesAmount;
+//
+//	/**
+//	 * 额外费用
+//	 */
+//	@ApiModelProperty(value = "额外费用")
+//	@Column(name = "extra_amount")
+//	BigDecimal extraAmount;
+//
+//	/**
+//	 * 返还的优惠券
+//	 */
+//	@ApiModelProperty(value = "返回的优惠券")
+//	@Column(name = "back_coupon")
+//	String backCoupon;
 }

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

@@ -308,11 +308,11 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "fixed_loss_status")
 	private Integer fixedLossStatus;
 
-	/**
-	 * 返还的免费天数
-	 */
-	@ApiModelProperty(value = "返回的免费天数")
-	@Column(name = "back_free_days")
-	Integer backFreeDays;
+//	/**
+//	 * 返还的免费天数
+//	 */
+//	@ApiModelProperty(value = "返回的免费天数")
+//	@Column(name = "back_free_days")
+//	Integer backFreeDays;
 
 }

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

@@ -4,19 +4,15 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.xxfc.platform.activity.entity.Coupon;
-import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
-import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,9 +55,6 @@ public class OrderCancelBiz {
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
-    @Autowired
-    OrderCalculateBiz orderCalculateBiz;
-
     @Autowired
     UserFeign userFeign;
 
@@ -74,9 +67,6 @@ public class OrderCancelBiz {
     @Autowired
     ThirdFeign thirdFeign;
 
-    @Autowired
-    ActivityFeign activityFeign;
-
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();
@@ -120,47 +110,34 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
-                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
-                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
-                        setOrderId(baseOrder.getId());
-                    }});
-
                     //原退还押金
-                    Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
                     BigDecimal freeDayAmount = BigDecimal.ZERO;
+                    //判断是否使用免费天数，并且进行扣款
+                    if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                        OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                            setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                            setOrderId(baseOrder.getId());
+                        }});
+                        freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+                    }
 
 
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                    if(timeLag < 0 ) {
-                        //计算：使用天数 当前时间 - 开始时间的0时0分0秒
-                        Long useTimeLag = System.currentTimeMillis() - orvd.getStartTime();
-                        Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
-                        orderCalculateBiz.inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
-
-                    }else {
-                        //没到出车时间
-                        //判断是否使用免费天数，并且进行扣款
-                        if(freeDays > 0) {
-                            freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-
-                            //违约金封顶 租车身份价 * 2天
-                            BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal("2"));
-                            if(freeDayAmount.compareTo(topAmount) > 0) {
-                                freeDayAmount = freeDayAmount;
-                            }
-                        }
-                    }
-
-
+                    //后面允许开始时间过后可以取消订单
+//                    if(timeLag < 0) {
+//                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
+//                            add("已超过出发时间，不能取消订单");
+//                        }});
+//                    }
 
                     //退款流程
-                        //退订单款
+                    //退订单款
                     orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
 
-                        //退押金
+                    //退押金
                     orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
 
                     //已付款的取消订单发送消息
@@ -186,9 +163,6 @@ public class OrderCancelBiz {
                     }
                     //退款流程
                     orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ key);
-
-                    //站点总人数减少
-                    tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
                 }
             }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java

@@ -248,7 +248,7 @@ public class SmsService {
 
                 }
 
-                if (i>3){
+                if (i>2){
                     jsonParams.put(param+(i+2),para);
                 }else {
                     jsonParams.put(param+(i+1),para);

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

@@ -327,7 +327,7 @@
 
     <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultMap="searchBookRecord">
         select v1.* from vehicle_book_record v1
-         where v1.vehicle_id = #{vehicleId} and v1.book_end_date >= #{time} and v1.status BETWEEN 1 and 2
+         where v1.vehicle_id = #{vehicleId} and v1.book_end_date > #{time} and v1.status BETWEEN 1 and 2
     </select>
 
     <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">