From 082b7025e5654be2d38a7caccfe714937217410b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 07 十一月 2023 14:22:33 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 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 cbdcf9a..e39623c 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
@@ -569,20 +569,23 @@
             coupon.setIllustrate(dataVo.getIllustrate());
             coupon.setDistributionMethod(dataVo.getDistributionMethod());
             coupon.setRedemptionMethod(dataVo.getExchangeMethod());
-            switch (dataVo.getExchangeMethod()){
-                case 1:
-                    coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
-                    break;
-                case 2:
-                    coupon.setCash(dataVo.getRequiredCash());
-                    coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
-                    break;
-                case 3:
-                    coupon.setCash(dataVo.getRequiredCash());
-                    break;
-                default:
-                    break;
+            if (dataVo.getExchangeMethod()!=null){
+                switch (dataVo.getExchangeMethod()){
+                    case 1:
+                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+                        break;
+                    case 2:
+                        coupon.setCash(dataVo.getRequiredCash());
+                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+                        break;
+                    case 3:
+                        coupon.setCash(dataVo.getRequiredCash());
+                        break;
+                    default:
+                        break;
+                }
             }
+
             coupon.setQuantityIssued(dataVo.getQuantityIssued());
             coupon.setPickUpQuantity(dataVo.getPickUpQuantity());
             coupon.setUseScope(dataVo.getCompany());
@@ -627,6 +630,21 @@
             }
 
             boolean save = couponService.save(coupon);
+            // 自动发券
+            if (dataVo.getDistributionMethod() == 3){
+                // 判断用户人群 再判断限领数量
+                switch (dataVo.getUserGroup()){
+                    case 1:
+
+                        break;
+                    case 2:
+
+                        break;
+                    case 3:
+
+                        break;
+                }
+            }
             if (save){
                 if (dataVo.getCompany() == 3){
                     String[] split = dataVo.getStoreIds().split(",");

--
Gitblit v1.7.1