From b3fc438e7828f5b69bd6d4d88b1a8a82157f072a Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 26 Jul 2024 17:04:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?ysk=20logo=202.=E8=80=97=E6=9D=90=E9=A2=84=E8=AD=A6=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/CartService.java | 25 ++++++++++-------- .../cashierservice/service/UserService.java | 13 +++++++-- src/main/resources/static/logo.png | Bin 0 -> 2017 bytes 3 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/static/logo.png diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 72d6b4b..8c4eedd 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1,5 +1,6 @@ package com.chaozhanggui.system.cashierservice.service; +import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -30,6 +31,7 @@ import java.math.BigDecimal; import java.time.Instant; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; /** * @author lyf @@ -844,17 +846,6 @@ public class CartService { log.info("开始发送mq消息，消耗耗材，消息内容：{}", jsonObject2); producer.cons(jsonObject2.toString()); - for (int i = 0; i < array.size(); i++) { - JSONObject object = array.getJSONObject(i); - TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class); - // 发送判断耗材是否耗尽消息 - JSONObject objectMsg = new JSONObject(); - objectMsg.put("skuId", Integer.valueOf(cashierCart.getSkuId())); - objectMsg.put("shopId", Integer.valueOf(cashierCart.getShopId())); - producer.con_msg(objectMsg.toString()); - } - - redisUtil.saveMessage(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId")).concat("-").concat(shopId), array.toJSONString()); orderInfo.setDetailList(orderDetails); JSONObject jsonObject1 = new JSONObject(); @@ -874,6 +865,18 @@ public class CartService { // PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject12.toString(), jsonObject.getString("tableId").concat("-").concat(shopId), "", false); PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject12.toString(), jsonObject.getString("tableId").concat("-").concat(shopId), jsonObject.getString("userId")); redisUtil.saveMessage(RedisCst.ORDER_EXPIRED.concat(orderId.toString()), orderId.toString(), 60 * 16L); + ThreadUtil.execAsync(() -> { + ThreadUtil.sleep(5, TimeUnit.SECONDS); + for (int i = 0; i < array.size(); i++) { + JSONObject object = array.getJSONObject(i); + TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class); + // 发送判断耗材是否耗尽消息 + JSONObject objectMsg = new JSONObject(); + objectMsg.put("skuId", Integer.valueOf(cashierCart.getSkuId())); + objectMsg.put("shopId", Integer.valueOf(cashierCart.getShopId())); + producer.con_msg(objectMsg.toString()); + } + }); } catch (Exception e) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java index 49819fa..21f736c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java @@ -23,12 +23,16 @@ import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; @@ -56,9 +60,12 @@ public class UserService { private final WxAccountUtil wxAccountUtil; - public UserService(FileService fileService, WxAccountUtil wxAccountUtil) { + private final ResourceLoader resourceLoader; + + public UserService(FileService fileService, WxAccountUtil wxAccountUtil, ResourceLoader resourceLoader) { this.fileService = fileService; this.wxAccountUtil = wxAccountUtil; + this.resourceLoader = resourceLoader; } public JSONObject modityIntegral(IntegralVo integralVo, String userSign) { @@ -254,7 +261,9 @@ public class UserService { throw new MsgException("店铺不存在"); } ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - QrCodeUtil.generate(wxAccountUtil.getRadarQrCode(Integer.valueOf(shopId)), new QrConfig(100, 100), "png", outputStream); + Resource resource = resourceLoader.getResource("classpath:/static/logo.png"); + InputStream inputStream = resource.getInputStream(); + QrCodeUtil.generate(wxAccountUtil.getRadarQrCode(Integer.valueOf(shopId)), new QrConfig(250, 250).setImg(ImageIO.read(inputStream)), "png", outputStream); return fileService.uploadFileByInputStream(".png", new ByteArrayInputStream(outputStream.toByteArray())); } diff --git a/src/main/resources/static/logo.png b/src/main/resources/static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4ed2cd12658c400364ebf0448b34a2e422b5a9a0 GIT binary patch literal 2017 zcmaJ?X;>528V&^&(V(~BMis+=vStrUB2j?^5+%sim{J6?3?YSNVlp8E*aB7*C=dk% zWC>7FToCoLw1CQH1;wI9TaZfKineuuE2z|Z5om90tY0TA>QW_(&iTh~vtIQZN)0N|JV7 z2E8#DQzu!t02c598DdCI5E^|5h+K)HF&OVnh*Bty2VtBDl*$xLV6?3rz{w;`V7ohy z#8di#aWYP_3JgmQ3Ku8Gi|G` zIq`&InZjsso`&#v46Z^A3l(CJ%VGj32|*^4F#O#8S?+XSPa2iRCX?CzKAxU_Y?=q% z%b!9aQ+!FYSQaGK$Uy}>izbkz*m+_|{V$v1YCaoaK#~mB_5AA6!~`Yw}x1VoL8R6B_Gdrc3NoT2W$<@ytG!Cm6dH$oK_kW zZY}2CiU~Il`7$%2CfFr0prd&x;Zi5MU2x$@Ye{$fAAZ8?Qoq8g{)!g^ty;0#)BAf4>sPAZNLh3pF zky4UDv0qS_Gr)gvukuX9Sn%@J^PF6MAg?x0*Lc{?bc3R22rfL@*D#p-dO#$KD2a-+ zOfk3g1cvH2+}*IE`At;$?;RDkzc|DkSVa9Iea9ge{;P`alqQA>`7pYv3UD=VJQDq6 z$?(2`ZC}-1Us^uec{F3PWeqcGLf0(}7;v&EP-+(Un-A7aHrl3Qt3DU>UB27zd#5PV z^-GTKyB|l-PL)^dOf{XRy?+Ee*(_Ogwsd2DZk-wSRe9$TpQ~Rj+Ux#W9PQkCZcwu& z%+|{4#J)q=rs@-`+u^E#%_Oh%Nz$`+aG}1%v~8QK{`O;DW=^0L{J7V>g6}Sh3oUpy zuhrtXZG~atN2GlC*q!l9>CU;Aql$6@)Yr*%X`f&E zM){WV=902z+46hu0(UgEY&%|EYuJBOId;n)Ki_Fl^HdeyV{OJj+J}nnarWdJpHtUp zoL2A570(T6zi9*FNRMvjIk=I19X`LE^Ly$IkHy-WJO|d51_vxX$YfpJ1MBjHp8M;W z*z+Z8bvy4iwdPu4RZ;PUSEbnAKZ9?Wd|I)Wt#Dw^E9f%2i6oBfj=`9$+ta$yUsylQUMgHY{z(C0-3_<&(PN9s&U9oQ;Cj8f(znAY zVav3 z)Zyv@X*uPIZp3By<`>~p_W20Z9{qN^yWOULXqdiKT6&k{mgeM5C!({Z^Sr%PZ~YHa zPCE`9ZVhcYN7>WU9%gDTh~HFCBp129y!bBUr&A9iN^|x#Wav+2Eu%Twux;ITZUyZ4 z+&$ksE<5u2mgoply|rv)nh$T`oI_Rqq?K`#&o=H!1)C literal 0 HcmV?d00001