修改二维码尺寸生成逻辑、修复扫码后金额为哦的问题

soss-admin/src/main/java/com/soss/web/controller/coffee/ApplicationController.java

@@ -74,7 +74,11 @@ public class ApplicationController {
         Integer screenNo = redisJson.getInteger("screenNo");
         Machine machine = machineService.selectMachineByCode(machineCode);
         Shop shop = shopService.selectShopById(machine.getShopId());
+        try {
             shop.setDistance(DistanceUtil.getDistanceDesc(Double.parseDouble(shop.getLng()), Double.parseDouble(shop.getLat()), Double.parseDouble(location.getString("lng")), Double.parseDouble(location.getString("lat"))));
+        } catch (NumberFormatException e) {
+            shop.setDistance("-1");
+        }
         redisJson.put("shop", shop);
         //推送数据给安卓
         JSONObject jgBody = new JSONObject();

soss-common/src/main/java/com/soss/common/utils/QRCodeUtil.java

@@ -2,199 +2,100 @@ package com.soss.common.utils;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.soss.common.utils.sign.Base64;
 
 import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
 import java.awt.*;
-import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.HashMap;
+import java.util.Hashtable;
 
 public class QRCodeUtil {
-    /**
-     * 默认宽度
-     */
-    private static final Integer WIDTH = 140;
-    /**
-     * 默认高度
-     */
-    private static final Integer HEIGHT = 140;
-
-    /**
-     * LOGO 默认宽度
-     */
-    private static final Integer LOGO_WIDTH = 22;
-    /**
-     * LOGO 默认高度
-     */
-    private static final Integer LOGO_HEIGHT = 22;
-
-    /**
-     * 图片格式
-     */
-    private static final String IMAGE_FORMAT = "png";
-    private static final String CHARSET = "utf-8";
-    /**
-     * 原生转码前面没有 data:image/png;base64 这些字段，返回给前端是无法被解析
-     */
-    private static final String BASE64_IMAGE = "data:image/png;base64,%s";
-
-    /**
-     * 生成二维码，使用默认尺寸
-     *
-     * @param content 内容
-     * @return
-     */
-    public static String getBase64QRCode(String content) {
-        return getBase64Image(content, WIDTH, HEIGHT, null, null, null);
-    }
-
-    /**
-     * 生成二维码，使用默认尺寸二维码，插入默认尺寸logo
-     *
-     * @param content 内容
-     * @param logoUrl logo地址
-     * @return
-     */
-    public static String getBase64QRCode(String content, String logoUrl) {
-        return getBase64Image(content, WIDTH, HEIGHT, logoUrl, LOGO_WIDTH, LOGO_HEIGHT);
-    }
+    private static int onColor = 0xFF000000;     //前景色
+    private static int offColor = 0xFFFFFFFF;    //背景色
+    private static int margin = 1;               //白边大小，取值范围0~4
+    private static ErrorCorrectionLevel level = ErrorCorrectionLevel.L;  //二维码容错率
 
     /**
      * 生成二维码
      *
-     * @param content    内容
-     * @param width      二维码宽度
-     * @param height     二维码高度
-     * @param logoUrl    logo 在线地址
-     * @param logoWidth  logo 宽度
-     * @param logoHeight logo 高度
-     * @return
+     * @param content //二维码内容
      */
-    public static String getBase64QRCode(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) {
-        return getBase64Image(content, width, height, logoUrl, logoWidth, logoHeight);
-    }
-
-    private static String getBase64Image(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        BufferedImage bufferedImage = crateQRCode(content, width, height, logoUrl, logoWidth, logoHeight);
+    public static void generateQRImage(String content, String format, ByteArrayOutputStream byteArrayOutputStream, int width, int height) {
+        Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
+        // 指定纠错等级
+        hints.put(EncodeHintType.ERROR_CORRECTION, level);
+        // 指定编码格式
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+        hints.put(EncodeHintType.MARGIN, margin);   //设置白边
         try {
-            ImageIO.write(bufferedImage, IMAGE_FORMAT, os);
-        } catch (IOException e) {
+            BitMatrix bitMatrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints);
+            bitMatrix = deleteWhite(bitMatrix);
+            BufferedImage image = toBufferedImage(bitMatrix);
+            // MatrixToImageWriter.writeToStream(bitMatrix, format, byteArrayOutputStream, config);
+            ImageIO.write(image, format, byteArrayOutputStream); //生成二维码图片
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        // 转出即可直接使用
-        return String.format(BASE64_IMAGE, Base64.encode(os.toByteArray()));
     }
 
-
     /**
-     * 生成二维码
-     *
-     * @param content    内容
-     * @param width      二维码宽度
-     * @param height     二维码高度
-     * @param logoUrl    logo 在线地址
-     * @param logoWidth  logo 宽度
-     * @param logoHeight logo 高度
-     * @return
+     * @param matrix                二维码矩阵相关
+     * @param format                二维码图片格式
+     * @param byteArrayOutputStream 二维码图片文件字节流
+     * @param logoPath              logo路径
+     * @throws IOException
      */
-    private static BufferedImage crateQRCode(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) {
-        if (StringUtils.isNotBlank(content)) {
-            ServletOutputStream stream = null;
-            HashMap<EncodeHintType, Comparable> hints = new HashMap<>(4);
-            // 指定字符编码为utf-8
-            hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
-            // 指定二维码的纠错等级为中级
-            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
-            // 设置图片的边距
-            hints.put(EncodeHintType.MARGIN, 2);
-            try {
-                QRCodeWriter writer = new QRCodeWriter();
-                BitMatrix bitMatrix = writer.encode(content, BarcodeFormat.QR_CODE, width, height, hints);
-                BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+    public static void writeToFile(BitMatrix matrix, String format, ByteArrayOutputStream byteArrayOutputStream, String logoPath) throws IOException {
+        BufferedImage image = toBufferedImage(matrix);
+        //载入logo
+        if (StringUtils.isNotEmpty(logoPath)) {
+            int ratioWidth = image.getWidth() * 2 / 10;
+            int ratioHeight = image.getHeight() * 2 / 10;
+            Image img = ImageIO.read(new File(logoPath));
+            int logoWidth = img.getWidth(null) > ratioWidth ? ratioWidth : img.getWidth(null);
+            int logoHeight = img.getHeight(null) > ratioHeight ? ratioHeight : img.getHeight(null);
+            int x = (image.getWidth() - logoWidth) / 2;
+            int y = (image.getHeight() - logoHeight) / 2;
+
+            Graphics2D gs = image.createGraphics();
+            gs.drawImage(img, x, y, logoWidth, logoHeight, null);
+            gs.setColor(Color.black);
+            gs.setBackground(Color.WHITE);
+            gs.dispose();
+            img.flush();
+        }
+        ImageIO.write(image, format, byteArrayOutputStream); //生成二维码图片
+    }
+
+    public static BufferedImage toBufferedImage(BitMatrix matrix) {
+        int width = matrix.getWidth();
+        int height = matrix.getHeight();
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
         for (int x = 0; x < width; x++) {
             for (int y = 0; y < height; y++) {
-                        bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);
-                    }
-                }
-                if (StringUtils.isNotBlank(logoUrl)) {
-                    insertLogo(bufferedImage, width, height, logoUrl, logoWidth, logoHeight);
-                }
-                return bufferedImage;
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                if (stream != null) {
-                    try {
-                        stream.flush();
-                        stream.close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
+                image.setRGB(x, y, matrix.get(x, y) ? onColor : offColor);
             }
         }
-            }
-        }
-        return null;
+        return image;
     }
 
-    /**
-     * 二维码插入logo
-     *
-     * @param source     二维码
-     * @param width      二维码宽度
-     * @param height     二维码高度
-     * @param logoUrl    logo 在线地址
-     * @param logoWidth  logo 宽度
-     * @param logoHeight logo 高度
-     * @throws Exception
-     */
-    private static void insertLogo(BufferedImage source, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) throws Exception {
-        // logo 源可为 File/InputStream/URL
-        Image src = ImageIO.read(new URL(logoUrl));
-        // 插入LOGO
-        Graphics2D graph = source.createGraphics();
-        int x = (width - logoWidth) / 2;
-        int y = (height - logoHeight) / 2;
-        graph.drawImage(src, x, y, logoWidth, logoHeight, null);
-        Shape shape = new RoundRectangle2D.Float(x, y, logoWidth, logoHeight, 6, 6);
-        graph.setStroke(new BasicStroke(3f));
-        graph.draw(shape);
-        graph.dispose();
+    public static BitMatrix deleteWhite(BitMatrix matrix) {
+        int[] rec = matrix.getEnclosingRectangle();
+        int resWidth = rec[2] + 1;
+        int resHeight = rec[3] + 1;
+        BitMatrix resMatrix = new BitMatrix(resWidth, resHeight);
+        resMatrix.clear();
+        for (int i = 0; i < resWidth; i++) {
+            for (int j = 0; j < resHeight; j++) {
+                if (matrix.get(i + rec[0], j + rec[1]))
+                    resMatrix.set(i, j);
             }
-
-
-    /**
-     * 获取二维码
-     *
-     * @param content 内容
-     * @param output  输出流
-     * @throws IOException
-     */
-    public static void getQRCode(String content, OutputStream output) throws IOException {
-        BufferedImage image = crateQRCode(content, WIDTH, HEIGHT, null, null, null);
-        ImageIO.write(image, IMAGE_FORMAT, output);
         }
-
-    /**
-     * 获取二维码
-     *
-     * @param content 内容
-     * @param logoUrl logo资源
-     * @param output  输出流
-     * @throws Exception
-     */
-    public static void getQRCode(String content, String logoUrl, OutputStream output) throws Exception {
-        BufferedImage image = crateQRCode(content, WIDTH, HEIGHT, logoUrl, LOGO_WIDTH, LOGO_HEIGHT);
-        ImageIO.write(image, IMAGE_FORMAT, output);
+        return resMatrix;
     }
-
 }
\ No newline at end of file

soss-framework/src/main/java/com/soss/framework/web/service/WeixinServiceImpl.java

@@ -12,16 +12,13 @@ import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.wxpay.sdk.WXPayUtil;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
 import com.soss.common.core.domain.entity.SysUser;
 import com.soss.common.core.domain.model.LoginUser;
 import com.soss.common.enums.RefundState;
 import com.soss.common.enums.ShopState;
 import com.soss.common.exception.ServiceException;
+import com.soss.common.utils.QRCodeUtil;
 import com.soss.common.utils.StringUtils;
 import com.soss.common.utils.ip.IpUtils;
 import com.soss.common.utils.sign.Base64;
@@ -57,6 +54,8 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
+import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -65,6 +64,7 @@ import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
 import java.security.spec.AlgorithmParameterSpec;
+import java.util.List;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
@@ -390,17 +390,6 @@ public class WeixinServiceImpl  {
 
         //获取商户订单号
         String orderNo = notifyMap.get("out_trade_no");
-        Order order = new Order();
-        order.setOrderNo(orderNo);
-        List<Order> orders = orderService.selectOrderList(order);
-        if(orders.isEmpty()){
-            returnMap.put("return_code", "FAIL");
-            returnMap.put("return_msg", "没有该订单");
-            String returnXml = WXPayUtil.mapToXml(returnMap);
-            return returnXml;
-
-        }
-        order = orders.get(0);
         //并校验返回的订单金额是否与商户侧的订单金额一致
 //        if (order1 != null && order1.get() != Long.parseLong(notifyMap.get("total_fee"))) {
 //            log.error("金额校验失败");
@@ -412,11 +401,21 @@ public class WeixinServiceImpl  {
 //        }
 
         //处理订单
-        if(lock.tryLock()){
+        if(lock.tryLock()) {
+            Order order = new Order();
+            order.setOrderNo(orderNo);
+            List<Order> orders = orderService.selectOrderList(order);
+            if (orders.isEmpty()) {
+                returnMap.put("return_code", "FAIL");
+                returnMap.put("return_msg", "没有该订单");
+                return WXPayUtil.mapToXml(returnMap);
+            }
+            order = orders.get(0);
             try {
                 //处理重复的通知
                 //接口调用的幂等性：无论接口被调用多少次，产生的结果是一致的。
-                String orderStatus =order.getState();
+                String orderStatus = order.getState();
+                log.info("order current status: {}", orderStatus);
                 if (OrderStatusConstant.Unpaid.equals(orderStatus)) {
                     //更新订单状态
                     order.setPayTime(new Date());
@@ -801,20 +800,15 @@ public class WeixinServiceImpl  {
     }
 
     public String generateMiniQr(String content) {
-        QRCodeWriter qrCodeWriter = new QRCodeWriter();
-        // 解决中文乱码
-        HashMap<EncodeHintType, Object> hints = new HashMap<>(16);
-        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
         String fileName = System.currentTimeMillis() + ".png";
         try {
             String[] qrSizeArr = qrSize.split("\\*");
             int width = Integer.parseInt(qrSizeArr[0]);
             int height = Integer.parseInt(qrSizeArr[1]);
             log.info("qr with: {} height: {}", width, height);
-            BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, width, height, hints);
-            bitMatrix = deleteWhite(bitMatrix);
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            MatrixToImageWriter.writeToStream(bitMatrix, "PNG", byteArrayOutputStream);
+            QRCodeUtil.generateQRImage(content, "PNG", byteArrayOutputStream, width, height);
+            // MatrixToImageWriter.writeToStream(bitMatrix, "PNG", byteArrayOutputStream);
             return ossFileService.uploadFile(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()), fileName);
         } catch (Exception e) {
             log.error("生成二维码失败：{}", e.getMessage(), e);
@@ -823,6 +817,17 @@ public class WeixinServiceImpl  {
     }
 
     /**
+     * 图片放大缩小
+     */
+    public static BufferedImage zoomInImage(BufferedImage originalImage, int width, int height) {
+        BufferedImage newImage = new BufferedImage(width, height, originalImage.getType());
+        Graphics g = newImage.getGraphics();
+        g.drawImage(originalImage, 0, 0, width, height, null);
+        g.dispose();
+        return newImage;
+    }
+
+    /**
      * 删除白边
      */
     private BitMatrix deleteWhite(BitMatrix matrix) {