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

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

@@ -75,8 +75,8 @@ public class ActivityAttendanceRecordBiz extends BaseBiz<ActivityAttendanceRecor
             activityAttendanceRecord.setPositionName(appUserDTO.getPositionName());
             activityAttendanceRecord.setCrtTime(new Date());
             mapper.insertSelective(activityAttendanceRecord);
-            String onlineKey = String.format("%d:%d:%d", appUserDTO.getUserid(), activityId, PrizeTypeEnum.ONLINE.getCode());
-            String localeKey = String.format("%d:%d:%d", appUserDTO.getUserid(), activityId, PrizeTypeEnum.LOCALE.getCode());
+            String onlineKey = String.format("%s%d:%d:%d", ActivityPrizeBiz.USER_LOTTERY_PRE_KEY,appUserDTO.getUserid(), activityId, PrizeTypeEnum.ONLINE.getCode());
+            String localeKey = String.format("%s%d:%d:%d",ActivityPrizeBiz.USER_LOTTERY_PRE_KEY,appUserDTO.getUserid(), activityId, PrizeTypeEnum.LOCALE.getCode());
             redisTemplate.delete(Arrays.asList(onlineKey,localeKey));
             valueOperations.set(onlineKey, 1L,expirDays, TimeUnit.DAYS);
             valueOperations.set(localeKey, 1L,expirDays, TimeUnit.DAYS);
@@ -123,7 +123,7 @@ public class ActivityAttendanceRecordBiz extends BaseBiz<ActivityAttendanceRecor
      }
 
     public Boolean hasNumberOfLuckyDrawByType(Integer activityId, Integer prizeType, Integer userid) {
-        Object lotteryNum = valueOperations.get(String.format("%d:%d:%d", userid, activityId, prizeType));
+        Object lotteryNum = valueOperations.get(String.format("%s%d:%d:%d",ActivityPrizeBiz.USER_LOTTERY_PRE_KEY,userid, activityId, prizeType));
         if (lotteryNum!=null){
             return  Integer.valueOf(lotteryNum.toString()) >0;
         }
@@ -135,11 +135,11 @@ public class ActivityAttendanceRecordBiz extends BaseBiz<ActivityAttendanceRecor
             return false;
         }
         if (prizeType == PrizeTypeEnum.ONLINE.getCode()){
-             valueOperations.set(String.format("%d:%d:%d", userid, activityId, prizeType),activityAttendanceRecord.getOnlineLotteryNum(),expirDays, TimeUnit.DAYS);
+             valueOperations.set(String.format("%s%d:%d:%d",ActivityPrizeBiz.USER_LOTTERY_PRE_KEY, userid, activityId, prizeType),activityAttendanceRecord.getOnlineLotteryNum(),expirDays, TimeUnit.DAYS);
             return activityAttendanceRecord.getOnlineLotteryNum()>0;
         }
         if (prizeType ==PrizeTypeEnum.LOCALE.getCode()){
-            valueOperations.set(String.format("%d:%d:%d", userid, activityId, prizeType),activityAttendanceRecord.getLocaleLotteryNum(),expirDays, TimeUnit.DAYS);
+            valueOperations.set(String.format("%s%d:%d:%d",ActivityPrizeBiz.USER_LOTTERY_PRE_KEY,userid, activityId, prizeType),activityAttendanceRecord.getLocaleLotteryNum(),expirDays, TimeUnit.DAYS);
             return activityAttendanceRecord.getLocaleLotteryNum()>0;
         }
         return false;

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

@@ -59,6 +59,7 @@ public class ActivityPrizeBiz extends BaseBiz<ActivityPrizeMapper, ActivityPrize
     @Value("${lottery.expire.days:60}")
     private int expirDays;
     private static final String LOTTERY_PRE_KEY = "lottery:";
+    public static final String USER_LOTTERY_PRE_KEY = "user:lottery:";
 
     /**
      * 查询奖品
@@ -151,7 +152,7 @@ public class ActivityPrizeBiz extends BaseBiz<ActivityPrizeMapper, ActivityPrize
             activityPrize.setSerialNumber(8);
             return activityPrize;
         });
-        String lotteryNumKey = String.format("%d:%d:%d", appUserDTO.getUserid(), activityId, prizeType);
+        String lotteryNumKey = String.format("%s%d:%d:%d",USER_LOTTERY_PRE_KEY, appUserDTO.getUserid(), activityId, prizeType);
         Object lotteryNum = valueOperations.get(lotteryNumKey);
         boolean hasLotteryNum = lotteryNum == null ? activityAttendanceRecordBiz.hasNumberOfLuckyDrawByType(activityId, prizeType, appUserDTO.getUserid()) : ((Integer) lotteryNum) > 0;
         if (hasLotteryNum) {
@@ -187,15 +188,19 @@ public class ActivityPrizeBiz extends BaseBiz<ActivityPrizeMapper, ActivityPrize
             activityWinningRecord.setPrizeType(prizeType);
             activityWinningRecord.setUserId(appUserDTO.getUserid());
             activityWinningRecord.setHasWinning(0);
-            boolean hasStock = activityPrize.getPrizeGoodsType() != PrizeGoodsTypeEnum.NO_PRIZE.getCode() && activityPrize.getTotalStock() != 0 && prizeStock != null && (Integer) prizeStock != 0;
+            boolean hasStock = activityPrize.getPrizeGoodsType() != PrizeGoodsTypeEnum.NO_PRIZE.getCode()
+                    && activityPrize.getTotalStock() != null
+                    && activityPrize.getTotalStock()!=0
+                    && prizeStock != null
+                    && (Integer) prizeStock != 0;
             if (hasStock) {
-                String key = String.format("%s%d:%d:%d", LOTTERY_PRE_KEY, activityId, prizeType, activityPrize.getSerialNumber());
-                RLock rLock = redissonLock.getRLock(key);
+                String lockKey = String.format("%s%d:%d:%d", LOTTERY_PRE_KEY, activityId, prizeType, activityPrize.getSerialNumber());
+                RLock rLock = redissonLock.getRLock(lockKey);
                 try {
                     boolean isSuccess = rLock.tryLock(1, 2, TimeUnit.SECONDS);
                     if (isSuccess) {
                         prizeStock = valueOperations.get(prizeStockKey);
-                        log.info("tryLock success, key = [{}]", key);
+                        log.info("tryLock success, key = [{}]", lockKey);
                         try {
                             if (prizeStock != null && (Integer) prizeStock > 0) {
                                 //更新库存
@@ -214,11 +219,11 @@ public class ActivityPrizeBiz extends BaseBiz<ActivityPrizeMapper, ActivityPrize
                             rLock.unlock();
                         } finally {
                             rLock.unlock();
-                            log.info("releaseLock success, key = [{}]", key);
+                            log.info("releaseLock success, key = [{}]", lockKey);
                         }
                     } else {
                         // 获取锁失败
-                        log.info("tryLock fail, key = [{}]", key);
+                        log.info("tryLock fail, key = [{}]", lockKey);
                     }
                 } catch (InterruptedException e) {
                     e.printStackTrace();

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -327,7 +327,7 @@
         (
         (
         orv.start_time > #{startTime}
-        AND orv.start_time < #{startTime}
+        AND orv.start_time < #{endTime}
         AND orv.end_time > #{endTime}
         )
         OR (
@@ -336,7 +336,7 @@
         )
         OR (
         orv.start_time < #{startTime}
-        AND orv.end_time > #{endTime}
+        AND orv.end_time > #{startTime}
         AND orv.end_time < #{endTime}
         )
         OR (

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

 package com.xxfc.platform.vehicle.rest;
 
+import com.alibaba.fastjson.JSONArray;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -170,8 +171,8 @@ public class VehicleDepartureController {
     @GetMapping("findReserveType")
     public ObjectRestResponse<OrderPageVO> getOrderDetail() {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        String reserveType = dictionaryMap.get(VEHICE_ORDER + "_" + RESERVE).getName();
-        return ObjectRestResponse.succ(reserveType);
+        String reserveType = dictionaryMap.get(VEHICE_ORDER + "_" + RESERVE).getDetail();
+        return ObjectRestResponse.succ(JSONArray.parse(reserveType));
     }
 
 

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

@@ -595,12 +595,12 @@
         SELECT
         b.id AS companyId,
         DATE_FORMAT(
-        DATE_SUB(NOW(), INTERVAL 1 DAY),
+        NOW(),
         '%Y'
         ) AS countYear,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%m') AS countMonth,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%u') AS countWeek,
-        DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%Y-%m-%d') AS countDate,
+        DATE_FORMAT(NOW(), '%m') AS countMonth,
+        DATE_FORMAT(NOW(), '%u') AS countWeek,
+        DATE_FORMAT(NOW(), '%Y-%m-%d') AS countDate,
         count(*) AS vehicleNum
         FROM
         vehicle v