From 4d3822eb3ed81df75db0d9244f196007611c0670 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Wed, 3 Jun 2020 10:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8,=E6=AC=A2=E8=BF=8E?=
 =?UTF-8?q?=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PmnPromotionSrcServiceImpl.java      | 24 ++++++++++++-------
 src/main/resources/application-dev.yml        |  1 +
 src/main/resources/application-prod.yml       |  3 ++-
 3 files changed, 19 insertions(+), 9 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 4b03baa..7acd7e5 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
@@ -35,6 +35,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.shiro.crypto.hash.SimpleHash;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,7 +77,8 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
     private IPmnPromotionSrcService pmnPromotionSrcService;
     @Autowired
     private IPmnActivityStoreRelationService pmnActivityStoreRelationService;
-
+    @Value("debug-staff-code")
+    private String debugStaffCode;
     @Override
     @Transactional
     public List<PromotionSrcVO> listUserCodes(Long userId) throws Exception {
@@ -108,13 +110,13 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
         for (PmnPromotionSrc src : srcs) {
             File codeFile = new File("activity/" + src.getCode() + ".png");
             if (!codeFile.exists() || src.getQrCode() == null) {
-//                String cpUserId = "mayifei";
-                    String cpUserId = staff.getStaffCode();
-                String url = "";
-                if (cpUserId != "mayifei") {
-                    url = storeEmployeeService.createActivityQrCode(cpUserId, staff.getStoreCode(), src.getType().intValue(), src.getInstanceId(), src.getPromoterId());
+                String cpUserId;
+                if(debugStaffCode == null || debugStaffCode == "") {
+                    cpUserId = staff.getStaffCode();
+                }else{
+                    cpUserId = debugStaffCode;
                 }
-                if(url == "") url = "https://wework.qpic.cn/wwpic/789548_SW5hhAm-TgyEW0F_1590128879/0";
+                String url = storeEmployeeService.createActivityQrCode(cpUserId, staff.getStoreCode(), src.getType().intValue(), src.getInstanceId(), src.getPromoterId());
                 saveCodeFile(url, src.getCode());
                 src.setQrCode(url);
                 updateById(src);
@@ -202,7 +204,13 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
                 status = 2L;
             }
             saveSrc.setStatus(status);
-            String url = storeEmployeeService.createActivityQrCode(staff.getStaffCode(), staff.getStoreCode(), 3, instanceId, promoterId);
+            String cpUserId;
+            if(debugStaffCode == null || debugStaffCode == "") {
+                cpUserId = staff.getStaffCode();
+            }else{
+                cpUserId = debugStaffCode;
+            }
+            String url = storeEmployeeService.createActivityQrCode(cpUserId, staff.getStoreCode(), 3, instanceId, promoterId);
 
 //            String url = storeEmployeeService.createActivityQrCode("mayifei", staff.getStoreCode(), 3, instanceId, promoterId);
 //            if (url == null || url.length() <= 0) {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 90c8dad..a1206f3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -59,6 +59,7 @@ bsd:
   qrCode: http://vtest.bsd.cn/BSD_WXAPP/qyWechat/getShareQRcode?token=
   userBehavior: http://vtest.bsd.cn/BSD_WXAPP/qyWechat/getUserBehaviorData?token=
   cancelQrCode: http://vtest.bsd.cn/BSD_WXAPP/qyWechat/cancelShareQRcode?token=
+debug-staff-code: mayifei
 
 
 
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 698e149..ad5ad20 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -52,4 +52,5 @@ bsd:
   vip: http://10.101.10.24:80/BSD_WXAPP/miniProgram/getMemberDtlByUnionId?token=
   qrCode: http://10.101.10.24:80/BSD_WXAPP/qyWechat/getShareQRcode?token=
   userBehavior: http://10.101.10.24:80/BSD_WXAPP/qyWechat/getUserBehaviorData?token=
-  cancelQrCode: http://10.101.10.24:80/BSD_WXAPP/qyWechat/cancelShareQRcode?token=
\ No newline at end of file
+  cancelQrCode: http://10.101.10.24:80/BSD_WXAPP/qyWechat/cancelShareQRcode?token=
+debug-staff-code: