From 2c6f7f45af215479ebc0ffb19168dcbf30b56b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 30 Sep 2021 17:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/UploadDTO.java    | 31 +++++++++++++++++++
 .../esua/epdc/dao/ActivePointLogDao.java      |  2 +-
 .../impl/AcitveProductInfoServiceImpl.java    |  7 +++++
 .../impl/ActivePointLogServiceImpl.java       |  2 +-
 .../resources/mapper/ActivePointLogDao.xml    |  3 +-
 5 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/UploadDTO.java

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/UploadDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/UploadDTO.java
new file mode 100644
index 000000000..9326fb162
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/UploadDTO.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+/**
+ * 上传信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@Data
+public class UploadDTO {
+    /**
+     * 文件URL
+     */
+    private String url;
+
+    /**
+     * 文件大小，单位字节
+     */
+    private Long size;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
index 977ceee54..bc1f92cdc 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
@@ -63,7 +63,7 @@ public interface ActivePointLogDao extends BaseDao<ActivePointLogEntity> {
      * @author qushutong
      * @date 2021/9/28 10:46
      */
-    Integer selectDoubleTimeCount(String userId);
+    Integer selectDoubleTimeCount(PointLogFormDTO formDTO);
 
     /***
      * 判断是否签到
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 4ce2bc884..6a2b32ef9 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
@@ -266,18 +266,25 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
         acitveProductExchangeDTO.setProductName(acitveProductInfoEntity.getName());
         acitveProductExchangeDTO.setExchangeTime(new Date());
         acitveProductExchangeDTO.setExchangeState("0");
+
         acitveProductExchangeService.save(acitveProductExchangeDTO);
         // 根据核销兑换接口链接 生成核销二维码。
         String qrcodeUrl =null;
         try {
             String imageBase64 = QRCodeGenerator.createImage("https://epdc-shibei.elinkservice.cn/epdc-api/api/work/points/exchangedCheck?exchangeId=" + acitveProductExchangeDTO.getId());
+            imageBase64 = "data:image/png;base64,"+imageBase64;
             UploadFormDTO uploadFormDTO = new UploadFormDTO();
             uploadFormDTO.setBase64String(imageBase64);
             Result<String> upload = ossFeignClientFallback.upload(uploadFormDTO);
             qrcodeUrl= upload.getData();
+
         } catch (Exception e) {
             e.printStackTrace();
         }
+        // 更新二维码地址
+        acitveProductExchangeDTO.setQrCodeUrl(qrcodeUrl);
+        acitveProductExchangeService.update(acitveProductExchangeDTO);
+
         PointExchangeResultDTO pointExchangeResultDTO = new PointExchangeResultDTO();
         pointExchangeResultDTO.setSuccess(true);
         pointExchangeResultDTO.setMessage("兑换成功");
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
index 08ca6b53a..2b730d3f8 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
@@ -160,7 +160,7 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl<ActivePointLogDao
         // 签到积分加倍
         if (BehaviorEnum.POINTS_SIGN_RULES.getValue().equals(formDTO.getType())) {
             // 获取五天之内签到次数
-            int signCount = baseDao.selectDoubleTimeCount(formDTO.getUserId());
+            int signCount = baseDao.selectDoubleTimeCount(formDTO);
             if (signCount >= 5) {
                 // 开启加倍
                 points = Integer.parseInt(points) * 2 + "";
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
index 28bf1a616..48be5d7cd 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
@@ -78,7 +78,8 @@
                 '%Y%m%d'
             )
         AND pl.DEL_FLAG = '0'
-        AND pl.USER_ID = #{userId};
+        AND pl.USER_ID = #{userId}
+        AND pl.OPERATION_CODE = #{type}
     </select>
     <select id="selectIsSignIn" resultType="int">
         SELECT