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

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
张松
2024-12-11 09:30:02 +08:00
parent ee7e0a8eb0 5fc070b75e
commit 2d7747340c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -316,6 +316,9 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
case "deposit": case "deposit":
dto.setPayType("储值卡支付"); dto.setPayType("储值卡支付");
break; break;
case "creditBuyer":
dto.setPayType("挂账支付");
break;
default: default:
dto.setPayType(tbOrderInfo.getSendType()); dto.setPayType(tbOrderInfo.getSendType());
break; break;

8
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -464,8 +464,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
tbCashierCart.setSalePrice(tbCashierCart.getSalePrice()); tbCashierCart.setSalePrice(tbCashierCart.getSalePrice());
tbCashierCart.setTotalAmount(updateCartDTO.getNum().multiply(tbCashierCart.getSalePrice())); tbCashierCart.setTotalAmount(updateCartDTO.getNum().multiply(tbCashierCart.getSalePrice()));
tbCashierCart.setNote(updateCartDTO.getNote()); tbCashierCart.setNote(updateCartDTO.getNote());
tbCashierCart.setIsPrint(updateCartDTO.getIsPrint()); if (updateCartDTO.getIsPrint() != null) {
tbCashierCart.setIsWaitCall(updateCartDTO.getIsWaitCall()); tbCashierCart.setIsPrint(updateCartDTO.getIsPrint());
}
if (updateCartDTO.getIsWaitCall() != null) {
tbCashierCart.setIsWaitCall(updateCartDTO.getIsWaitCall());
}
if (updateCartDTO.getIsPack() != null) { if (updateCartDTO.getIsPack() != null) {
if (!updateCartDTO.getIsPack()) { if (!updateCartDTO.getIsPack()) {