From 6fd0df694e49c75466e3adc778369a0b16e8b5da Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 28 六月 2024 18:25:40 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index e585bc1..a3269db 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -95,6 +95,44 @@
LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
+ one1.setBoundStatus(BondStatusEnum.PAID);
+
+ }else{
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,orderNO);
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = OrderMapper.selectOne(wrapper1);
+ if (page1.getTotalAmount().compareTo(new BigDecimal(0))==0){
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
+ Map<String, Object> returnMap = new HashMap<>(20);
+ returnMap.put("Type",1);
+ }
+
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
+
+ MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+ memberPointsDTO.setMemberId(page1.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
+ memberPointsDTO.setPoints(page1.getPoints());
+ memberClient.addMemberPoints(memberPointsDTO);
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO);
+ }
+
+ if (orderNO.contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
OrderAuctionBond one = orderAuctionBondMapper.selectOne(wrapper1);
price=one.getBond().doubleValue();
body = " 订单支付";
@@ -104,7 +142,7 @@
return this.alipay(orderNO, subject, body, price, request);
} else {
// 微信预下单
- return this.wxpay(2, orderNO, body,openId, price, request);
+ return this.wxpay(2, orderNO, body, openId, price, request);
}
}else{
LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
@@ -188,7 +226,7 @@
wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
- page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
@@ -306,7 +344,7 @@
wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
- page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
@@ -501,6 +539,7 @@
returnMap.put("trade_type", map.get("trade_type"));
returnMap.put("sign", signature);
+ returnMap.put("Type",2);
returnMap.put("err_code_des", map.get("err_code_des"));
// 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
return R.ok(returnMap);
--
Gitblit v1.7.1