From 2b9dd95a59836284b5df6d49de247354b340e8a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 18 九月 2025 15:47:41 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index fb252be..1b17a25 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -85,8 +85,7 @@
@Autowired
private TokenUtil tokenUtil;
private String smid = "2088330203191220";//平台支付宝商户号
- // todo 待申请
- private String smidVx = "2088330203191220";//平台微信商户号
+
/**
@@ -160,6 +159,13 @@
System.err.println("支付数据" + tPayHuimin);
payHuiminService.save(tPayHuimin);
BigDecimal bigDecimal = new BigDecimal(studentIds.split(",").length);
+ if (tPayHuimin.getSalesMoney().compareTo(BigDecimal.ZERO)==0){
+ // 零元购
+ tPayHuimin.setStatus(2);
+ tPayHuimin.setPaymentTime(new Date());
+ payHuiminService.updateById(tPayHuimin);
+ return ResultUtil.success();
+ }
switch (payType) {
case 1:
// todo 惠民卡收入属于平台商户 定死
@@ -169,7 +175,7 @@
// "/base/huimin/callBack/weixinPayHuiminCallback1",tPayHuimin.getSalesMoney().toString());
case 2:
String string = tPayHuimin.getSalesMoney().toString();
- return payMoneyUtil.alipay("2088670241691219", "购买玩湃惠民卡", "购买玩湃惠民卡", "", tPayHuimin.getCode(), string,
+ return payMoneyUtil.alipay(smid, "购买玩湃惠民卡", "购买玩湃惠民卡", "", tPayHuimin.getCode(), string,
"/base/huimin/callBack/aliPayHuiminCallback");
}
--
Gitblit v1.7.1