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

添加员工折扣

Browse Source
This commit is contained in:
牛叉闪闪
2024-08-26 15:42:21 +08:00
parent 42e6b3a689
commit ed5bb107d0
5 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
View File

@@ -96,7 +96,8 @@ public class MemberController {
// public Result returnFlow(@RequestHeader("token") String token, // public Result returnFlow(@RequestHeader("token") String token,
// @RequestHeader("loginName") String loginName, // @RequestHeader("loginName") String loginName,
// @RequestHeader("clientType") String clientType, // @RequestHeader("clientType") String clientType,
// @RequestParam("flowId") String flowId // @RequestParam("flowId") String flowId,
// @RequestParam("remark") String remark
// ){ // ){
// //
// //

5
src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
View File

@@ -28,4 +28,9 @@ public class OrderPo {
private String remark; private String remark;
private BigDecimal discountRatio;
private BigDecimal discountAmount;
} }

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

@@ -701,4 +701,6 @@ public class MemberService {
} }

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

@@ -895,7 +895,7 @@ public class PayService {
orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount)?orderInfo.getOrderAmount():payAmount); orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount)?orderInfo.getOrderAmount():payAmount);
orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount)?BigDecimal.ZERO:discountAmount); orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount)?BigDecimal.ZERO:discountAmount);
orderInfo.setStaffId(ObjectUtil.isEmpty(staff)?null:staff.getId()); orderInfo.setStaffId(ObjectUtil.isEmpty(staff)?null:staff.getId());
orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount)?payAmount.divide(orderInfo.getOrderAmount()).setScale(2,BigDecimal.ROUND_DOWN):null); orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount)?payAmount.divide(orderInfo.getOrderAmount(),2,RoundingMode.HALF_UP).setScale(2,RoundingMode.HALF_DOWN):null);
orderInfo.setPayType("cash"); orderInfo.setPayType("cash");
orderInfo.setStatus("closed"); orderInfo.setStatus("closed");
orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo())); orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo()));

4
src/main/resources/mapper/TbOrderInfoMapper.xml
View File

@@ -78,7 +78,9 @@
toi.out_number AS outNumber, toi.out_number AS outNumber,
toi.table_name AS tableName, toi.table_name AS tableName,
toi.remark, toi.remark,
toi.master_id as masterId toi.master_id as masterId,
toi.discount_ratio as discountRatio,
toi.discount_amount as discountAmount
FROM FROM