二维码格式由png改为svg

soss-common/pom.xml

@@ -134,7 +134,11 @@
             <artifactId>javase</artifactId>
             <version>3.3.3</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.jfree</groupId>
+            <artifactId>jfreesvg</artifactId>
+            <version>3.4</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

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

@@ -2,105 +2,67 @@ package com.soss.common.utils;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
-import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.jfree.graphics2d.svg.SVGGraphics2D;
+import org.jfree.graphics2d.svg.ViewBox;
 
-import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
 import java.util.Hashtable;
 
 public class QRCodeUtil {
-    private static int onColor = 0xFF000000;     //前景色
-    private static int offColor = 0xFFFFFFFF;    //背景色
-    private static int margin = 0;               //白边大小，取值范围0~4
-    private static ErrorCorrectionLevel level = ErrorCorrectionLevel.L;  //二维码容错率
 
-    /**
-     * 生成二维码
-     *
-     * @param content //二维码内容
-     */
-    public static void generateQRImage(String content, String format, ByteArrayOutputStream byteArrayOutputStream, int width, int height) {
+    public static void main(String[] args) {
+        String qrCodeSvg = getQRCodeSvg("www.google.com", 200, 200, false);
+        System.out.println(qrCodeSvg);
+    }
+
+    public static BufferedImage getQRCode(String targetUrl, int width, int height) {
         Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
         // 指定纠错等级
-        hints.put(EncodeHintType.ERROR_CORRECTION, level);
+        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L);
         // 指定编码格式
         hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
-        hints.put(EncodeHintType.MARGIN, margin);   //设置白边
+        hints.put(EncodeHintType.MARGIN, 0);   //设置白边
+        QRCodeWriter qrCodeWriter = new QRCodeWriter();
         try {
-            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); //生成二维码图片
-//            ImageIO.write(image, format, new File("C:\\Users\\caiyo\\Desktop\\test.png")); //生成二维码图片
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+            BitMatrix byteMatrix = qrCodeWriter.encode(targetUrl, BarcodeFormat.QR_CODE, width, height, hints);
+            int crunchifyWidth = byteMatrix.getWidth();
+            int crunchifyHeight = byteMatrix.getHeight();
 
-    public static void main(String[] args) {
-        generateQRImage("test", "PNG", null, 151, 151);
-    }
+            BufferedImage image = new BufferedImage(crunchifyWidth, crunchifyHeight, BufferedImage.TYPE_INT_RGB);
+            image.createGraphics();
 
-    /**
-     * @param matrix                二维码矩阵相关
-     * @param format                二维码图片格式
-     * @param byteArrayOutputStream 二维码图片文件字节流
-     * @param logoPath              logo路径
-     * @throws IOException
-     */
-    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 graphics = (Graphics2D) image.getGraphics();
+            graphics.setColor(Color.WHITE);
+            graphics.fillRect(0, 0, crunchifyWidth, crunchifyHeight);
+            graphics.setColor(Color.BLACK);
 
-            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); //生成二维码图片
+            for (int i = 0; i < crunchifyWidth; i++) {
+                for (int j = 0; j < crunchifyHeight; j++) {
+                    if (byteMatrix.get(i, j)) {
+                        graphics.fillRect(i, j, 1, 1);
                     }
-
-    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++) {
-                image.setRGB(x, y, matrix.get(x, y) ? onColor : offColor);
                 }
             }
             return image;
+        } catch (WriterException e) {
+            throw new RuntimeException("Error getting QR Code");
         }
-
-    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);
     }
+
+    public static String getQRCodeSvg(String targetUrl, int width, int height, boolean withViewBox) {
+        SVGGraphics2D g2 = new SVGGraphics2D(width, height);
+        BufferedImage qrCodeImage = getQRCode(targetUrl, width, height);
+        g2.drawImage(qrCodeImage, 0, 0, width, height, null);
+
+        ViewBox viewBox = null;
+        if (withViewBox) {
+            viewBox = new ViewBox(0, 0, width, height);
         }
-        return resMatrix;
+        return g2.getSVGElement(null, true, viewBox, null, null);
     }
 }
\ No newline at end of file

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

@@ -12,25 +12,23 @@ 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;
+import com.soss.common.utils.sign.Md5Utils;
 import com.soss.system.constants.OrderStatusConstant;
 import com.soss.system.domain.*;
 import com.soss.system.mapper.CustomerMapper;
 import com.soss.system.mapper.OrderDetailMapper;
 import com.soss.system.mapper.OrderRefundMapper;
 import com.soss.system.mapper.ShopMapper;
+import com.soss.system.service.impl.AppServiceImpl;
 import com.soss.system.service.impl.OrderOperationLogServiceImpl;
 import com.soss.system.service.impl.OrderServiceImpl;
 import com.soss.system.utils.DistanceUtil;
@@ -58,8 +56,6 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.InetAddress;
@@ -514,7 +510,18 @@ public class WeixinServiceImpl  {
         jsonObject.put("orderId", order.getId());
         jsonObject.put("userId", order.getUserId());
         jsonObject.put("secret", uid);
-        return generateMiniQr(jsonObject.toJSONString() + "###");
+
+        String[] qrSizeArr = qrSize.split("\\*");
+        int width = Integer.parseInt(qrSizeArr[0]);
+        int height = Integer.parseInt(qrSizeArr[1]);
+
+        String content = jsonObject.toJSONString() + "###";
+        String qrCode = QRCodeUtil.getQRCodeSvg(content, width, height, false);
+        String qrCodeKey = Md5Utils.hash(qrCode);
+        stringRedisTemplate.opsForValue().set(qrCodeKey, qrCode);
+        stringRedisTemplate.expire(qrCodeKey, 1, TimeUnit.DAYS);
+
+        return qrCodeKey;
     }
 
     /**
@@ -625,9 +632,9 @@ public class WeixinServiceImpl  {
         return WxPayNotifyResponse.fail("回调有误!");
     }
 
-    public List<JSONObject> getArea(String lng, String lat, Boolean testFlag) throws ParseException {
-        String provinceString ="[value ='%s'][0].label";
-        String cityString ="[value='%s'][0].children[value='%s'][0].label";
+    public List<JSONObject> getArea(String lng, String lat, Boolean testFlag) {
+        String provinceString = "[value ='%s'][0].label";
+        String cityString = "[value='%s'][0].children[value='%s'][0].label";
         String zoneString = "[value='%s'][0].children[value='%s'][0].children[value='%s'][0].label";
         Shop shop = new Shop();
         if (BooleanUtils.isTrue(testFlag)) {
@@ -643,10 +650,8 @@ public class WeixinServiceImpl  {
                 double realDistance = DistanceUtil.getRealDistance(Double.parseDouble(lng), Double.parseDouble(lat), Double.parseDouble(shop1.getLng()), Double.parseDouble(shop1.getLat()));
                 shop1.setRealDistance(realDistance);
                 shop1.setDistance(DistanceUtil.getDistanceDesc(realDistance));
-                appService.perfectOrderState(shop1, lng, lat);
             } else {
                 shop1.setDistance("-1");
-                shop1.setOrderState(1);
             }
             String province = shop1.getProvince();
             if(proString.contains(province)){
@@ -802,51 +807,4 @@ public class WeixinServiceImpl  {
             throw new ServiceException("微信登录异常，请重新登录");
         }
     }
-
-    public String generateMiniQr(String content) {
-        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);
-            ByteArrayOutputStream byteArrayOutputStream = new 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);
-        }
-        return null;
-    }
-
-    /**
-     * 图片放大缩小
-     */
-    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) {
-        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);
-                }
-            }
-        }
-        return resMatrix;
-    }
 }

soss-system/src/main/java/com/soss/system/service/impl/OrderServiceImpl.java

@@ -76,6 +76,8 @@ public class OrderServiceImpl implements IOrderService {
     private OrderTakingServiceImpl orderTakingService;
     @Autowired
     private SysConfigServiceImpl sysConfigService;
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
 
     @Autowired
     SendSmsUtil sendSmsUtil;
@@ -90,6 +92,8 @@ public class OrderServiceImpl implements IOrderService {
     public Order selectOrderById(Long id) {
         Order order = orderMapper.selectOrderById(id);
         order.setShop(shopMapper.selectShopById(order.getShopId()));
+        String pickCode = stringRedisTemplate.opsForValue().get(order.getPickCode());
+        order.setPickCode(pickCode);
         OrderSnapshot orderSnapshot = orderSnapshotService.selectOrderSnapshotByOrderId(order.getId());
         String snapshot = orderSnapshot.getSnapshot();
         List<OrderDetail> orderDetails = JSONObject.parseArray(snapshot, OrderDetail.class);
@@ -611,7 +615,8 @@ public class OrderServiceImpl implements IOrderService {
         String waitTime = getWaitTimeByOrderId(order.getId());
         Map<String, String> map = new HashMap<>();
         map.put("waitTime", waitTime);
-        map.put("pickCode", order.getPickCode());
+        String pickCode = stringRedisTemplate.opsForValue().get(order.getPickCode());
+        map.put("pickCode", pickCode);
         map.put("orderNum", order.getOrderNum());
         map.put("state", order.getState());
         return map;