From 95afd96ec2d411d0c505cbf28a32d5f4a7ef6a7d 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: Fri, 26 Jul 2024 11:23:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataController.java | 2 +- .../cashierservice/service/DataService.java | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/DataController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/DataController.java index 808d66c..6cebd18 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/DataController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/DataController.java @@ -34,7 +34,7 @@ public class DataController { @RequestHeader("clientType") String clientType, Integer id, boolean isprintProduct){ - return dataService.handoverprint(id,isprintProduct); + return dataService.handoverprint(token,id,isprintProduct); } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java index 0a0231f..a0853e3 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java @@ -19,10 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; @Service @Slf4j @@ -133,8 +130,24 @@ public class DataService { - public Result handoverprint(Integer id,boolean isprintProduct){ + public Result handoverprint(String token,Integer id,boolean isprintProduct){ if(ObjectUtil.isNotEmpty(id)){ + + JSONObject jsonObject= TokenUtil.parseParamFromToken(token); + if(Objects.isNull(jsonObject)){ + return Result.fail(CodeEnum.TOKENTERROR); + } + + TbPlussShopStaff shopStaff; + + String staffId = jsonObject.getString("staffId"); + if(ObjectUtil.isNotEmpty(staffId)){ + shopStaff= tbPlussShopStaffMapper.selectByPrimaryKey(Integer.valueOf(staffId)); + } else { + shopStaff = null; + } + + ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByPrimaryKey(id); if(ObjectUtil.isNotEmpty(shopUserDuty)){ @@ -209,7 +222,7 @@ public class DataService { HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(), ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null, DateUtils.getTime(new Date()), - "", + ObjectUtil.isNull(shopStaff)?"":shopStaff.getName(), list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(), "0", shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(), @@ -222,6 +235,11 @@ public class DataService { ); tbHandover tbHandover=new tbHandover(); + + if(ObjectUtil.isNotNull(shopStaff)){ + tbHandover.setStaffId(shopStaff.getId()); + tbHandover.setStaffName(shopStaff.getName()); + } tbHandover.setTradeDay(DateUtils.getDays()); tbHandover.setPrintNo(it.getAddress()); tbHandover.setDutyId(shopUserDuty.getId()); From 3ef28aa8c4d21b3bec98fd7f3bc91ebaadb7ad8e 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: Fri, 26 Jul 2024 11:24:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/DataService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java index a0853e3..b49c222 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java @@ -222,7 +222,7 @@ public class DataService { HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(), ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null, DateUtils.getTime(new Date()), - ObjectUtil.isNull(shopStaff)?"":shopStaff.getName(), + ObjectUtil.isNull(shopStaff)?"":shopStaff.getAccount(), list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(), "0", shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(), @@ -238,7 +238,7 @@ public class DataService { if(ObjectUtil.isNotNull(shopStaff)){ tbHandover.setStaffId(shopStaff.getId()); - tbHandover.setStaffName(shopStaff.getName()); + tbHandover.setStaffName(shopStaff.getAccount()); } tbHandover.setTradeDay(DateUtils.getDays()); tbHandover.setPrintNo(it.getAddress());