czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
SongZhang 2024-07-26 14:18:37 +08:00
parent 363786872f 0eae7dd467
commit 1ac75009c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
View File

@ -222,7 +222,7 @@ public class DataService {
HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(), HandoverInfo handoverInfo = new HandoverInfo(tbShopInfo.getShopName(),
ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null, ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime()) ? DateUtils.getTime(shopUserDuty.getLoginTime()) : null,
DateUtils.getTime(new Date()), DateUtils.getTime(new Date()),
ObjectUtil.isNull(shopStaff)?"":shopStaff.getAccount(), ObjectUtil.isNull(shopStaff)?"":shopStaff.getName(),
list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(), list, memberData, shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount()) ? BigDecimal.ZERO : shopUserDuty.getQuickAmount()).toPlainString(),
"0", "0",
shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(), shopUserDuty.getAmount().subtract(shopUserDuty.getReturnAmount()).toPlainString(),
@ -238,7 +238,7 @@ public class DataService {
if(ObjectUtil.isNotNull(shopStaff)){ if(ObjectUtil.isNotNull(shopStaff)){
tbHandover.setStaffId(shopStaff.getId()); tbHandover.setStaffId(shopStaff.getId());
tbHandover.setStaffName(shopStaff.getAccount()); tbHandover.setStaffName(shopStaff.getName());
} }
tbHandover.setTradeDay(DateUtils.getDays()); tbHandover.setTradeDay(DateUtils.getDays());
tbHandover.setPrintNo(it.getAddress()); tbHandover.setPrintNo(it.getAddress());