From 9465eba6872fa401a0faa65891c8b6444479c3a5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 11:22:40 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 8 ++++----
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 7 ++++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 946821b..ecff87f 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -554,7 +554,7 @@
AND create_time >= #{statisticsQueryDto.startTime}
</if>
<if test="statisticsQueryDto.endTime != null">
- AND create_time <= #{statisticsQueryDto.endTime}
+ AND create_time <= #{statisticsQueryDto.endTime}
</if>
</if>
@@ -617,7 +617,7 @@
AND create_time >= #{statisticsQueryDto.startTime}
</if>
<if test="statisticsQueryDto.endTime != null">
- AND create_time <= #{statisticsQueryDto.endTime}
+ AND create_time <= #{statisticsQueryDto.endTime}
</if>
</if>
GROUP BY
@@ -649,7 +649,7 @@
AND create_time >= #{statisticsQueryDto.startTime}
</if>
<if test="statisticsQueryDto.endTime != null">
- AND create_time <= #{statisticsQueryDto.endTime}
+ AND create_time <= #{statisticsQueryDto.endTime}
</if>
</if>
GROUP BY
@@ -709,7 +709,7 @@
AND co.create_time >= #{statisticsQueryDto.startTime}
</if>
<if test="statisticsQueryDto.endTime != null">
- AND co.create_time <= #{statisticsQueryDto.endTime}
+ AND co.create_time <= #{statisticsQueryDto.endTime}
</if>
</if>
</where>
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index afb862e..6c6629d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -283,7 +283,7 @@
payPrice = orderPrice.subtract(coupon.getDiscountAmount());
discountPrice = coupon.getDiscountAmount();
}
- exchangeDto.setPayPrice(payPrice);
+ exchangeDto.setPayPrice(orderPrice);
exchangeDto.setDiscountPrice(discountPrice);
exchangeDto.setVipDiscount(vipDiscount);
exchangeDto.setUserId(userId);
@@ -293,10 +293,11 @@
//调起支付
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setCode(shopOrder.getCode());
- paymentOrder.setAmount(shopOrder.getPaymentAmount());
+ paymentOrder.setAmount(exchangeDto.getOrderPrice());
paymentOrder.setOpenId(user.getWxOpenid());
paymentOrder.setDescription("购买商品");
- return wxPaymentClient.orderPay(paymentOrder);
+ R<Map<String, Object>> mapR = wxPaymentClient.orderPay(paymentOrder);
+ return mapR;
}else {
//todo 罗 支付宝支付
return R.ok();
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
index 3ed6053..0836ade 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
@@ -118,7 +118,7 @@
switch (substring){
//购物订单
case "GW":
-
+ System.err.println("----收到购物回调");
break;
case "HY":
break;
--
Gitblit v1.7.1