From 2cc5f6295aeba326b82deaf5f8bded61b9e1ae16 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 07 五月 2023 18:57:59 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 d8319b0..fa69482 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
@@ -315,7 +315,9 @@
orderGoods.setOrderId(orderId);
orderGoods.setGoodsId(goodsId);
orderGoods.setBuyNum(buyNum);
- orderGoods.setCouponId(userCouponId.toString());
+ if(userCouponId!=null){
+ orderGoods.setCouponId(userCouponId.toString());
+ }
orderGoods.setGoodsPrice(goodsPrice);
orderGoods.setGoodsTotalMoney(orderGoodsMoney);
orderGoods.setGoodsReceivableMoney(goodsRealPrice);
@@ -327,7 +329,8 @@
Order order = new Order();
order.setOrderId(orderId);
order.setDelFlag(0);
- order.setOrderStatus(1);
+ //为对接支付 直接付款成功
+ order.setOrderStatus(2);
order.setOrderNo(orderNo);
order.setOrderFrom(1);
order.setShopId(appPlaceOrderDto.getShopId());
@@ -341,11 +344,13 @@
order.setPayMoney(orderPayMoney);
order.setOnlinePayMoney(orderPayMoney);
appPlaceOrderVo.setPayMoney(orderPayMoney);
+ appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
order.setCloseFlag(1);
}else if(order.getPayType()==2){
order.setPayMoney(orderPayDeposit);
order.setOnlinePayMoney(orderPayDeposit);
appPlaceOrderVo.setPayMoney(orderPayDeposit);
+ appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
order.setCloseFlag(0);
}
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
@@ -391,6 +396,7 @@
}else{
appUserOrderPageVo.setSameShop(0);
}
+ appUserOrderPageVo.setVerifyCode("1-"+appUserOrderPageVo.getOrderId());
}
}
return appUserOrderPageVoList;
@@ -422,6 +428,7 @@
Shop shop = remoteShopService.getShop(order.getShopId()).getData();
appUserOrderGetVo.setShopName(shop.getShopName());
appUserOrderGetVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+ appUserOrderGetVo.setVerifyCode("1-"+orderId);
return appUserOrderGetVo;
}
@@ -775,4 +782,21 @@
List<MerOrderPageVo> merOrderPageVoList = orderMapper.pageMerOrder(page, merOrderPageDto);
return merOrderPageVoList;
}
+
+ /**
+ *
+ * @param page
+ * @param merMemberNoClearOrderDto
+ * @return
+ */
+ @Override
+ public List<MerMemberNoClearOrderVo> pageMerMemberOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto){
+ List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberOrder(page,merMemberNoClearOrderDto.getMemberUserId());
+ if(merMemberNoClearOrderVoList!=null&&!merMemberNoClearOrderVoList.isEmpty()){
+ for(MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList){
+ merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
+ }
+ }
+ return merMemberNoClearOrderVoList;
+ }
}
--
Gitblit v1.7.1