From 4b22e543a050b9f8bf8bdab1f0f1e5a7ebbe75a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 18:09:49 +0800
Subject: [PATCH] 硬件回调
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 2 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html | 14 ++++++++++++++
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 1 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 8 ++++++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/vip/TCoupon.html | 1 +
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
index 32da855..f105e65 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -127,6 +127,7 @@
if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==1){
payStatus.add(3);
}
+ vipPaymentLambdaQueryWrapper.orderByDesc(VipPayment::getInsertTime);
List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
// 使用 Stream + 手动拷贝提升性能和可读性（或使用 MapStruct）
vipPaymentListVOS = list.stream().map(vipDetail -> {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 0998279..8c99b48 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -164,6 +164,8 @@
System.out.println(objectType);
model.addAttribute("item",coupon);
model.addAttribute("objectType",objectType);
+ List<PointsMerchandise> pointsMerchandises = client.goodsList();
+ model.addAttribute("goods",pointsMerchandises);
return PREFIX + "TCouponInfo.html";
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index edded2e..0080217 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -570,9 +570,13 @@
return null;
}
- public static void main(String[] args) {
+ public static void main(String[] args) throws Exception {
String blueS = "{\"vipDetail\":1,role\":1,\"time\":[{\"start_time\":\"2025-08-25 09:00:00\",\"end_time\":\"2025-08-30 23:00:00\"}]}";
-
+ MyQrCodeUtil.createCodeToFile(blueS);
+ BufferedImage blueImage = QRCodeUtil.createImage(blueS);
+ MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
+ String s = OssUploadUtil.ossUpload("img/", blueFile);
+ System.err.println(s);
}
@RequestMapping("/pre_add")
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html
index 2ebb330..e407d7c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html
@@ -92,6 +92,20 @@
<input class="col-sm-1" style="width: 35%" id="experienceName" name="name"
autocomplete="off" placeholder="请输入体验券名称" readonly>
</div>
+ <div class="form-group" style="display: flex" >
+ <input class="col-sm-1" name="prescription" type="radio" value="4"
+ onclick="radio4()"
+ style="margin-left: 24.7%;">
+ <label class="col-sm-1 control-label" style="margin-left: -1%;width: 14%;margin-top: -5px">抵扣券: </label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="goods" name="pCode" >
+ <option value="">请选择商品</option>
+ @for(obj in goods){
+ <option style="width: 35%" value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/vip/TCoupon.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/vip/TCoupon.html
index a8e81d3..1472ce8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/vip/TCoupon.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/vip/TCoupon.html
@@ -18,6 +18,7 @@
<option value="1">满减券</option>
<option value="2">折扣券</option>
<option value="3">体验券</option>
+ <option value="4">啊、抵扣券</option>
</#SelectCon>
</div>
<div class="col-sm-3">
--
Gitblit v1.7.1