From d06dd2a58e463b0b66d2d4c9ae16b5c0866c9f74 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Wed, 27 May 2020 09:01:57 +0800
Subject: [PATCH] swagger mysql

---
 .../service/impl/PmnPromotionSrcServiceImpl.java       | 10 +++++-----
 .../java/com/kiisoo/ic/store/constant/Constants.java   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
index 4309305..8061f20 100644
--- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
@@ -169,15 +169,13 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
     public PmnPromotionSrc createCode(PoiStoreStaff staff, Long instanceId) {
         try {
             Long promoterId = staff.getUserId();
-            int type = 1;
             if (staff.getType().equals(1L)) {
                 promoterId = staff.getStoreId();
-                type = 0;
             }
             PmnPromotionSrc src = getOne(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getPromoterId, promoterId).eq(PmnPromotionSrc::getType, staff.getType()).eq(PmnPromotionSrc::getInstanceId, instanceId));
             ActivityInstanceVO instanceVO = pmnActivityInstanceService.getVO(instanceId);
             PmnActivityInstanceConfig config = pmnActivityInstanceConfigService.getOne(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, instanceId));
-            String state = Constants.ACTIVITY_QR_CODE_PREFIX + Constants.LINE + instanceId + Constants.LINE + type + Constants.LINE + promoterId;
+            String state = Constants.ACTIVITY_QR_CODE_PREFIX + Constants.LINE + instanceId + Constants.LINE + 3 + Constants.LINE + promoterId;
             PmnPromotionSrc saveSrc = new PmnPromotionSrc();
             if (src != null) {
                 saveSrc.setId(src.getId());
@@ -189,10 +187,12 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
             saveSrc.setExpiredTime(instanceVO.getEndTime());
             saveSrc.setInstanceId(instanceId);
             saveSrc.setIsAddition(2L); //是否要独立码:  1、默认 2、额外码
-            saveSrc.setType(staff.getType().equals(1L) ? 2L : 1L); //要注意,波司登接口是0门店1导购
+            saveSrc.setType(staff.getType().equals(1L) ? 2L : 1L); //要注意
             saveSrc.setUpdateTime(new Date());
             saveSrc.setStatus(1L);
-            String url = storeEmployeeService.createActivityQrCode(staff.getStaffCode(), staff.getStoreCode(), type, instanceId, promoterId);
+//            String url = storeEmployeeService.createActivityQrCode(staff.getStaffCode(), staff.getStoreCode(), 3, instanceId, promoterId);
+
+            String url = storeEmployeeService.createActivityQrCode("mayifei", staff.getStoreCode(), 3, instanceId, promoterId);
             if (url == null || url.length() <= 0) {
                 url = "https://wework.qpic.cn/wwpic/789548_SW5hhAm-TgyEW0F_1590128879/0"; //测试用
             }
diff --git a/src/main/java/com/kiisoo/ic/store/constant/Constants.java b/src/main/java/com/kiisoo/ic/store/constant/Constants.java
index de87374..33a137b 100644
--- a/src/main/java/com/kiisoo/ic/store/constant/Constants.java
+++ b/src/main/java/com/kiisoo/ic/store/constant/Constants.java
@@ -88,7 +88,7 @@ public class Constants {
     /**
      * 活动码
      */
-    public static final String BSD_REQ_QRCODE_TYPE_ACTIVITY = "2";
+    public static final String BSD_REQ_QRCODE_TYPE_ACTIVITY = "3";
 
     /**
      * 好友数0