From 800cb4c7c6c2a06ead61938b50d95f06c55e8bad Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Sun, 9 Aug 2020 13:05:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=AD=E4=B8=80=E7=AD=89=E5=A5=96=E6=95=B0?=
 =?UTF-8?q?=E8=AE=BE=E5=AE=9A=202.=E6=AD=A3=E5=BC=8F=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../say/service/impl/AwardListServiceImpl.java    | 15 ++++++++++++---
 .../bsd/say/service/impl/CouponServiceImpl.java   |  2 +-
 src/main/resources/application.yml                |  3 ++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
index fc07b3f..2e1bc9d 100644
--- a/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/AwardListServiceImpl.java
@@ -32,6 +32,8 @@ import java.util.List;
 public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, AwardList> implements AwardListService {
     @Value("${award.rule}")
     private Integer rule;
+    @Value("${award.amount}")
+    private Integer amount;
     @Resource
     private UsersMapper usersMapper;
     @Autowired
@@ -86,9 +88,16 @@ public class AwardListServiceImpl extends BaseServiceImpl<AwardListMapper, Award
                     awardList.setUpdateDateTime(new Date());
                     //中大奖
                     if (newAwardNumner % rule == 0){
-                        awardList.setAwardName("波司登羽绒服");
-                        awardList.setAwardType(1);
-                        ajaxResult.setRetmsg("恭喜中一等奖，羽绒服");
+                        if (newAwardNumner > rule * amount){
+                            logger.info("没一等奖了");
+                            awardList.setAwardName("波司登优惠券");
+                            awardList.setAwardType(2);
+                            ajaxResult.setRetmsg("恭喜中二等奖，优惠券");
+                        }else {
+                            awardList.setAwardName("波司登羽绒服");
+                            awardList.setAwardType(1);
+                            ajaxResult.setRetmsg("恭喜中一等奖，羽绒服");
+                        }
                     }else {
                         awardList.setAwardName("波司登优惠券");
                         awardList.setAwardType(2);
diff --git a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java b/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
index 355ceb3..6cb61a5 100644
--- a/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
+++ b/src/main/java/com/bsd/say/service/impl/CouponServiceImpl.java
@@ -192,7 +192,7 @@ public class CouponServiceImpl extends BaseServiceImpl<CouponMapper, Coupon> imp
                     //验证成功，领券
                     JSONObject request = new JSONObject();
                     request.put("mobileNo",phone);
-                    request.put("couponsGroupNo","Q00001326");
+                    request.put("couponsGroupNo","Q00004108");
                     String url = addCouponUrl + token;
                     try {
                         String result = HttpRequestUtils.sendPost(url,request);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 62d9dee..e45df54 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,6 +42,7 @@ server:
 
 award:
   rule: 5
+  amount: 2
 
 wechat:
   aesKey: r4cbRuIfbbnTIgJoQE33vJACJuoioZ5pRAhumITsP8O
@@ -59,7 +60,7 @@ bsd:
   tokenkey: BOSIDENG
   sendSource: BRAND_VERIFY_CODE
   verifySMSCodeUrl: http://vtest.bsd.cn/BSD_WXAPP/sysWeChat/verifySMSCode?token=
-  addCouponUrl: http://vtest.bsd.cn/BSD_WXAPP/miniProgram/addCoupon?token=
+  addCouponUrl: http://wxitf.bsd.cn/BSD_WXAPP/miniProgram/addCoupon?token=
 ### 上传文件路径
 #upload:
 #  excel: