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

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/AccessGatewayFilter.java

@@ -329,10 +329,16 @@ public class AccessGatewayFilter implements GlobalFilter {
             if (null != method) {
                 log.info("=================请求方法:" + method.name());
             }
+            request.getHeaders().add("uuid", UUID.randomUUID().toString());
             // 记录头部信息
             builder.append(", header { ");
             for (Map.Entry<String, List<String>> entry : request.getHeaders().entrySet()) {
                 builder.append(entry.getKey()).append(":").append(StringUtils.join(entry.getValue(), ",")).append(",");
+                if("uuid".equals(entry.getKey())) {
+                    if(entry.getValue() != null && entry.getValue().size() > 0) {
+                        log.info("=================请求方法uuid:" + entry.getValue().get(0));
+                    }
+                }
                 if("Authorization".equals(entry.getKey())) {
                     if(entry.getValue() != null && entry.getValue().size() > 0) {
                         getAdminUserInfo(entry.getValue().get(0));

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

@@ -340,7 +340,11 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         IntegralUserTotal integralUserTotal=new  IntegralUserTotal();
         integralUserTotal.setUserId(userId);
         integralUserTotal=integralUserTotalBiz.selectOne(integralUserTotal);
-        BeanUtils.copyProperties(integralUserTotal,userInfoDTO);
+        if (integralUserTotal!=null){
+            BeanUtils.copyProperties(integralUserTotal,userInfoDTO);
+        }else {
+            userInfoDTO.setTotalPoint(0);
+        }
         UserCoupon userCoupon=new UserCoupon();
         userCoupon.setUserId(userId);
         userCoupon.setIsUse(0);