From a498e38d75a23d8220273406fb056f78adc31295 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 17 六月 2024 18:26:11 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 0e7ea2a..3dc4f91 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -250,6 +250,7 @@
BigDecimal pice=new BigDecimal(0);
Order order=new Order();
+ order.setMemberId(memberOrderDTO.getMemberId());
if (memberOrderDTO.getOrderFrom()==1){
order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
order.setOrderNo(OrderUtil.getOrderNoForPrefix("SP"));
@@ -416,7 +417,7 @@
order.setOrderRemark(memberOrderDTO.getOrderRemark());
}if (memberOrderDTO.getGoodsQuantity()!=null){
if (order.getOrderFrom().getCode()==1){
- GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
throw new ServiceException("对不起，购买数大于库存");
}else{
@@ -520,23 +521,24 @@
CouponMember data = promotionClient.getCouponMember(couponMemberDTO, SecurityConstants.INNER).getData();
- if (order.getCouponId()!=null){
+ if (order.getCouponId()!=0){
CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
couponMemberDTO1.setId(memberOrderDTO.getCouponId());
- couponMemberDTO1.setCouponStatus(1);
+ couponMemberDTO1.setCouponStatus(0);
promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
}
+ order.setCouponId(data.getId());
if (data.getCouponType().getCode()==1){
if (pice.doubleValue()>=data.getFullReductionAmount().doubleValue()){
- pice.subtract(data.getReductionAmount());
+ pice=pice.subtract(data.getReductionAmount());
order.setDiscountMoney(data.getReductionAmount());
}
}
if (data.getCouponType().getCode()==2){
pice= order.getTotalAmount();
- pice.subtract(data.getVoucherAmount());
+ pice=pice.subtract(data.getVoucherAmount());
order.setDiscountMoney(data.getVoucherAmount());
}
if (data.getCouponType().getCode()==3){
@@ -557,11 +559,20 @@
order.setCouponId(memberOrderDTO.getCouponId());
CouponMemberDTO couponMemberDTO2=new CouponMemberDTO();
couponMemberDTO2.setId(memberOrderDTO.getCouponId());
- couponMemberDTO2.setCouponStatus(2);
+ couponMemberDTO2.setCouponStatus(1);
promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);
+ }else{
+ if (order.getCouponId()!=0){
+ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
+ couponMemberDTO1.setId(order.getCouponId());
+ couponMemberDTO1.setCouponStatus(0);
+ promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
+ }
+ order.setCouponId(0L);
+ order.setDiscountMoney(new BigDecimal(0));
}
order.setTotalAmount(pice);
@@ -588,7 +599,7 @@
memberOrderVO.setReceiverCity(order.getReceiverCity());
memberOrderVO.setReceiverDetailAddress(order.getReceiverDetailAddress());
memberOrderVO.setReceiverphone(order.getReceiverPhone());
- memberOrderVO.setYouhiPrice(order.getDiscountMoney());
+ memberOrderVO.setDiscountMoney(order.getDiscountMoney());
return memberOrderVO;
}
@@ -618,8 +629,9 @@
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
MemberOrderList.getId()).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)) {
+ if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
MemberOrderList.setStatus(orderReturnRequest.getStatus());
+ MemberOrderList.setRequestId(orderReturnRequest.getId());
}
LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(OrderAuctionBond::getOrderId,MemberOrderList.getId());
@@ -654,8 +666,9 @@
Wrappers.lambdaQuery(OrderReturnRequest.class)
.eq(OrderReturnRequest::getOrderId,
orderVO.getId()).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)) {
+ if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
orderVO.setStatus(orderReturnRequest.getStatus());
+ orderVO.setRequestId(orderReturnRequest.getId());
}
LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
--
Gitblit v1.7.1