czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into prod

Browse Source
This commit is contained in:
wangw
2025-12-26 10:50:58 +08:00
parent 7eeeb8a30f aa7483b1b1
commit 266e782fc0
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java
View File

@@ -41,6 +41,7 @@ public class OrderDetailSmallVO implements Serializable {
private LocalDateTime startOrderTime;
private LocalDateTime dishOutTime;
private LocalDateTime foodServeTime;
private Integer isTemporary;
}

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java
View File

@@ -192,7 +192,7 @@ public class MkPointsUserServiceImpl extends ServiceImpl<MkPointsUserMapper, MkP
.shopId(pointsUser.getShopId())
.shopUserId(pointsUser.getShopUserId())
.floatType(PointsConstant.SUB.getValue())
.floatPoints(floatPoints)
.floatPoints(-floatPoints)
.balancePoints(pointsUser.getPointBalance())
.sourceId(orderId.toString())
.content(reason)