From 58a3ac0ed02ac27badd4937889b825a99ab54f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com> Date: Tue, 27 Aug 2024 14:42:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E3=80=81=E4=BC=9A=E5=91=98=E9=80=80=E6=AC=BE=E3=80=81=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E5=85=85=E5=80=BC=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cons/rest/TbProskuConController.java | 1 + .../service/impl/TbProskuConServiceImpl.java | 2 + .../impl/shopimpl/TbShopUserServiceImpl.java | 4 +- eladmin-system/src/main/resources/logback.xml | 120 ++++++++++-------- 4 files changed, 69 insertions(+), 58 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java index c4a46071..3ae77a02 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java @@ -51,6 +51,7 @@ public class TbProskuConController { } catch (BadRequestException be) { throw new Exception(be.getMessage()); }catch (Exception e){ + e.printStackTrace(); throw new Exception("相同商品耗材信息不允许添加"); } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java index 8d8815af..78559efe 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java @@ -71,6 +71,8 @@ public class TbProskuConServiceImpl implements TbProskuConService { @Override @Transactional(rollbackFor = Exception.class) public TbProskuConDto create(List resources) throws BadRequestException,Exception { + + log.info("List resources:{}",JSONUtil.toJSONString(resources)); for (ProskuInfo resource : resources) { TbProduct product= tbProductRepository.getById(resource.getProductId()); if(Objects.isNull(product)){ diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java index f33a6e4b..2b7ed3d7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java @@ -230,11 +230,11 @@ public class TbShopUserServiceImpl implements TbShopUserService { if("in".equals(operationType)){ flow.setType("+"); - flow.setBizName("inMoney".equals(type)?"充值退款":"消费退款"); + flow.setBizName("inMoney".equals(type)?"充值":"消费退款"); flow.setBizCode("inMoney".equals(type)?"inMoneyIn":"consumeIn"); tbShopUser.setAmount(tbShopUser.getAmount().add(amount)); }else if("out".equals(operationType)){ - flow.setBizName("inMoney".equals(type)?"充值退款扣除":"消费扣除"); + flow.setBizName("inMoney".equals(type)?"充值退款":"消费"); flow.setBizCode("inMoney".equals(type)?"inMoneyOut":"consumeOut"); flow.setType("-"); tbShopUser.setAmount(tbShopUser.getAmount().subtract(amount)); diff --git a/eladmin-system/src/main/resources/logback.xml b/eladmin-system/src/main/resources/logback.xml index ddd11093..9a6232e3 100644 --- a/eladmin-system/src/main/resources/logback.xml +++ b/eladmin-system/src/main/resources/logback.xml @@ -1,65 +1,73 @@ - - elAdmin - - - - - - - - ${log.pattern} - ${log.charset} - - - - - ${user.dir}/logback.log - - - ${user.dir}/logs/cashierAdmin/%d{yyyy-MM-dd}.log.gz - - 15 - - - - ${p_file} - ${log.charset} + + + + + + + + + + + + + + + + + + + + ${currentLoggerPattern} - - - - + + + + ${currentLoggerFilePath}/${currentLoggerFileName}.all.log + + ${currentLoggerPattern} + + + + ${currentLoggerFilePath}/${currentLoggerFileName}.all.%d{yyyy-MM-dd}.log + 5 + + + + + + + ${currentLoggerFilePath}/${currentLoggerFileName}.error.log + + ${currentLoggerPattern} + + + + ${currentLoggerFilePath}/${currentLoggerFileName}.error.%d{yyyy-MM-dd}.log + 20 + + + + ERROR + ACCEPT + DENY + + + + + + + + - - - - - + + - + - - - + - - - - - - - - - - - - - - - - - \ No newline at end of file + From b01812bce971be21b3f494e7fc5cd8cb5186c8ab Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 27 Aug 2024 15:47:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/mybatis/rest/StorageController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java index 37c163fb..d42421ca 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java @@ -96,11 +96,11 @@ public class StorageController { } private InputStream fetchQRCode(Map params) { JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("path", "pages/member/index");//路径 + jsonObject.addProperty("path", "pages/member/index?shopId="+params.get("shopId"));//路径 jsonObject.addProperty("is_hyaline", true);//是否需要透明底色，为 true 时，生成透明底色的小程序码 if (params.containsKey("env_version")) jsonObject.addProperty("env_version", "trial");//正式版为 release，体验版为 trial，开发版为 develop String accessToken = getAccessToken(); - String url = String.format("%s?access_token=%s&shopId=%s", QR_CODE_URL, accessToken,params.get("shopId")); + String url = String.format("%s?access_token=%s", QR_CODE_URL, accessToken); return HttpUtil.createPost(url) .body(jsonObject.toString(), "application/json") .execute()