From 592be2e58086606551dd74235b6662fe02ab6db3 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 21 八月 2024 11:38:53 +0800
Subject: [PATCH] 添加接口
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 148 +++++++++
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java | 33 ++
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java | 68 ++-
ruoyi-service/ruoyi-payment/pom.xml | 5
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/NotifyV3PayDecodeRespBody.java | 222 ++++++++++++++
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java | 3
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java | 53 +++
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java | 5
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java | 51 +++
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TChargingGunVO.java | 6
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java | 10
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserVipDetailClient.java | 27 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/AddChargingOrder.java | 26 +
ruoyi-service/ruoyi-order/pom.xml | 4
/dev/null | 15 -
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/GetAppUserVipDetail.java | 19 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java | 41 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 25 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserVipDetailFallbackFactory.java | 33 ++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 15
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 16
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 36 ++
23 files changed, 799 insertions(+), 64 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserVipDetailFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserVipDetailFallbackFactory.java
new file mode 100644
index 0000000..f22b61a
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserVipDetailFallbackFactory.java
@@ -0,0 +1,33 @@
+package com.ruoyi.account.api.factory;
+
+import com.ruoyi.account.api.feignClient.AppUserVipDetailClient;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.api.vo.GetAppUserVipDetail;
+import com.ruoyi.common.core.domain.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+
+/**
+ *
+ * @author ruoyi
+ */
+@Component
+public class AppUserVipDetailFallbackFactory implements FallbackFactory<AppUserVipDetailClient>
+{
+ private static final Logger log = LoggerFactory.getLogger(AppUserVipDetailFallbackFactory.class);
+
+ @Override
+ public AppUserVipDetailClient create(Throwable throwable) {
+ log.error("用户会员明细调用失败:{}", throwable.getMessage());
+ return new AppUserVipDetailClient() {
+
+ @Override
+ public R<TAppUserVipDetail> getAppUserVipDetail(GetAppUserVipDetail getAppUserVipDetail) {
+ return R.fail("获取用户当前有效的VIP明细调用失败：" + throwable.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserVipDetailClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserVipDetailClient.java
new file mode 100644
index 0000000..37f0dbb
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserVipDetailClient.java
@@ -0,0 +1,27 @@
+package com.ruoyi.account.api.feignClient;
+
+import com.ruoyi.account.api.factory.AppUserVipDetailFallbackFactory;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.api.vo.GetAppUserVipDetail;
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/21 10:27
+ */
+@FeignClient(contextId = "AppUserVipDetailClient", value = ServiceNameConstants.ACCOUNT_SERVICE, fallbackFactory = AppUserVipDetailFallbackFactory.class)
+public interface AppUserVipDetailClient {
+
+ /**
+ * 获取用户当前有效的VIP明细
+ * @param getAppUserVipDetail
+ * @return
+ */
+ @PostMapping("/appUserVipDetail/getAppUserVipDetail")
+ R<TAppUserVipDetail> getAppUserVipDetail(GetAppUserVipDetail getAppUserVipDetail);
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
index 577fc54..ed91fc3 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
@@ -38,10 +38,12 @@
@ApiModelProperty(value = "剩余充电次数")
@TableField("charge_num")
private Integer chargeNum;
-
-
-
- @ApiModelProperty(value = "购买时折扣金额")
+
+ @ApiModelProperty(value = "折扣")
+ @TableField("discount")
+ private BigDecimal discount;
+
+ @ApiModelProperty(value = "最高优惠金额")
@TableField("discount_money")
private BigDecimal discountMoney;
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/GetAppUserVipDetail.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/GetAppUserVipDetail.java
new file mode 100644
index 0000000..a1ce8a5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/GetAppUserVipDetail.java
@@ -0,0 +1,19 @@
+package com.ruoyi.account.api.vo;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/21 10:30
+ */
+@Data
+public class GetAppUserVipDetail {
+ /**
+ * 用户id
+ */
+ private Long appUserId;
+ /**
+ * vipid
+ */
+ private Integer vipId;
+}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
index b2e13b0..ff0b238 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -37,4 +38,8 @@
@PostMapping("/site/getSiteInfoByNumber")
@ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number);
+
+
+ @PostMapping("/t-charging-pile/getChargingPileById/{id}")
+ R<TChargingPile> getChargingPileById(@PathVariable("id") Integer id);
}
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
index e730372..2d71dfa 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
@@ -14,6 +14,8 @@
private String name;
@ApiModelProperty(value = "桩编号")
private String number;
+ @ApiModelProperty(value = "充电枪id")
+ private Integer chargingGunId;
@ApiModelProperty(value = "普通电价")
private BigDecimal electrovalence;
@ApiModelProperty(value = "会员电价")
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TChargingGunVO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TChargingGunVO.java
index db1d3e4..16e7232 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TChargingGunVO.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/TChargingGunVO.java
@@ -21,13 +21,13 @@
@ApiModelProperty(value = "查看费率权限")
private boolean authViewRates = true;
- @ApiModelProperty(value = "编辑权限")
+ @ApiModelProperty(value = "下载二维码权限")
private boolean authDownloadQRCode = true;
- @ApiModelProperty(value = "编辑权限")
+ @ApiModelProperty(value = "查看详情权限")
private boolean authQueryInfo = true;
- @ApiModelProperty(value = "编辑权限")
+ @ApiModelProperty(value = "结束充电权限")
private boolean authEndCharge = true;
}
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/ChargingOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/ChargingOrderFallbackFactory.java
deleted file mode 100644
index ea8f590..0000000
--- a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/ChargingOrderFallbackFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.payment.api.factory;
-
-import com.ruoyi.payment.api.feignClient.ChargingOrderClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * 充电订单服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class ChargingOrderFallbackFactory implements FallbackFactory<ChargingOrderClient>
-{
- private static final Logger log = LoggerFactory.getLogger(ChargingOrderFallbackFactory.class);
-
- @Override
- public ChargingOrderClient create(Throwable throwable) {
- log.error("充电订单调用失败:{}", throwable.getMessage());
- return new ChargingOrderClient() {
-
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java
new file mode 100644
index 0000000..bad2cf8
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/factory/WxPaymentFallbackFactory.java
@@ -0,0 +1,51 @@
+package com.ruoyi.payment.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.payment.api.feignClient.WxPaymentClient;
+import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
+import com.ruoyi.payment.api.vo.PaymentOrder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * 充电订单服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class WxPaymentFallbackFactory implements FallbackFactory<WxPaymentClient>
+{
+ private static final Logger log = LoggerFactory.getLogger(WxPaymentFallbackFactory.class);
+
+ @Override
+ public WxPaymentClient create(Throwable throwable) {
+ log.error("微信支付调用失败:{}", throwable.getMessage());
+ return new WxPaymentClient() {
+
+ @Override
+ public R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId) {
+ return R.fail("查询支付订单信息失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<Map<String, Object>> orderPay(PaymentOrder paymentOrder) {
+ throw new RuntimeException("调起微信支付失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<Map<String, Object>> payNotify(HttpServletRequest request) {
+ return R.fail("微信支付回调失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public void ack() {
+
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/ChargingOrderClient.java
deleted file mode 100644
index d9f4240..0000000
--- a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/ChargingOrderClient.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.payment.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.payment.api.factory.ChargingOrderFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-
-/**
- * 充电订单服务
- * @author ruoyi
- */
-@FeignClient(contextId = "ChargingOrderClient", value = ServiceNameConstants.PAYMENT_SERVICE, fallbackFactory = ChargingOrderFallbackFactory.class)
-public interface ChargingOrderClient {
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java
new file mode 100644
index 0000000..00799b8
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java
@@ -0,0 +1,53 @@
+package com.ruoyi.payment.api.feignClient;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.payment.api.factory.WxPaymentFallbackFactory;
+import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
+import com.ruoyi.payment.api.vo.PaymentOrder;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * 充电订单服务
+ * @author ruoyi
+ */
+@FeignClient(contextId = "WxPaymentClient", value = ServiceNameConstants.PAYMENT_SERVICE, fallbackFactory = WxPaymentFallbackFactory.class)
+public interface WxPaymentClient {
+
+ /**
+ * 查询支付订单信息
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/wx/query/queryOrderInfo")
+ R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId);
+
+
+ /**
+ * 订单支付
+ * @param paymentOrder
+ * @return
+ */
+ @PostMapping("/wx/orderPay")
+ R<Map<String, Object>> orderPay(@RequestBody PaymentOrder paymentOrder);
+
+
+ /**
+ * 支付回调
+ * @param request
+ * @return
+ */
+ @PostMapping("/wx/pay/notify")
+ R<Map<String, Object>> payNotify(HttpServletRequest request);
+
+ /**
+ * 支付回调成功后的成功应答
+ */
+ @PostMapping("/wx/pay/ack")
+ void ack();
+}
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/NotifyV3PayDecodeRespBody.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/NotifyV3PayDecodeRespBody.java
new file mode 100644
index 0000000..3eb2cda
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/NotifyV3PayDecodeRespBody.java
@@ -0,0 +1,222 @@
+package com.ruoyi.payment.api.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xiaochen
+ * @ClassName FacilV3PayNotifyRespBody
+ * @Description
+ */
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class NotifyV3PayDecodeRespBody implements Serializable {
+ // 合单--开始
+ private String combine_appid;
+ private String combine_mchid;
+ private String combine_out_trade_no;
+ private List<SubOrders> sub_orders;
+ // 合单--结束
+ /**
+ * 服务商应用ID
+ */
+ private String sp_appid;
+ /**
+ * 服务商户号
+ */
+ private String sp_mchid;
+ /**
+ * 商户号
+ */
+ private String mchid;
+ /**
+ * 子商户应用ID
+ */
+ private String sub_appid;
+ /**
+ * 子商户号
+ */
+ private String sub_mchid;
+ /**
+ * 商户订单号
+ */
+ private String out_trade_no;
+ /**
+ * 交易状态描述
+ */
+ private String trade_state_desc;
+ /**
+ * 交易类型，枚举值：
+ * JSAPI：公众号支付
+ * NATIVE：扫码支付
+ * APP：APP支付
+ * MICROPAY：付款码支付
+ * MWEB：H5支付
+ * FACEPAY：刷脸支付
+ */
+ private String trade_type;
+ /**
+ * 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用
+ */
+ private String attach;
+ /**
+ * 微信支付订单号
+ */
+ private String transaction_id;
+ /**
+ * 交易状态，枚举值：
+ * SUCCESS：支付成功
+ * REFUND：转入退款
+ * NOTPAY：未支付
+ * CLOSED：已关闭
+ * REVOKED：已撤销（付款码支付）
+ * USERPAYING：用户支付中（付款码支付）
+ * PAYERROR：支付失败(其他原因，如银行返回失败)
+ */
+ private String trade_state;
+ /**
+ * 银行类型，采用字符串类型的银行标识。银行标识请参考《银行类型对照表》
+ * https://pay.weixin.qq.com/wiki/doc/apiv3_partner/terms_definition/chapter1_1_3.shtml#part-6
+ */
+ private String bank_type;
+ /**
+ * 支付完成时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss+TIMEZONE，
+ * YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss表示时分秒，
+ * TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。
+ * 例如：2015-05-20T13:29:35+08:00表示，北京时间2015年5月20日 13点29分35秒。
+ * 示例值：2018-06-08T10:34:56+08:00
+ */
+ private String success_time;
+ /**
+ * 支付者信息
+ */
+ private Payer payer;
+
+ /**
+ * 支付者
+ */
+ private Payer combine_payer_info;
+
+ /**
+ * 订单金额信息
+ */
+ private Amount amount;
+ /**
+ * 场景信息
+ */
+ private SceneInfo scene_info;
+ /**
+ * 优惠功能，享受优惠时返回该字段
+ */
+ private List<PromotionDetail> promotion_detail;
+
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Data
+ public static class Amount implements Serializable{
+ /**
+ * 用户支付金额
+ */
+ private int payer_total;
+ /**
+ * 总金额
+ */
+ private int total;
+ /**
+ * 标价金额
+ */
+ private int total_amount;
+ /**
+ * 现金支付金额
+ */
+ private int payer_amount;
+ private String currency;
+ private String payer_currency;
+ }
+
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Data
+ public static class GoodsDetail implements Serializable{
+ private String goods_id;
+ private int quantity;
+ private int unit_price;
+ private int discount_amount;
+ private String goods_remark;
+
+ }
+
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Data
+ public static class Payer implements Serializable{
+ private String openid;
+ private String sp_openid;
+ private String sub_openid;
+ }
+
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Data
+ public static class PromotionDetail implements Serializable{
+ private String coupon_id;
+ private String name;
+ private String scope;
+ private String type;
+ private int amount;
+ private String stock_id;
+ private int wechatpay_contribute;
+
+ private int merchant_contribute;
+ private int other_contribute;
+ private String currency;
+
+ private List<GoodsDetail> goods_detail;
+
+ }
+
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Data
+ public static class SceneInfo implements Serializable{
+ /**
+ * 商户端设备号
+ */
+ private String device_id;
+ }
+
+
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ @Data
+ public static class SubOrders implements Serializable{
+ private String mchid;
+ private String trade_type;
+ private String trade_state;
+ private String trade_state_desc;
+ private String bank_type;
+ private String attach;
+ private String success_time;
+ private String transaction_id;
+ private String out_trade_no;
+ private String sub_mchid;
+ private Amount amount;
+ /**
+ * 优惠功能，享受优惠时返回该字段
+ */
+ private List<PromotionDetail> promotion_detail;
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java
new file mode 100644
index 0000000..a998845
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java
@@ -0,0 +1,33 @@
+package com.ruoyi.payment.api.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/21 9:06
+ */
+@Data
+public class PaymentOrder {
+ /**
+ * 订单流水号
+ */
+ private String code;
+ /**
+ * 支付金额
+ */
+ private BigDecimal amount;
+ /**
+ * openid
+ */
+ private String openId;
+ /**
+ * 描述
+ */
+ private String description;
+ /**
+ * 回调地址
+ */
+ private String notifyUrl;
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index f529267..cee2bbe 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -7,6 +7,9 @@
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
+import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
+import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.other.api.vo.CouponListVOVO;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
import com.ruoyi.account.service.TAppCouponService;
@@ -26,6 +29,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -53,6 +57,11 @@
private ChargingPileClient chargingPileClient;
@Autowired
private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private ChargingGunClient chargingGunClient;
+
+
/**
* 小程序扫一扫 添加车辆
* @param dto
@@ -71,8 +80,11 @@
*/
@ApiOperation(value = "通过桩编号获取电站详情", tags = {"小程序-扫一扫"})
@GetMapping(value = "/scan/siteInfo")
- public AjaxResult<SiteInfoVO> siteInfo(String number) {
- SiteInfoVO data = chargingPileClient.getSiteInfoByNumber(number).getData();
+ public AjaxResult<SiteInfoVO> siteInfo(Integer id) {
+ TChargingGun chargingGun = chargingGunClient.getChargingGunById(id).getData();
+ TChargingPile chargingPile = chargingPileClient.getChargingPileById(chargingGun.getChargingPileId()).getData();
+ SiteInfoVO data = chargingPileClient.getSiteInfoByNumber(chargingPile.getNumber().toString()).getData();
+ data.setChargingGunId(id);
List<TAppUserCar> cars = appUserCarService.list(new QueryWrapper<TAppUserCar>()
.eq("app_user_id",tokenService.getLoginUserApplet().getUserId())
.orderByDesc("create_time"));
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java
new file mode 100644
index 0000000..898a5eb
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java
@@ -0,0 +1,41 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.api.vo.GetAppUserVipDetail;
+import com.ruoyi.account.service.TAppUserVipDetailService;
+import com.ruoyi.common.core.domain.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/21 10:35
+ */
+@RestController
+@RequestMapping("/appUserVipDetail")
+public class TAppUserVipDetailController {
+
+ @Resource
+ private TAppUserVipDetailService appUserVipDetailService;
+
+ /**
+ * 获取用户当前有效的vip明细
+ * @param getAppUserVipDetail
+ * @return
+ */
+ @PostMapping("/getAppUserVipDetail")
+ public R<TAppUserVipDetail> getAppUserVipDetail(@RequestBody GetAppUserVipDetail getAppUserVipDetail){
+ TAppUserVipDetail one = appUserVipDetailService.getOne(new LambdaQueryWrapper<TAppUserVipDetail>()
+ .eq(TAppUserVipDetail::getAppUserId, getAppUserVipDetail.getAppUserId())
+ .eq(TAppUserVipDetail::getVipId, getAppUserVipDetail.getVipId())
+ .last(" and now() between start_time and end_time"));
+ return R.ok(one);
+ }
+
+
+}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index a93b658..b876d46 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -83,7 +83,7 @@
@ResponseBody
@GetMapping("/pageChargingPileList")
@ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
- public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(@RequestBody PageChargingPileList page){
+ public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(PageChargingPileList page){
PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
return AjaxResult.success(list);
}
@@ -162,5 +162,18 @@
PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
return AjaxResult.success(chargingGunMonitoring);
}
+
+
+ /**
+ * 根据id获取充电桩信息
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getChargingPileById/{id}")
+ public R<TChargingPile> getChargingPileById(@PathVariable Integer id){
+ TChargingPile chargingPile = chargingPileService.getById(id);
+ return R.ok(chargingPile);
+ }
}
diff --git a/ruoyi-service/ruoyi-order/pom.xml b/ruoyi-service/ruoyi-order/pom.xml
index aee7399..c3c837a 100644
--- a/ruoyi-service/ruoyi-order/pom.xml
+++ b/ruoyi-service/ruoyi-order/pom.xml
@@ -33,6 +33,10 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-chargingPile</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-payment</artifactId>
+ </dependency>
<!-- SpringCloud Alibaba Nacos -->
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index f20b8af..67c5090 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -10,20 +10,19 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TOrderEvaluate;
import com.ruoyi.order.api.query.TChargingCountQuery;
-import com.ruoyi.order.dto.GetMyChargingOrderList;
-import com.ruoyi.order.dto.GetNoInvoicedOrder;
-import com.ruoyi.order.dto.MyChargingOrderInfo;
-import com.ruoyi.order.dto.MyChargingOrderList;
-import com.ruoyi.order.dto.OrderEvaluateVo;
+import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.order.service.TOrderEvaluateTagService;
+import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
import java.util.List;
@@ -49,6 +48,12 @@
private TOrderEvaluateService orderEvaluateService;
@Autowired
private TOrderEvaluateTagService orderEvaluateTagService;
+
+ @Resource
+ private WxPaymentClient wxPaymentClient;
+
+
+
@ResponseBody
@PostMapping(value = "/addEvaluate")
@@ -145,5 +150,26 @@
return AjaxResult.success(list);
}
+
+
+ @ResponseBody
+ @PostMapping(value = "/paymentChargingOrder")
+ @ApiOperation(value = "支付充电充值费用", tags = {"小程序-扫一扫"})
+ public AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder){
+ return chargingOrderService.paymentChargingOrder(addChargingOrder);
+ }
+
+ /**
+ * 充电充值支付回调
+ * @param request
+ */
+ @ResponseBody
+ @PostMapping(value = "/chargingOrderWXCallback")
+ public void chargingOrderWXCallback(HttpServletRequest request){
+ Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
+
+
+ wxPaymentClient.ack();
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/AddChargingOrder.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/AddChargingOrder.java
new file mode 100644
index 0000000..eddec93
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/AddChargingOrder.java
@@ -0,0 +1,26 @@
+package com.ruoyi.order.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/8/20 13:54
+ */
+@Data
+@ApiModel
+public class AddChargingOrder {
+ @ApiModelProperty("充电枪id")
+ public Integer id;
+ @ApiModelProperty("支付金额")
+ private BigDecimal paymentAmount;
+ @ApiModelProperty("优惠券id")
+ private Long appUserCouponId;
+ @ApiModelProperty("车辆id")
+ private Long appUserCarId;
+ @ApiModelProperty("支付方式（1=微信，2=支付宝）")
+ private Integer paymentType;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index d4b0897..4e35d50 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -1,12 +1,10 @@
package com.ruoyi.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.dto.GetMyChargingOrderList;
-import com.ruoyi.order.dto.GetNoInvoicedOrder;
-import com.ruoyi.order.dto.MyChargingOrderInfo;
-import com.ruoyi.order.dto.MyChargingOrderList;
+import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -45,4 +43,23 @@
* @return
*/
List<MyChargingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query);
+
+
+ /**
+ * 充电支付
+ * @param addChargingOrder
+ * @return
+ */
+ AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder);
+
+
+ /**
+ * 支付成功后的回调处理逻辑
+ * @param paymentType 支付方式：1=微信，2=支付宝
+ * @param out_trade_no 业务流水号
+ * @param transaction_id 三方支付流水号
+ * @param attach 附加数据
+ * @return
+ */
+ AjaxResult chargingOrderCallback(Integer paymentType, String out_trade_no, String transaction_id, String attach);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index d22e59a..3f37d40 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -3,24 +3,32 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserVipDetailClient;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserCar;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.api.vo.GetAppUserVipDetail;
import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
-import com.ruoyi.order.dto.GetMyChargingOrderList;
-import com.ruoyi.order.dto.GetNoInvoicedOrder;
-import com.ruoyi.order.dto.MyChargingOrderInfo;
-import com.ruoyi.order.dto.MyChargingOrderList;
+import com.ruoyi.order.dto.*;
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import com.ruoyi.order.service.TChargingOrderService;
+import com.ruoyi.payment.api.feignClient.WxPaymentClient;
+import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
+import com.ruoyi.payment.api.vo.PaymentOrder;
+import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -29,6 +37,7 @@
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -55,6 +64,18 @@
@Resource
private TokenService tokenService;
+
+ @Resource
+ private WxPaymentClient wxPaymentClient;
+
+ @Resource
+ private ChargingPileClient chargingPileClient;
+
+ @Resource
+ private AppUserClient appUserClient;
+
+ @Resource
+ private AppUserVipDetailClient appUserVipDetailClient;
@@ -167,4 +188,123 @@
}
return list;
}
+
+
+ /**
+ * 充电支付
+ * @param addChargingOrder
+ * @return
+ */
+ @Override
+ @GlobalTransactional(rollbackFor = Exception.class)
+ public AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder) {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUser appUser = appUserClient.getUserById(userId).getData();
+ //查询待支付状态的订单，没有支付则删除订单
+ List<TChargingOrder> list = this.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserId, userId)
+ .eq(TChargingOrder::getRechargePaymentStatus, 1).eq(TChargingOrder::getDelFlag, 0));
+ for (TChargingOrder tChargingOrder : list) {
+ Integer rechargePaymentType = tChargingOrder.getRechargePaymentType();
+ if(1 == rechargePaymentType){
+ NotifyV3PayDecodeRespBody data = wxPaymentClient.queryOrderInfo(tChargingOrder.getCode()).getData();
+ if(null != data){
+ String trade_state = data.getTrade_state();
+ //支付失败，删除无效的订单
+ if(trade_state.equals("REFUND") || trade_state.equals("NOTPAY") || trade_state.equals("REVOKED") || trade_state.equals("PAYERROR")){
+ this.removeById(tChargingOrder.getId());
+ }
+ }
+ }
+ if(2 == rechargePaymentType){
+
+ }
+ }
+
+ //
+ TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, addChargingOrder.getId())
+ .in(TChargingOrder::getStatus, Arrays.asList(1, 2, 3)).eq(TChargingOrder::getDelFlag, 0));
+ if(null != one){
+ return AjaxResult.error("充电枪正在充电桩中，启动失败");
+ }
+ //查询当前充电枪是否有正在支付的订单
+ one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, addChargingOrder.getId())
+ .eq(TChargingOrder::getAppUserCarId, userId).eq(TChargingOrder::getRechargePaymentStatus, 1).eq(TChargingOrder::getDelFlag, 0));
+ if(null != one){
+
+ }
+
+
+ //构建新的待支付订单
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ TChargingOrder chargingOrder = new TChargingOrder();
+ String code = Math.random() * 1000 + sdf.format(new Date());
+ chargingOrder.setCode(code);
+ chargingOrder.setOrderType(1);
+ chargingOrder.setOrderClassification(1);
+ chargingOrder.setAppUserId(userId);
+ chargingOrder.setAppUserCarId(addChargingOrder.getAppUserCarId());
+ TChargingGun tChargingGun = chargingGunClient.getChargingGunById(addChargingOrder.getId()).getData();
+ chargingOrder.setSiteId(tChargingGun.getSiteId());
+ chargingOrder.setChargingPileId(tChargingGun.getChargingPileId());
+ chargingOrder.setChargingGunId(addChargingOrder.getId());
+ chargingOrder.setRechargePaymentType(addChargingOrder.getPaymentType());
+ chargingOrder.setRechargePaymentStatus(1);
+ chargingOrder.setRechargeAmount(addChargingOrder.getPaymentAmount());
+ chargingOrder.setAppCouponId(addChargingOrder.getAppUserCouponId());
+ if(null != appUser.getVipId()){
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(appUser.getId());
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ TAppUserVipDetail vipDetail = appUserVipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
+ if(null != vipDetail){
+ Integer chargeNum = vipDetail.getChargeNum();
+ if(0 > chargeNum){
+ chargingOrder.setVipDiscount(vipDetail.getDiscount());
+ BigDecimal discountAmount = addChargingOrder.getPaymentAmount().multiply((new BigDecimal(10)
+ .subtract(vipDetail.getDiscount())).divide(new BigDecimal(10))).setScale(4, BigDecimal.ROUND_HALF_EVEN);
+ chargingOrder.setVipDiscountAmount(discountAmount);
+ }
+ }
+
+ }
+ this.save(chargingOrder);
+ //会员优惠折扣将其计入增加充电时长（增加总充电金额）
+ //如果充电总金额未使用完，则需要退回费用=(原金额/总金额)*(总金额-实际充电金额)
+ if(1 == addChargingOrder.getPaymentType()){
+ PaymentOrder paymentOrder = new PaymentOrder();
+ paymentOrder.setCode(chargingOrder.getCode());
+ paymentOrder.setAmount(addChargingOrder.getPaymentAmount());
+ paymentOrder.setOpenId(appUser.getWxOpenid());
+ paymentOrder.setDescription("充电充值");
+ paymentOrder.setNotifyUrl("/order/t-charging-order/chargingOrderWXCallback");
+ Map<String, Object> data = wxPaymentClient.orderPay(paymentOrder).getData();
+ return AjaxResult.success(data);
+ }
+ if(2 == addChargingOrder.getPaymentType()){
+
+ }
+ throw new RuntimeException("无效的支付方式");
+ }
+
+
+ /**
+ * 支付成功后的回调处理逻辑
+ * @param paymentType 支付方式：1=微信，2=支付宝
+ * @param out_trade_no 业务流水号
+ * @param transaction_id 三方支付流水号
+ * @param attach 附加数据
+ * @return
+ */
+ @Override
+ public AjaxResult chargingOrderCallback(Integer paymentType, String out_trade_no, String transaction_id, String attach) {
+ TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, out_trade_no));
+ if(chargingOrder.getRechargePaymentStatus() == 2){
+ return AjaxResult.success();
+ }
+ chargingOrder.setRechargePaymentStatus(2);
+ chargingOrder.setRechargeSerialNumber(transaction_id);
+
+
+ return null;
+ }
}
diff --git a/ruoyi-service/ruoyi-payment/pom.xml b/ruoyi-service/ruoyi-payment/pom.xml
index 639a394..cb8466b 100644
--- a/ruoyi-service/ruoyi-payment/pom.xml
+++ b/ruoyi-service/ruoyi-payment/pom.xml
@@ -112,6 +112,11 @@
<artifactId>joda-time</artifactId>
<version>2.10.10</version>
</dependency>
+
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-payment</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
index 30c22cb..161e335 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/controller/WxPayController.java
@@ -1,9 +1,12 @@
package com.ruoyi.payment.wx.controller;
import com.fasterxml.jackson.core.type.TypeReference;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.payment.api.vo.PaymentOrder;
import com.ruoyi.payment.wx.enums.RefundEnum;
import com.ruoyi.payment.wx.model.WxPaymentRefundModel;
+import com.ruoyi.payment.wx.resp.NotifyV3PayDecodeRespBody;
import com.ruoyi.payment.wx.utils.WxV3Pay;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,6 +16,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.Map;
import java.util.Objects;
@@ -32,22 +36,22 @@
/**
* 按实际修改
*/
- @PostMapping("order")
+ @PostMapping("orderPay")
@ApiOperation("订单支付")
- public AjaxResult<Map<String, Object>> orderPay(@RequestParam Long orderId) {
+ public R<Map<String, Object>> orderPay(@RequestBody PaymentOrder paymentOrder) {
// 查询订单
// 0元订单不走支付
// 价格
- Integer totalPrice = 0;
+ Integer totalPrice = paymentOrder.getAmount().multiply(new BigDecimal(100)).intValue();
// 生成订单号
- String orderNo = "";
+ String orderNo = paymentOrder.getCode();
// 查询用户信息 用户openid
- String openId = "";
+ String openId = paymentOrder.getOpenId();
// 订单做修改
// 调用支付方法
- Map<String, Object> result = wxV3Pay.jsApi(orderNo, totalPrice, openId,"");
+ Map<String, Object> result = wxV3Pay.jsApi(orderNo, totalPrice, openId, paymentOrder.getNotifyUrl(),paymentOrder.getDescription());
log.info("支付参数：{}", result);
- return AjaxResult.ok(result);
+ return R.ok(result);
}
/**
@@ -80,31 +84,33 @@
* 支付回调
*/
@PostMapping("pay/notify")
- public void payNotify(HttpServletRequest request) throws IOException {
+ public R<Map<String, Object>> payNotify(HttpServletRequest request) throws Exception {
try {
- Map<String, Object> params = wxV3Pay.verifyNotify(request, new TypeReference<Map<String, Object>>() {
- });
+ Map<String, Object> params = wxV3Pay.verifyNotify(request, new TypeReference<Map<String, Object>>() {});
log.info("支付回调：{}", params);
- // 商户订单号
- String tradeNo = params.get("out_trade_no").toString();
- // 交易状态
- String trade_state = params.get("trade_state").toString();
- // 交易状态描述
- String trade_state_desc = params.get("trade_state_desc").toString();
- // 微信支付订单号
- String transaction_id = params.get("transaction_id").toString();
- // 支付完成时间
- // 时间不对的话，可以调用 WxTimeUtils.toRfc3339Date(success_time)转换一下
- String success_time = params.get("success_time").toString();
- // 附加数据
- Integer attach = Integer.parseInt(params.get("attach").toString());
- // TODO 业务处理
+ return R.ok(params);
} catch (Exception e) {
log.error("支付回调异常：{}", e, e);
wxV3Pay.ack(false, e.getMessage());
+ return R.fail("回调异常");
}
}
+
+ /**
+ * 支付回调成功后
+ */
+ @PostMapping("pay/ack")
+ public void ack(){
+ try {
+ wxV3Pay.ack();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
/**
* 退款回调
@@ -138,5 +144,17 @@
}
}
-
+
+ /**
+ * 查询订单信息
+ * @param orderId
+ * @return
+ */
+ @PostMapping("query/queryOrderInfo")
+ public R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId){
+ // todo 需要完善商户号
+ NotifyV3PayDecodeRespBody query = wxV3Pay.query(orderId, "");
+ return R.ok(query);
+ }
+
}
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java
index b76bbfd..2768601 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/utils/WxV3Pay.java
@@ -120,12 +120,13 @@
* @author xiaochen
* @date 2022-03-22 12:47
*/
- public Map<String, Object> jsApi(String tradeNo, Integer amount, String openid, String description) {
+ public Map<String, Object> jsApi(String tradeNo, Integer amount, String openid, String notify_url, String description) {
WxPaymentInfoModel requestBody = WxPaymentInfoModel.builder()
.mchid(this.config.getMchId())
.appid(this.config.getAppId())
.description(description)
.out_trade_no(tradeNo)
+ .notify_url(notify_url)
// .attach("")
.amount(WxPaymentInfoModel.Amount.builder().total(amount).build())
.payer(WxPaymentInfoModel.Payer.builder().openid(openid).build())
--
Gitblit v1.7.1