From f1f2a3d0fef682feb1c3f8f28339f5c91f2af921 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Sep 2021 11:09:02 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=94=9F=E6=88=90=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot-incoming-payment/pom.xml            | 11 +++-
 .../controller/PayMeetingController.java      |  9 ++++
 .../impl/PayMeetingSituationServiceImpl.java  |  3 +-
 .../main/java/com/jero/util/QrcodeUtil.java   | 52 +++++++++++++++++++
 4 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/util/QrcodeUtil.java

diff --git a/jero-boot-incoming-payment/pom.xml b/jero-boot-incoming-payment/pom.xml
index bd3249df..a8b99383 100644
--- a/jero-boot-incoming-payment/pom.xml
+++ b/jero-boot-incoming-payment/pom.xml
@@ -33,7 +33,16 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.3.0</version>
+        </dependency>
         <!-- 如果需要微服务版本，则以上API注释，释放该API
         <dependency>
             <groupId>com.jero.boot</groupId>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 184407d8..cdadec19 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -31,6 +31,8 @@ import com.jero.meeting.vo.WorkingGroupMeetingExel;
 import com.jero.modules.system.volid.group.UpdateGroup;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.service.IPayWorkingGroupService;
+import com.jero.util.QrcodeUtil;
+import io.swagger.annotations.ApiImplicitParam;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.springframework.beans.BeanUtils;
@@ -329,4 +331,11 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         return Result.OK();
     }
 
+    @ApiOperation(value = "生成base64")
+    @GetMapping(value = "/createBase64")
+    @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query")
+    public Result<String> createBase64(String contact) {
+        return Result.OK(QrcodeUtil.create(contact));
+    }
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 784999f5..09634b9b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -240,11 +240,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 			payMeetingSituation1.setPayMode(payMode);
 			//缴费方式为打包时，不处理邮寄联系人和地址
 			if (payMode.equals(MeetingSubitemCommon.PAY_MODE_PACK)) {
-				ValidUtil.validate(commonPeopleVO, NotPack.class);
+				ValidUtil.validate(commonPeopleVO);
 				//存入打包字段
 				payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
 				payMeetingSituation1.setAmountReceivable(new BigDecimal(0));
 			} else {
+				ValidUtil.validate(commonPeopleVO, NotPack.class);
 
 				payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
 				payMeetingSituation1.setPaymentRecord(payMeetingSituation.getPaymentRecord());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/QrcodeUtil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/QrcodeUtil.java
new file mode 100644
index 00000000..c039da3d
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/QrcodeUtil.java
@@ -0,0 +1,52 @@
+package com.jero.util;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.client.j2se.MatrixToImageConfig;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.jero.common.exception.JeroBootException;
+import org.checkerframework.checker.units.qual.K;
+
+import java.io.ByteArrayOutputStream;
+import java.util.Base64;
+
+/**
+ * 生成二维码base64工具类
+ * @author liJiaRao
+ * @date 2021-07-15 10:15
+ */
+public class QrcodeUtil {
+    /**
+     * 蓝色
+     */
+    public static final int BLUE = 0xFF23CEFD;
+    /**
+     * 蓝色
+     */
+    public static final int BLACK = 0xFF000000;
+    /**
+     * 白色透明
+     */
+    public static final int OFF_COLOR = 0x00FFFFFF;
+    /**
+     *  转换url为二维码base64
+     * @param content 要转换的url
+     * @return base64 data:image/png;base64,
+     */
+    public static String create(String content){
+        try {
+            QRCodeWriter qrCodeWriter = new QRCodeWriter();
+            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, 600, 600);
+
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream, new MatrixToImageConfig(BLACK,OFF_COLOR));
+
+            Base64.Encoder encoder = Base64.getEncoder();
+
+            return "data:image/png;base64,"+encoder.encodeToString(outputStream.toByteArray());
+        }catch (Exception e){
+            throw new JeroBootException("生成二维码失败");
+        }
+    }
+}