From 65816321c28dab1f43d0563af67dbcbad2c5bdca Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 22 五月 2023 18:15:39 +0800
Subject: [PATCH] demo补完
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index a96e082..4708c86 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -359,6 +359,7 @@
order.setCouponMoney(couponDiscount);
order.setDiscountMoney(couponDiscount);
order.setReceivableMoney(orderPayMoney);
+ order.setReceivableDeposit(orderPayDeposit);
order.setPayType(appPlaceOrderDto.getPayType());
if(order.getPayType()==1){
order.setPayMoney(orderPayMoney);
@@ -626,8 +627,12 @@
public List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberNoClearOrder(page,merMemberNoClearOrderDto.getMemberUserId());
if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ BigDecimal zeroBig = new BigDecimal("0.00");
for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ if(merMemberNoClearOrderVo.getUnPaidMoney()==null){
+ merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
+ }
}
}
return merMemberNoClearOrderVoList;
@@ -783,6 +788,7 @@
order.setCouponMoney(couponDiscount);
order.setDiscountMoney(couponDiscount);
order.setReceivableMoney(orderPayMoney);
+ order.setReceivableDeposit(new BigDecimal("0.00"));
order.setPayType(1);
if(order.getPayType()==1){
order.setPayMoney(orderPayMoney);
@@ -852,6 +858,7 @@
Member member;
Integer orderFrom;
String orderFromDesc;
+ BigDecimal zeroBig = new BigDecimal("0.00");
for(MerOrderPageVo merOrderPageVo : merOrderPageVoList){
userId = merOrderPageVo.getUserId();
member = remoteMemberService.getMember(userId).getData();
@@ -878,6 +885,10 @@
orderFromDesc = "商城订单";
}
merOrderPageVo.setOrderFromDesc(orderFromDesc);
+ merOrderPageVo.setUnPaidMoney(merOrderPageVo.getReceivableMoney().subtract(merOrderPageVo.getPayMoney()));
+ if(merOrderPageVo.getUnPaidMoney()==null){
+ merOrderPageVo.setUnPaidMoney(zeroBig);
+ }
}
}
return merOrderPageVoList;
@@ -893,8 +904,12 @@
public List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberOrder(page,merMemberNoClearOrderDto.getMemberUserId());
if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ BigDecimal zeroBig = new BigDecimal("0.00");
for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ if(merMemberNoClearOrderVo.getUnPaidMoney()==null){
+ merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
+ }
}
}
return merMemberNoClearOrderVoList;
--
Gitblit v1.7.1