From 2e384afb12cdc5fcfa7ee84551d56df57681ac15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Fri, 8 Oct 2021 10:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/AppUserServiceImpl.java  | 13 +++++++++----
 .../esua/epdc/service/impl/IssueServiceImpl.java    |  1 -
 .../service/impl/AcitveProductInfoServiceImpl.java  |  2 +-
 .../src/main/resources/application.yml              |  2 +-
 .../esua/epdc/service/impl/UserServiceImpl.java     |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index b0dba2ea3..6734fddc2 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -759,10 +759,15 @@ public class AppUserServiceImpl implements AppUserService {
         epdcAppUserRegisterFormDTO.setWxCode(formDto.getWxCode());
         Result<EpdcAppAuthorizationDTO> maV2Token = this.getMaV2Token(epdcAppUserRegisterFormDTO);
         // 注册埋点
-        PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
-        pointLogFormDTO.setType(BehaviorEnum.POINTS_REGISTER_RULES.getValue());
-        pointLogFormDTO.setUserId(maV2Token.getData().getUserId());
-        pointFeignClient.updataPoint(pointLogFormDTO);
+        if (maV2Token.success()) {
+            PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
+            pointLogFormDTO.setType(BehaviorEnum.POINTS_REGISTER_RULES.getValue());
+            pointLogFormDTO.setUserId(maV2Token.getData().getUserId());
+            pointFeignClient.updataPoint(pointLogFormDTO);
+        } else {
+            log.error("报错："+maV2Token.getMsg() + "-" + maV2Token.toString());
+        }
+
         return maV2Token;
     }
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
index d6469a6c6..2cd8432d9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
@@ -72,7 +72,6 @@ public class IssueServiceImpl implements IssueService {
         // 查询当前时间前10分钟内的数据
         Result<IssueDetailResultDTO> r = issueFeignClient.getIssueMaxNew(userIdDto);
         IssueDetailResultDTO d = r.getData();
-        System.out.println("内容："+ d.toString());
         if(d != null && !StringUtils.isBlank(d.getId())){
             return new Result().error("十分钟之内不能多次发起议题");
         }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
index 7e8214246..1d176c0ca 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
@@ -278,7 +278,7 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
         String qrcodeUrl =null;
         System.out.println("22222222222222222222");
         try {
-            String imageBase64 = QRCodeGenerator.createImage("https://epdc-shibei.elinkservice.cn/epdc-api/api/work/points/exchangedCheck?exchangeId=" + acitveProductExchangeDTO.getId());
+            String imageBase64 = QRCodeGenerator.createImage("https://epdc-shibei.elinkservice.cn/epdc-api/api/work/points/exchangedCheck?exchangeId=" + entity.getId());
             imageBase64 = "data:image/png;base64,"+imageBase64;
             UploadFormDTO uploadFormDTO = new UploadFormDTO();
             uploadFormDTO.setBase64String(imageBase64);
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml
index 25eddade2..698c0b941 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml
@@ -65,7 +65,7 @@ mybatis-plus:
     #数据库相关配置
     db-config:
       #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: ID_WORKER
+      id-type: UUID
       #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
       field-strategy: NOT_NULL
       #驼峰下划线转换
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 98cd1c7f1..18292df53 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1678,7 +1678,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         userEntity.setActivePoints(activePoints);
         baseDao.updateById(userEntity);
-        return new Result();
+        return new Result<Boolean>().ok(true);
     }
 
     @Override