From c309d2bf72a9c780bc07b9ead57a044818fe0a29 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 12 Jun 2024 11:16:37 +0800 Subject: [PATCH 1/7] bug --- .../com/fuint/api/fuyou/controller/OilConfigController.java | 2 +- .../java/com/fuint/api/fuyou/service/OilConfigService.java | 2 +- .../fuint/api/fuyou/service/impl/OilConfigServiceImpl.java | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java index c8448e5eb..678632015 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java @@ -60,7 +60,7 @@ public class OilConfigController extends BaseController { int result = 2; // isOpen=1开启规则 if (isOpen.equals("1")){ - result = oilConfigService.judgmentProportion(); + result = oilConfigService.judgmentProportion(storeId); if (result==1){ oilConfigService.oilRule(storeId); // 开启定时关闭规则 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java index 5d20695a4..2be232fff 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java @@ -19,7 +19,7 @@ public interface OilConfigService extends IService { * 判断占比相加是否为100% 是返回1 不是返回0 * @return */ - public int judgmentProportion(); + public int judgmentProportion(Integer storeId); /** * 规则周期是否为当日 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java index 493b88c8e..9b57b7d34 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java @@ -68,12 +68,11 @@ public class OilConfigServiceImpl extends ServiceImpl(); - queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); + queryWrapper.eq("store_id",storeId); List list = baseMapper.selectList(queryWrapper); for (OilConfig config : list) { percentage += config.getProportion(); From deb613b44ef4591f94046e583fc9efe83df5b1ca Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 12 Jun 2024 16:21:04 +0800 Subject: [PATCH 2/7] bug --- .../order/service/impl/OilOrderServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 18a1d2202..c4bc0f56d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -1479,10 +1479,12 @@ public class OilOrderServiceImpl extends ServiceImpl i oilOrder.setUserId(nowAccountInfo.getId()); oilOrder.setOilTagSn(oilOrder.getOilTagSn()); TagCode tagCode = tagCodeService.selectByTagCodeSn(oilOrder.getOilTagSn()); - String collection = tagCode.getCollection(); - if (collection.contains("staffId")){ - String[] split = collection.split("staffId="); - oilOrder.setStaffId(Integer.parseInt(split[1])); + if (ObjectUtil.isNotEmpty(tagCode)) { + String collection = tagCode.getCollection(); + if (collection.contains("staffId")) { + String[] split = collection.split("staffId="); + oilOrder.setStaffId(Integer.parseInt(split[1])); + } } // 判断当前店铺是否存在此用户的会员信息，没有的话进行添加 LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId()); From af9e4836c2162139544a3041f65ff48b711e8b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 12 Jun 2024 16:29:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF?= =?UTF-8?q?=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/member/utils/QrCodeUtils.java | 84 ++++++++++++++++++- .../service/impl/QRCodeServiceImpl.java | 3 +- 2 files changed, 84 insertions(+), 3 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java index 129fc7dd8..475831443 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java @@ -106,6 +106,88 @@ public class QrCodeUtils { } +// // 将码牌编号文字绘制到指定位置 +// g.drawString(storeNumber, 200, 800); + g.dispose(); + // 输出图片 + String urlsss = "/temp/qrCode/"; + if (ObjectUtils.isNotEmpty(urls)){ + urlsss = urls; + } + File file1 = new File(urlsss); + // 判断目录是否存在 + if (!file1.exists()) { + file1.mkdirs(); + } + + FileOutputStream outImgStream = new FileOutputStream(outImgPath); + ImageIO.write(bufImg, "jpg", outImgStream); + outImgStream.flush(); + outImgStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void createLogoCodePictures(InputStream backgroundStream, InputStream logoStream, String url, String outImgPath, Integer staffId, Integer storeId,String urls) { + try { + // 读取原图片信息 + //得到文件 +//// File file = ResourceUtils.getFile(roundImage); +// ClassPathResource resource = new ClassPathResource(roundImage); +// ClassPathResource logoResource = new ClassPathResource(logoImage); +// File file = resource.getFile(); + + //文件转化为图片 + Image srcImg = ImageIO.read(backgroundStream); + //获取图片的宽 + int srcImgWidth = srcImg.getWidth(null); + //获取图片的高 + int srcImgHeight = srcImg.getHeight(null); + // 加水印 + BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB); + Graphics2D g = bufImg.createGraphics(); + g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null); + //使用工具类生成二维码 + Image image = createQrCode(logoStream, url, 360, 360); + //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。 + g.drawImage(image, (bufImg.getWidth()-360)/2, 320, null); + // 设置字体，样式，字体大小 +// g.setFont(new Font("TimesRoman", Font.BOLD, 40)); + g.setFont(chineseFont()); + //设置颜色。 + g.setColor(Color.BLACK); + +// 查询当前店铺信息 + if (ObjectUtils.isNotEmpty(storeId)){ + LJStore store = storeService.selectStoreByStoreId(storeId); +// 查询加油员信息 + LJStaff staff = null; + if (ObjectUtil.isNotEmpty(staffId)){ + staff = staffService.selectStaffById(staffId); + } + LJStaff staff1 = staffService.selectStaffByStoreId(storeId); + + // 店铺名称位置文字绘制到指定位置 + g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 300); + // 加油员姓名位置文字绘制到指定位置 + if (ObjectUtil.isNotEmpty(staff)) { + g.drawString("加油员："+staff.getRealName(), returnX(g, bufImg.getWidth(), "加油员："+staff.getRealName()), 750); + } + // 站长名称位置文字绘制到指定位置 + g.drawString("站长名称："+staff1.getRealName(), returnX(g, bufImg.getWidth(), "站长名称："+staff1.getRealName()), 810); + // 服务监督电话位置文字绘制到指定位置 + g.drawString("服务监督电话："+staff1.getMobile(), returnX(g, bufImg.getWidth(), "服务监督电话："+staff1.getMobile()), 870); + // 店铺地址位置文字绘制到指定位置 +// g.drawString(store.getAddress(), returnX(g,bufImg.getWidth(),store.getAddress()), 900); + drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-20,20,940,10 ); + }else { + drawStringWithMultiLine(g,"欢迎光临", bufImg.getWidth()-20,20,940,10 ); + g.drawString("欢迎光临：", returnX(g, bufImg.getWidth(), "服务监督电话："), 870); + + } + + // // 将码牌编号文字绘制到指定位置 // g.drawString(storeNumber, 200, 800); g.dispose(); @@ -148,7 +230,7 @@ public class QrCodeUtils { g.setFont(chineseFont()); //设置颜色。 g.setColor(Color.BLACK); - g.drawString("SN："+tagCodeSn, returnX(g, bufImg.getWidth(), "SN："+tagCodeSn), 440); + g.drawString("ID："+tagCodeSn, returnX(g, bufImg.getWidth(), "SN："+tagCodeSn), 440); g.dispose(); // 输出图片 String urlsss = "/temp/qrCode/"; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java index 83fd3a449..48d6ef86c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.indexBanner.entity.IndexBanner; import com.fuint.business.indexBanner.service.IndexBannerService; -import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.utils.QrCodeUtils; import com.fuint.business.storeInformation.entity.LJStore; import com.fuint.business.storeInformation.entity.QRCode; @@ -63,7 +62,7 @@ public class QRCodeServiceImpl extends ServiceImpl impleme if (type.equals("0")){ backgroundImage = "static/qrCodeImg/laigeyouhui_bg.jpg"; }else { - backgroundImage = "static/qrCodeImg/laigeyouhui_bg1.png"; + backgroundImage = "static/qrCodeImg/laigeyouhui_bg2.png"; } String logoImage = "static/qrCodeImg/logo.png"; From b900896e0ff9b0a19e6f5631036511bcbd2ae3ee Mon Sep 17 00:00:00 2001 From: xvv Date: Wed, 12 Jun 2024 17:14:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/.env.development | 2 +- fuintAdmin/src/assets/styles/variables.scss | 10 +++++----- fuintAdmin/src/layout/components/Navbar.vue | 2 +- fuintAdmin/src/layout/components/Sidebar/index.vue | 2 +- fuintAdmin_zt/.env.development | 2 +- fuintAdmin_zt/src/assets/styles/variables.scss | 10 +++++----- fuintAdmin_zt/src/layout/components/Navbar.vue | 2 +- fuintAdmin_zt/src/store/modules/settings.js | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index 5f34916d4..a17696244 100644 --- a/fuintAdmin/.env.development +++ b/fuintAdmin/.env.development @@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 -VUE_APP_SERVER_URL = 'http://localhost:8081/' +VUE_APP_SERVER_URL = 'http://192.168.31.54:8085/' # http://192.168.0.121:8080/ diff --git a/fuintAdmin/src/assets/styles/variables.scss b/fuintAdmin/src/assets/styles/variables.scss index c91774ec4..e243d2991 100644 --- a/fuintAdmin/src/assets/styles/variables.scss +++ b/fuintAdmin/src/assets/styles/variables.scss @@ -9,16 +9,16 @@ $yellow:#FEC171; $panGreen: #30B08F; // 默认菜单主题风格 -$base-menu-color:#144a6e;// 菜单全部字体颜色 -$base-menu-color-active:#144a6e;// 父级菜单激活的字体颜色 +$base-menu-color:#5393ff;// 菜单全部字体颜色 +$base-menu-color-active:#5393ff;// 父级菜单激活的字体颜色 $base-menu-background:#fff; -$base-logo-title-color: #144a6e; +$base-logo-title-color: #5393ff; $base-menu-light-color:#ffffff; $base-menu-light-background:#ffffff; -$base-logo-light-title-color: #1a5982; +$base-logo-light-title-color: #5393ff; -$base-sub-menu-background: #c6c6c6;//展开的背景色 +$base-sub-menu-background: #f8f8f8;//展开的背景色 $base-sub-menu-hover: #adadad; $base-sidebar-width: 200px; diff --git a/fuintAdmin/src/layout/components/Navbar.vue b/fuintAdmin/src/layout/components/Navbar.vue index d84d8321d..f6c3a0910 100644 --- a/fuintAdmin/src/layout/components/Navbar.vue +++ b/fuintAdmin/src/layout/components/Navbar.vue @@ -146,7 +146,7 @@ export default { height: 90px; overflow: hidden; position: relative; - background: #144a6e; + background: #5393ff; //background-image: url("../../assets/images/kkx.png") ; background-size: 100% 100%; background-size: cover; diff --git a/fuintAdmin/src/layout/components/Sidebar/index.vue b/fuintAdmin/src/layout/components/Sidebar/index.vue index 8de12e1ea..080a56926 100644 --- a/fuintAdmin/src/layout/components/Sidebar/index.vue +++ b/fuintAdmin/src/layout/components/Sidebar/index.vue @@ -84,7 +84,7 @@ export default { padding-top: 2px; text-align: center; - background: #3f5050; + background: #5393ff; overflow: hidden; border: 1px #ffffff solid; border-radius: 2px; diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development index 31bcda157..2836caf9a 100644 --- a/fuintAdmin_zt/.env.development +++ b/fuintAdmin_zt/.env.development @@ -13,7 +13,7 @@ VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 #VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/' #VUE_APP_SERVER_URL = 'http://192.168.31.178:8081' -VUE_APP_SERVER_URL = 'http://localhost:8081/' +VUE_APP_SERVER_URL = 'http://192.168.31.54:8085/' # cp端地址 # VUE_PC_SERVER_URL = 'http://47.95.206.185:85/' diff --git a/fuintAdmin_zt/src/assets/styles/variables.scss b/fuintAdmin_zt/src/assets/styles/variables.scss index 54baf043c..e243d2991 100644 --- a/fuintAdmin_zt/src/assets/styles/variables.scss +++ b/fuintAdmin_zt/src/assets/styles/variables.scss @@ -9,16 +9,16 @@ $yellow:#FEC171; $panGreen: #30B08F; // 默认菜单主题风格 -$base-menu-color:#144a6e;// 菜单全部字体颜色 -$base-menu-color-active:#144a6e;// 父级菜单激活的字体颜色 +$base-menu-color:#5393ff;// 菜单全部字体颜色 +$base-menu-color-active:#5393ff;// 父级菜单激活的字体颜色 $base-menu-background:#fff; -$base-logo-title-color: #455ced; +$base-logo-title-color: #5393ff; $base-menu-light-color:#ffffff; $base-menu-light-background:#ffffff; -$base-logo-light-title-color: #1a5982; +$base-logo-light-title-color: #5393ff; -$base-sub-menu-background: #c6c6c6;//展开的背景色 +$base-sub-menu-background: #f8f8f8;//展开的背景色 $base-sub-menu-hover: #adadad; $base-sidebar-width: 200px; diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue index e3de86a63..a8b0b2c2d 100644 --- a/fuintAdmin_zt/src/layout/components/Navbar.vue +++ b/fuintAdmin_zt/src/layout/components/Navbar.vue @@ -105,7 +105,7 @@ export default { height: 90px; overflow: hidden; position: relative; - background: #455ced; + background: #5393ff; //background-image: url("../../assets/images/kkx.png") ; background-size: 100% 100%; background-size: cover; diff --git a/fuintAdmin_zt/src/store/modules/settings.js b/fuintAdmin_zt/src/store/modules/settings.js index bfde91123..feb05e2c5 100644 --- a/fuintAdmin_zt/src/store/modules/settings.js +++ b/fuintAdmin_zt/src/store/modules/settings.js @@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' const state = { title: '', - theme: '#072d50', + theme: '#5393ff', sideTheme: storageSetting.sideTheme || sideTheme, showSettings: showSettings, topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, From 3d8cba8da473ab4b241e6711616b942fc75927e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 12 Jun 2024 17:43:37 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reconciliation/tab/trading.vue | 12 ++++++------ fuintAdmin_zt/src/views/tag/tagCode/index.vue | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue index b9893d439..bd8bc4119 100644 --- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue @@ -127,7 +127,7 @@ - + - - - + + + - +