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

Browse Source
This commit is contained in:
SongZhang
2024-07-26 17:10:12 +08:00
parent dbbc5ad98a 7ca618b403
commit 8170850e2e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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.getName(), ObjectUtil.isNull(shopStaff)?"":ObjectUtil.isNull(shopStaff.getName())?"":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(),