diff --git a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index b139dada..9653aa48 100644 --- a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -8,8 +8,6 @@ com/suisung/mall/common/utils/JChardetFacadeUtil$nsGB2312Verifier.class com/suisung/mall/common/utils/JChardetFacadeUtil$EUCKRStatistics.class com/suisung/mall/common/modules/user/ShopUserVoucher.class com/suisung/mall/common/pojo/input/AnalyticsProductInput.class -com/suisung/mall/common/utils/UserInfoService.class -com/suisung/mall/common/pojo/vo/UserLoginVo.class com/suisung/mall/common/modules/store/ShopStoreEmployeeDepartment.class com/suisung/mall/common/support/AuthInterceptor.class com/suisung/mall/common/modules/product/ShopProductItemSeq.class @@ -197,7 +195,6 @@ com/suisung/mall/common/utils/PropertiesUtil.class com/suisung/mall/common/modules/sns/SnsUserFriend.class com/suisung/mall/common/pojo/vo/RegUserVo.class com/suisung/mall/common/modules/account/AccountUserChannelCode.class -com/suisung/mall/common/domain/UserDto.class com/suisung/mall/common/modules/cms/CmsArticleCommentReply.class com/suisung/mall/common/modules/edu/EduUserLearnTarget.class com/suisung/mall/common/utils/constbank/RSAUtil.class @@ -206,7 +203,6 @@ com/suisung/mall/common/utils/phone/PhoneNumberUtils.class com/suisung/mall/common/modules/product/ShopProductIndex.class com/suisung/mall/common/modules/pay/PayPlantformResource.class com/suisung/mall/common/modules/store/ShopStoreEmployeeKefu.class -com/suisung/mall/common/config/BaseSwaggerConfig.class com/suisung/mall/common/modules/edu/vo/EduCourseDetailVO.class com/suisung/mall/common/modules/order/ShopOrderItem.class com/suisung/mall/common/utils/VideoUtil.class @@ -224,7 +220,6 @@ com/suisung/mall/common/modules/edu/EduCertTemplate.class com/suisung/mall/common/modules/city/CityUserPaotuier.class com/suisung/mall/common/pojo/vo/PayConsumeWithdrawOrderVo.class com/suisung/mall/common/modules/account/AccountUserLevelLog.class -com/suisung/mall/common/config/BaseUserInfoConfig.class com/suisung/mall/common/modules/distribution/ShopPlantformHighReturn.class com/suisung/mall/common/modules/user/ShopUserSearchHistory.class com/suisung/mall/common/modules/invoicing/InvoicingWarehouseItem.class @@ -237,7 +232,6 @@ com/suisung/mall/common/modules/edu/EduUserLecturer.class com/suisung/mall/common/pojo/vo/CommonNumVo.class com/suisung/mall/common/modules/city/CityMarketOrderBase.class com/suisung/mall/common/modules/base/ShopBaseCrontab.class -com/suisung/mall/common/config/DruidConfig.class com/suisung/mall/common/domain/SwaggerProperties.class com/suisung/mall/common/modules/activity/ShopStoreActivityShare.class com/suisung/mall/common/modules/product/ShopProductDetail.class @@ -262,7 +256,6 @@ com/suisung/mall/common/modules/chain/ShopChainDetail.class com/suisung/mall/common/modules/edu/EduLecturerExamine.class com/suisung/mall/common/modules/page/ShopPageApp.class com/suisung/mall/common/weblog/RequestNoContext.class -META-INF/spring-configuration-metadata.json com/suisung/mall/common/modules/distribution/ShopDistributionUserOrder.class com/suisung/mall/common/pojo/output/AnalyticsNumOutput.class com/suisung/mall/common/modules/order/ShopOrderReturnReason.class diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java index d42aae5f..d8a1d749 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java @@ -102,6 +102,9 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("printer_id", printerId); - updateWrapper.set("flag", status); + updateWrapper.set("status", status); boolean success = update(updateWrapper); if (success) { @@ -409,8 +414,8 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl> respList = feieUtil.printContentByList(printerSnList, printContent); - if (CollUtil.isEmpty(respList)) { + List> respList = feieUtil.printContentByList(printerSnList, printContent); + if (respList == null || CollUtil.isEmpty(respList)) { // 只需一台打印机能打印,就算成功了 logger.info("订单{}信息打印,调用飞鹅打印机打印失败。", orderId); return false; @@ -422,9 +427,9 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl respSn : respList) { + for (Pair respSn : respList) { // 打印成功,新增打印日志记录,以备下次查看和打印 - ShopStorePrinterLog shopStorePrinterLog = new ShopStorePrinterLog(template.getCategory(), storeId, orderId, template.getTemplate_id(), template.getTemplate_value(), JsonUtil.object2json(binding), printContent, respSn.getSecond(),respSn.getFirst()); + ShopStorePrinterLog shopStorePrinterLog = new ShopStorePrinterLog(template.getCategory(), storeId, orderId, template.getTemplate_id(), template.getTemplate_value(), JsonUtil.object2json(binding), printContent, respSn.getSecond(), respSn.getFirst()); shopStorePrinterLogService.insertShopStorePrinterLog(shopStorePrinterLog); }