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

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -91,6 +91,26 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             log.error(userId+"----已领优惠卷");
             return null;
         }
+        falg=checkLed(userId,couponId,coupon.getLimitCollar(),coupon.getQuota());
+        if(falg){
+            log.error(userId+"----已超过领取限制");
+            return null;
+        }
+        return  led(coupon,userId);
+    }
+
+    //后台领劵(一个劵可以发多张)
+    public String adminUserLedCoupon(Integer userId,Integer couponId){
+        Coupon coupon=couponBiz.selectById(couponId);
+        if (coupon==null||coupon.getIsDel()!=0||coupon.getStatus()!=1){
+            log.error(userId+"----无可领取优惠卷");
+            return null;
+        }
+        boolean falg=checkLed(userId,couponId,coupon.getLimitCollar(),coupon.getQuota());
+        if(falg){
+            log.error(userId+"----已超过领取限制");
+            return null;
+        }
         return  led(coupon,userId);
     }
 
@@ -123,7 +143,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
     //检查用户是否领卷
     public  boolean checkUserLed(Integer userId,Integer id){
         Example example=new Example(UserCoupon.class);
-        example.createCriteria().andEqualTo("userId",userId).andEqualTo("couponId",id);
+        example.createCriteria().andEqualTo("userId",userId).andEqualTo("couponId",id).andEqualTo("isDel",0);
         List<UserCoupon> list=selectByExample(example);
         if(list.size()>0){
             log.error(userId+"----已领优惠卷");
@@ -132,6 +152,31 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         return false;
     }
 
+    //检查用户是否可领卷
+    public  boolean checkLed(Integer userId,Integer id,Integer limitCollar,Integer quota){
+        Example example=new Example(UserCoupon.class);
+        example.createCriteria().andEqualTo("userId",userId).andEqualTo("couponId",id).andEqualTo("isDel",0);
+        Integer num=selectCountByExample(example);
+        log.info("-用户已领劵--userId==="+userId+"----num==="+num+"----couponid==="+id);
+        if(num==null||num==0){
+            log.error(userId+"----无领此优惠卷----couponid==="+id);
+            return  false;
+        }
+        if (limitCollar==null||num>=limitCollar){
+            log.error(userId+"----此优惠卷超过每人限领次数----couponid==="+id+"----limitCollar==="+limitCollar);
+            return  true;
+        }
+        example.clear();
+        example.createCriteria().andEqualTo("couponId",id).andEqualTo("isDel",0);
+        num=selectCountByExample(example);
+        log.info("---发劵数量----num==="+num+"----limitCollar==="+limitCollar+"----quota==="+quota+"----couponid==="+id);
+        if (quota==null||quota==0||(num!=null&&num>0&&num>=quota)){
+            log.error(userId+"----此优惠卷超过发券数量----couponid==="+id+"----quota==="+quota);
+            return  true;
+        }
+        return false;
+    }
+
     //获取我的优惠卷
     public ObjectRestResponse getCouponList(Integer userId,int type,Integer channel,BigDecimal amout){
         if (userId==null||userId==0){
@@ -206,7 +251,6 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         result.put("array",array);
         return  ObjectRestResponse.succ(result);
     }
-
     //获取我的优惠卷
     public ObjectRestResponse getUserCouponList(Integer userId,int type,Integer channel,BigDecimal amout) {
         if (userId == null || userId == 0) {
@@ -378,16 +422,17 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         UserCoupon userCoupon;
         List<UserCoupon> userCoupons = new ArrayList<>();
         for (int i=0;i<userCouponSendDTO.getCouponNum();i++){
-            userCoupon = new UserCoupon();
+            /*userCoupon = new UserCoupon();
             userCoupon.setCouponId(userCouponSendDTO.getCouponId());
             userCoupon.setUserId(appUserLogin.getId());
             userCoupon.setCrtTime(Instant.now().toEpochMilli());
             userCoupon.setStartTime(couponVo.getValidStartTime());
             userCoupon.setExpireTime(couponVo.getValidEndTime());
             userCoupon.setTickerNo(Snowflake.build()+"");
-            userCoupons.add(userCoupon);
+            userCoupons.add(userCoupon);*/
+            adminUserLedCoupon(appUserLogin.getId(),userCouponSendDTO.getCouponId());
         }
-        return mapper.inserBatch(userCoupons);
+        return 1;
     }
 
     public long importUserCoupon(Integer couponId,List<String[]> userCounponData) {
@@ -426,6 +471,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         UserCoupon userCoupon=new UserCoupon();
         userCoupon.setUserId(userId);
         userCoupon.setIsUse(0);
+        userCoupon.setIsDel(0);
         Long couponNumber=selectCount(userCoupon);
         userInfoDTO.setCouponNumber(couponNumber);
         return  userInfoDTO;

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

@@ -531,7 +531,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){//已经被预定
             //当天已经被预定检查小时是否也被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
-        } else if ((vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
+        } else if (vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null &&(vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
         }
         return Boolean.TRUE;

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

@@ -588,7 +588,7 @@
             <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
                 hasVehicle desc,
             </if>
-            distance asc
+            distance asc, model_id asc
         </if>
     </select>