Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.kiisoo</groupId>
     <artifactId>ic</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>youke</name>
 
     <parent>

src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java

@@ -189,7 +189,7 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
             }
             saveSrc.setPromoterId(promoterId);
             saveSrc.setCaseId(config.getCaseId());
-            saveSrc.setCode(new SimpleHash("MD5", state).toHex());
+            saveSrc.setCode(state);
             saveSrc.setCreateTime(new Date());
             saveSrc.setExpiredTime(instanceVO.getEndTime());
             saveSrc.setInstanceId(instanceId);
@@ -201,14 +201,14 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
                 status = 2L;
             }
             saveSrc.setStatus(status);
-//            String url = storeEmployeeService.createActivityQrCode(staff.getStaffCode(), staff.getStoreCode(), 3, 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"; //测试用
-            }
+//            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"; //测试用
+//            }
             saveSrc.setQrCode(url);
-            pmnPromotionSrcService.saveCodeFile(url, new SimpleHash("MD5", state).toHex());
+            pmnPromotionSrcService.saveCodeFile(url, state);
             boolean save = pmnPromotionSrcService.saveOrUpdate(saveSrc);
             return saveSrc;
         } catch (Exception e) {

src/main/java/com/kiisoo/ic/customer/CustomerService.java

@@ -236,7 +236,7 @@ public class CustomerService {
         Long instanceId = Long.parseLong(strArr[1]);
         int type = Integer.parseInt(strArr[2]);
         Long promoterId = Long.parseLong(strArr[3]);
-        String code = new SimpleHash("MD5", eaCode).toHex();
+        String code = eaCode;
         PmnPromotionSrc src = pmnPromotionSrcService.getOne(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getCode, code));
         PmnActivityInstance instance = pmnActivityInstanceService.getById(instanceId);
         PoiStoreStaff storeStaff = poiStoreStaffDOMapper.selectOne(Wrappers.<PoiStoreStaff>lambdaQuery().eq(PoiStoreStaff::getStaffCode, turnBackDTOS.getUserId()));