Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.task.TaskExecutor;
@@ -146,14 +147,14 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                 if (freeDays > 0 && freeDays >= days) {
                     freeDays = freeDays - days;
                     baseUserMember.setRentFreeDays(freeDays);
-                    }
-                    Integer payCount = userMemberVo.getPayCount() == null ? 0 : userMemberVo.getPayCount();
+                }
+                Integer payCount = userMemberVo.getPayCount() == null ? 0 : userMemberVo.getPayCount();
                    /* if (days > 0) {
                         payCount = payCount + 1;
                     }*/
-                    baseUserMember.setPayCount(payCount);
-                    getMyBiz().updateSelectiveById(baseUserMember);
-                    num = freeDays;
+                baseUserMember.setPayCount(payCount);
+                getMyBiz().updateSelectiveById(baseUserMember);
+                num = freeDays;
             } else if (type == 2) {
                     /*Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount();
                     payCount=payCount+1;
@@ -220,15 +221,14 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                 WeekendSqls.<BaseUserMember>custom()
                         .andEqualTo(BaseUserMember::getUserId, baseUserMemberVO.getUserId())
         ).build();
-
         List<BaseUserMember> baseUserMembers = mapper.selectByExample(exa);
-
         BaseUserMember baseUserMember = new BaseUserMember();
         BeanUtilsBean.getInstance().copyProperties(baseUserMember, baseUserMemberVO);
 
-        if (baseUserMembers == null || baseUserMembers.size() == 0) {
-
-            if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null) return;
+        if (CollectionUtils.isEmpty(baseUserMembers)) {
+            if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null||baseUserMember.getValidTime()<0) {
+                throw new BaseException("设置无效!无会员等级、会员有效期或会员有效期为负数!");
+            }
             baseUserMember.setCrtTime(System.currentTimeMillis());
             baseUserMember.setIsDel(0);
             baseUserMember.setPayCount(0);
@@ -238,21 +238,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             baseUserMember.setBuyCount(buyCount + 1);
             insertSelective(baseUserMember);
             return;
-
         } else if (baseUserMembers.size() == 1) {
-            if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null) {
-                baseUserMember.setTotalNumber(0);
-                baseUserMember.setRentFreeDays(0);
-            } else {
-            }
             baseUserMember.setUpdTime(System.currentTimeMillis());
             baseUserMember.setBuyCount(baseUserMembers.get(0).getBuyCount() + 1);
             baseUserMember.setId(baseUserMembers.get(0).getId());
             mapper.updateByPrimaryKeySelective(baseUserMember);
-
-
         } else {
-            throw new BaseException("Member purchase repeat!");
+            throw new BaseException("错误!该账号有多条会员信息!");
         }
 
 

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

@@ -32,6 +32,19 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
 
 
 
+//    /**
+//     * 设置用户会员
+//     * @param userMemberDTO
+//     * @return
+//     */
+//    @PutMapping("/setUserMember")
+//    public ObjectRestResponse UpdateUserMember(@RequestBody BaseUserMemberVO baseUserMemberVO)
+//            throws Exception {
+//        baseBiz.UpdateUserMember(baseUserMemberVO);
+//        return ObjectRestResponse.succ();
+//    }
+
+
     /**
      * 设置用户会员
      * @param userMemberDTO

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

@@ -243,7 +243,7 @@ public class OrderMsgBiz {
                     }
                     break;
                 case TOUR:
-                    CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
+                    CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(otd.getStartCompanyId()).getData();
                     sms2AppUser(startCompanyDetailTour, null, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_F, smsParams);
                     break;
                 case MEMBER:

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -168,4 +168,13 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
+
+//	@Column(name = "status")
+//	@ApiModelProperty(value = "状态 0--下架；1--上架")
+//	private String status;
+
+//	@Column(name = "cover_pic")
+//	@ApiModelProperty(value = "封面图")
+//	private String coverPic;
+
 }

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

@@ -110,7 +110,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
      * @param id
      * @return
      */
-    @Cache(key = RedisKey.BRANCH_COMPANY_CACHE)
+    @Cache(key = RedisKey.BRANCH_COMPANY_CACHE+ "{1}")
     public CompanyDetail getDetailById(Integer id) {
         BranchCompany branchCompany = this.getById(id);
         CompanyDetail detail = null;

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

@@ -1127,10 +1127,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
 
-        //筛选出查询条件所在月份
-        Set<String> allYearMonth = new HashSet<>();//记录所有年月
-        Map<String,List<String>> yearMonthAndDate = new HashMap<>();//预定年月 - 预定日期列表
-        Map<String,List<String>> yearMonthAndDateNotBooked = new HashMap<>();//未预定年月 - 未预定日期列表
+        //筛选出查询条件所在月份 如 想预定 8月29 ~ 9月 4日
+        Set<String> allYearMonth = new HashSet<>();//记录所有年月 "2019-08","2019-09"
+        Map<String,List<String>> yearMonthAndDate = new HashMap<>();//需比较已预定的年月 - 预定日期列表 为空（拒绝 预约记录时用到）
+        Map<String,List<String>> yearMonthAndDateNotBooked = new HashMap<>();//需比较未预定的年月 - 未预定日期列表 "2019-08-29"...."2019-09-04",
         classifyByYearMonth(notBookedDates,yearMonthAndDateNotBooked,allYearMonth);
         if(allYearMonth.size()>MAX_MONTH_COUNT_BOOKED_INFO_QUERY){
             throw  new CustomIllegalParamException(" only 3 month can be included <bookedInfo> param.");

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

@@ -54,7 +54,7 @@ public class VehicleCataBiz extends BaseBiz<VehicleCataMapper, VehicleCata> {
     }
 
 
-    public void inserts(ArrayList<com.xxfc.platform.vehicle.entity.VehicleCata> vcs) {
+    public void inserts(ArrayList<VehicleCata> vcs) {
         mapper.addCataList(vcs);
     }
 

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

@@ -475,7 +475,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param isMore
      * @return
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse setIsore(Integer id, Integer isMore) {
         VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
         vehiclePlatCata.setId(id);