Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -63,6 +63,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
     private static final String CAMPSITE_CACHE = "campsite_cache:";
     private static final String CAMSITE_DETAIL_CACHE="campsite:detail:cache:";
     private static final String CAMPSITE_CACHE_ALL = "all";
+    private static final long  CAMPSITE_EXPIRE_TIME=6000;
 
     /**
      * 根据店铺类型查找列表

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -61,5 +61,4 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
         return getBaseBiz().getAllByHome(page,limit);
     }
 
-
 }
\ No newline at end of file

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

@@ -176,12 +176,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 setCancelReason(baseOrder.getCancelReason());
                 setVersion(baseOrder.getVersion());
             }};
-            int updateResult = this.updateSelectiveByIdRe(updateOrder);
-
-            //如果取消失败，则抛异常
-            if(updateResult <= 0) {
-                throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
-            }
+            BaseOrder hasUpdateOrder = this.updateSelectiveByIdReT(updateOrder);
 
             //触发退款流程
                 //判断是否已支付
@@ -193,14 +188,14 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     }});
 
                     //退款流程
-                    rentRefundProcess(baseOrder, orvd.getDeposit(), orvd.getStartTime(), APP_ORDER+ "_"+ RENT_REFUND);
+                    rentRefundProcess(hasUpdateOrder, orvd.getDeposit(), orvd.getStartTime(), APP_ORDER+ "_"+ RENT_REFUND);
 
                 }else if (OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
                     OrderTourDetail otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                         setOrderId(baseOrder.getId());
                     }});
                         //退款流程
-                    rentRefundProcess(baseOrder, otd.getStartTime(), APP_ORDER+ "_"+ TOUR_REFUND);
+                    rentRefundProcess(hasUpdateOrder, otd.getStartTime(), APP_ORDER+ "_"+ TOUR_REFUND);
                 }
             }
 
@@ -324,8 +319,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         //更新订单的退款状态和退款时间
         if(SYS_TRUE.equals(flag) && null != refundStatus) {
             updateSelectiveByIdReT(new BaseOrder(){{
+                setId(baseOrder.getId());
                 setRefundStatus(refundStatus);
                 setRefundTime(System.currentTimeMillis());
+                setVersion(baseOrder.getVersion());
             }});
         }
     }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/SysRegionBiz.java

@@ -148,7 +148,7 @@ public class SysRegionBiz extends BaseBiz<SysRegionMapper, SysRegion> {
     /**
      * 5分钟内刷新数据到缓存
      */
-    @Scheduled(cron = "0 */5 * * * *")//每5分钟刷新一次数据
+    //@Scheduled(cron = "0 */5 * * * *")//每5分钟刷新一次数据
     public void  refreshCache(){
 
         String redisLockKey = RedisKey.SYS_REGION_REFRESH_LOCK +(DateTime.now().getMinuteOfDay()/5);//同一日每5分钟只刷新一次