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-31 13:59:16 +08:00
parent 8170850e2e ed516fbcf7
commit 8f213254e3
7 changed files with 15 additions and 5 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

@@ -111,7 +111,7 @@ public class DataService {
HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime())? DateUtils.getTime(shopUserDuty.getLoginTime()):null,
ObjectUtil.isNotEmpty(shopUserDuty.getLoginOutTime())?DateUtils.getTime(shopUserDuty.getLoginOutTime()):"",
DateUtils.getTime(new Date()),
ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
list,memberData,shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount())?BigDecimal.ZERO:shopUserDuty.getQuickAmount()).toPlainString(),
"0",

1
src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
View File

@@ -124,6 +124,7 @@ public class LoginService {
accountMap.put("accountId", account.getId());
accountMap.put("merchantName", account.getAccount());
accountMap.put("loginName", tbPlussShopStaff.getAccount());
accountMap.put("loginAccount",tbPlussShopStaff.getName());
accountMap.put("clientType", loginReq.getClientType());
accountMap.put("shopId", account.getShopId());
accountMap.put("staffId", tbPlussShopStaff.getId());

2
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -987,7 +987,7 @@ public class PayService {
//修改耗材数据
JSONObject jsonObject1=new JSONObject();
jsonObject1.put("orderId",orderInfo.getId());
jsonObject1.put("orderId",newOrderInfo.getId());
jsonObject1.put("type","delete");
producer.cons(jsonObject1.toString());