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

ace-common/pom.xml

@@ -38,6 +38,10 @@
             <artifactId>spring-cloud-sleuth-zipkin</artifactId>
             <version>2.1.0.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/IntegralRule.java

@@ -138,6 +138,6 @@ public class IntegralRule{
     private String btnWord;
 
     @Transient
-    private Boolean integralStatus;
+    private Boolean integralStatus = false;
 
 }
\ No newline at end of file

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

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.entity.IntegralUserStatus;
 import com.xxfc.platform.activity.mapper.IntegralUserStatusMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,6 +15,7 @@ import java.util.TimeZone;
 
 @Service
 @Transactional
+@Slf4j
 public class IntegralUserStatusBiz extends BaseBiz<IntegralUserStatusMapper, IntegralUserStatus> {
 
     public ObjectRestResponse save(IntegralUserStatus integralUserStatus) {
@@ -32,11 +34,13 @@ public class IntegralUserStatusBiz extends BaseBiz<IntegralUserStatusMapper, Int
         if(!StringUtils.isAllBlank(code, userId + "")) {
             long current = System.currentTimeMillis();
             long startTime = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+
             IntegralUserStatus integralUserStatus = new IntegralUserStatus();
             integralUserStatus.setIntegralRuleCode(code);
             integralUserStatus.setUserId(userId);
             integralUserStatus.setStartTime(startTime);
             integralUserStatus.setEndTime(startTime  + 24 * 60 * 60 * 1000 - 1);
+            log.info("获取用户积分状态：" + integralUserStatus.toString());
             return mapper.selectByUserAndCode(integralUserStatus);
         }
         return null;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderVehicleCrosstownController.java

 package com.xxfc.platform.order.rest;
 
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.user.UserInfoBiz;
@@ -50,8 +51,11 @@ public class OrderVehicleCrosstownController {
     public ObjectRestResponse<List<OrderVehicleCrosstownDto>> getByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
         if (userDTO == null) {
+            AppUserDTO appUserDTO = userInfoBiz.getUserInfo();
+            if(appUserDTO == null) {
                 return ObjectRestResponse.createFailedResult(508, "token is null or invalid");
             }
+        }
         if (orderVehicleCrosstownDto == null) {
             return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
         }