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 +