From 37846a4861f32d0275250daf23aa371b164c7cf5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 07 八月 2023 17:25:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 633f8e0..ad22b06 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -376,7 +376,24 @@
Coupon coupon = new Coupon();
coupon.setName(dataVo.getCouponName());
coupon.setType(dataVo.getPrescription());
-// coupon.setContent(dataVo.getIllustrate());
+ HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+ switch (dataVo.getPrescription()){
+ case 1:
+ stringObjectHashMap.put("num1",dataVo.getCondition());
+ stringObjectHashMap.put("num2",dataVo.getSubtraction());
+ coupon.setContent(stringObjectHashMap.toString());
+ break;
+ case 2:
+ stringObjectHashMap.put("num1",dataVo.getDiscount());
+ coupon.setContent(stringObjectHashMap.toString());
+ break;
+ case 3:
+ stringObjectHashMap.put("num1",dataVo.getExperience());
+ coupon.setContent(stringObjectHashMap.toString());
+ break;
+ default:
+ break;
+ }
coupon.setIllustrate(dataVo.getIllustrate());
coupon.setDistributionMethod(dataVo.getDistributionMethod());
coupon.setRedemptionMethod(dataVo.getExchangeMethod());
--
Gitblit v1.7.1