Compare commits

..

No commits in common. 'a623318cb60a20178e2dc87ef16dd2b34ee97d14' and '090eff299f047766966d9a5412bd2c45cf9a83f6' have entirely different histories.

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

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

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

Loading…
Cancel
Save