From 889749753021d76463d85450bd95e6615886956e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 22:34:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index ac910e3..b5d45cb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -334,8 +334,8 @@
TStore st = storeService.getById(store);
map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
map4.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map3.put("space_id", st.getId() + "");
- map4.put("space_id", st.getId() + "");
+ map3.put("space_id", si.getId() + "");
+ map4.put("space_id", si.getId() + "");
map3.put("name", blue);
map4.put("name", red);
map3.put("city_code", city);
@@ -360,13 +360,13 @@
HashMap<String, String> blueCode = new HashMap<>();
blueCode.put("scan_type", "1000");
blueCode.put("sutu_id", ""+sutuId);
- blueCode.put("space_id", st.getId() + "");
+ blueCode.put("space_id", si.getId() + "");
HashMap<String, String> redCode = new HashMap<>();
redCode.put("scan_type", "1000");
redCode.put("sutu_id", sutuId1+"");
- redCode.put("space_id", st.getId() + "");
- String blueS= "{\"scan_type\": 1000, \"space_id\": "+st.getId()+", \"sutu_id\": "+sutuId+"}";
- String redS= "{\"scan_type\": 1000, \"space_id\": "+st.getId()+", \"sutu_id\": "+sutuId1+"}";
+ redCode.put("space_id", si.getId() + "");
+ String blueS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId+"}";
+ String redS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId1+"}";
MyQrCodeUtil.createCodeToFile(blueS);
MyQrCodeUtil.createCodeToFile(redS);
BufferedImage blueImage = QRCodeUtil.createImage(blueS);
--
Gitblit v1.7.1