From a206f640259bc9f206ed8bdd5318b76bed461427 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 31 七月 2024 21:58:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 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 80a84e4..3ff1f70 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
@@ -733,8 +733,9 @@
CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
- if (pice.intValue()>0){
- BigDecimal divide = pice.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
+ if (pice.doubleValue()>0){
+ BigDecimal pic=pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
+ BigDecimal divide = pic.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN);
BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue()));
order.setPoints(aDouble.intValue());
@@ -897,23 +898,11 @@
orderVO.setAuctionType(order.getAuctionOrderType());
orderVO.setCouponId(order.getCouponId());
orderVO.setBound(order.getBound());
+ orderVO.setIsRequest(order.getIsRequest());
if (orderVO.getOrderFrom().getCode()==3){
GoodsGroupPurchase data = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
orderVO.setGroupTime(data.getGroupTime());
orderVO.setSkuId(data.getGoodsSkuId());
- }
-
- OrderReturnRequest orderReturnRequest = orderReturnRequestService.getOne(
- Wrappers.lambdaQuery(OrderReturnRequest.class)
- .eq(OrderReturnRequest::getOrderId,
- orderVO.getId()).eq(OrderReturnRequest::getDelFlag,
- 0).last("limit 1"));
- if (StringUtils.isNotNull(orderReturnRequest)&&orderReturnRequest!=null) {
- orderVO.setStatus(orderReturnRequest.getStatus());
- orderVO.setRequestId(orderReturnRequest.getId());
- orderVO.setIsRequest(2);
- }else{
- orderVO.setIsRequest(1);
}
LambdaQueryWrapper<OrderAuctionBond> wrapper3= Wrappers.lambdaQuery();
@@ -1169,7 +1158,7 @@
wrapper.eq(OrderAuctionBond::getOrderId,order.getId());
OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
if(orderAuctionBond!=null){
- if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
+ if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//支付宝
//获取支付信息
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
@@ -1178,7 +1167,7 @@
if (!bo) {
System.out.println("支付宝退款失败");
}
- } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
+ } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//微信
//获取支付信息
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
@@ -1319,7 +1308,6 @@
wrapper1.eq(Order::getMemberId,homeGoodsSkuDTO1.getMemberId());
wrapper1.eq(Order::getOrderFrom,3);
wrapper1.eq(Order::getDelFlag,0);
- wrapper1.eq(Order::getOrderStatus,2);
wrapper1.orderByDesc(Order::getCreateTime);
Page<Order> page = new Page<>(homeGoodsSkuDTO1.getPageCurr(), homeGoodsSkuDTO1.getPageSize());
Page< Order> page1 = this.page(page, wrapper1);
@@ -1340,24 +1328,31 @@
goodsGroupPurchaseeVO1.setIsGoodsGroupPurchase(2);
if (byId1.getGroupNo()!=null){
GoodsGroupPurchaseInfo one1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId1.getGroupNo(), SecurityConstants.INNER).getData();
- if (one1!=null) {
- goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
- if (one1.getGroupStatus() == 0) {
- if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
- } else {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+
+ if (one1.getGroupStatus()==3){
+ if (one1!=null) {
+ goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
+ if (one1.getGroupStatus() == 0) {
+ if (one1.getGroupSize() - one1.getCurrentNumber() < 5) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.MS_FAILURE);
+ } else {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.TO_FORM_A_GROUP);
+ }
}
- }
- if (one1.getGroupStatus() == 1) {
- goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
- }
+ if (one1.getGroupStatus() == 1) {
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.FORMED_INTO_A_GROUP);
+ }
if (one1.getGroupStatus() == 2) {
goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
+ }else{
+ goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
+ }
}else{
- goodsGroupPurchaseeVO1.setGroupStatus(data.getGroupStatus());
+ goodsGroupPurchaseeVO1.setCurrentNumber(one1.getCurrentNumber());
+ goodsGroupPurchaseeVO1.setGroupStatus(GroupStatusEnum.GROUP_FAILURE);
}
+
}
--
Gitblit v1.7.1