Просмотр исходного кода

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
3e5ccedbb4
3 измененных файлов: 19 добавлений и 25 удалений
  1. +5
    -11
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java
  2. +1
    -1
      mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java
  3. +13
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java

+ 5
- 11
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java Просмотреть файл

@@ -130,7 +130,6 @@ public class WxCarTJDCallBackController extends BaseController {
wxCarCmdLog.setCreateDate(currentDate);
wxCarCmdLog.setUpdateDate(currentDate);

String tenantId = null;
WxPark parkQ = new WxPark();
parkQ.setVendorType(EnumCarVendor.CAR_TJD.getCode());
parkQ.setParkId(parkId);
@@ -141,7 +140,6 @@ public class WxCarTJDCallBackController extends BaseController {
map.put(TJDUtil.TJD_ERR_MSG, "车场未找到" + parkId);
return map;
} else {
tenantId = park.getTenantId();
wxCarCmdLog.updateTenantInfo(park);
}

@@ -159,7 +157,7 @@ public class WxCarTJDCallBackController extends BaseController {
if (StringUtils.isNotBlank(carNumber)) {
// 根据车牌查找用户
WxCUserCar userCarQ = new WxCUserCar();
userCarQ.setTenantId(tenantId);
userCarQ.updateTenantInfo(park);
userCarQ.setCarNumber(carNumber);
userCarQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode());
// TODO 可能多用户关联同一张车牌
@@ -182,7 +180,7 @@ public class WxCarTJDCallBackController extends BaseController {
try {
// 保存WxCarPayRecord
WxCarPayRecord record = new WxCarPayRecord();
record.setTenantId(tenantId);
record.updateTenantInfo(park);
record.setVendorType(wxCarCmdLog.getVendorType());
record.setSynId(tradeId);
record.setParkId(parkId);
@@ -193,7 +191,7 @@ public class WxCarTJDCallBackController extends BaseController {
}
record.setPhone(phoneStrs);
WxCarPayRecord query = new WxCarPayRecord();
query.setTenantId(tenantId);
query.updateTenantInfo(park);
query.setParkId(parkId);
query.setSynId(tradeId);
PageInfo<WxCarPayRecord> page = wxCarPayRecordService.findCarPayListByPage(query,1,1);
@@ -344,7 +342,6 @@ public class WxCarTJDCallBackController extends BaseController {
wxCarCmdLog.setCreateDate(currentDate);
wxCarCmdLog.setUpdateDate(currentDate);

String tenantId = null;
WxPark parkQ = new WxPark();
parkQ.setVendorType(EnumCarVendor.CAR_TJD.getCode());
parkQ.setParkId(parkId);
@@ -354,9 +351,6 @@ public class WxCarTJDCallBackController extends BaseController {
map.put(TJDUtil.TJD_IS_SUC, TJDUtil.TJD_ERR_1);
map.put(TJDUtil.TJD_ERR_MSG, "车场未找到" + parkId);
return map;
} else {
tenantId = park.getTenantId();
wxCarCmdLog.setTenantId(tenantId);
}

try {
@@ -371,7 +365,7 @@ public class WxCarTJDCallBackController extends BaseController {
try {
// 保存WxCarPayRecord
WxCarPayRecord record = new WxCarPayRecord();
record.setTenantId(tenantId);
record.updateTenantInfo(park);
record.setVendorType(wxCarCmdLog.getVendorType());
record.setParkId(parkId);
record.setParkName(parkName);
@@ -383,7 +377,7 @@ public class WxCarTJDCallBackController extends BaseController {
}

WxCarPayRecord query = new WxCarPayRecord();
record.setTenantId(tenantId);
record.updateTenantInfo(park);
record.setParkId(parkId);
record.setPlateNumber(carNumber);
query.setSynId(tradeId);


+ 1
- 1
mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java Просмотреть файл

@@ -76,7 +76,7 @@ public class WxDeviceScreenAdController extends BaseController {
if (wxDevice == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);
WxScreenAd wxScreenAd = new WxScreenAd();
wxScreenAd.setTenantId(wxDevice.getTenantId());
wxScreenAd.updateTenantInfo(wxDevice);
wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode());
PageInfo<WxScreenAd> page = wxScreenAdService.listAsPage(wxScreenAd,pageNum,pageSize);
page.getList().stream().forEach(s->{


+ 13
- 13
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java Просмотреть файл

@@ -328,7 +328,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
user.setScore(addScoreNumber);

// 3. 记录历史
recordScoreHistory(addScoreNumber, user.getTenantId(), user.getId(), EnumScoreType.LOGIN);
recordScoreHistory(addScoreNumber, user, user.getId(), EnumScoreType.LOGIN);

return addScoreNumber;
}
@@ -404,7 +404,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
updateScore(userCar.getCUserId(), addScoreNumber);

// 4. 记录历史
recordScoreHistory(addScoreNumber, userCar.getTenantId(), userCar.getCUserId(), EnumScoreType.BIND_CAR);
recordScoreHistory(addScoreNumber, userCar.getTenantInfo(), userCar.getCUserId(), EnumScoreType.BIND_CAR);
return addScoreNumber;
}

@@ -420,7 +420,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
updateScore(user.getId(), addScoreNumber);

// 4. 记录历史
recordScoreHistory(addScoreNumber, user.getTenantId(), user.getId(), EnumScoreType.WECHAT_PERSION);
recordScoreHistory(addScoreNumber, user, user.getId(), EnumScoreType.WECHAT_PERSION);
return addScoreNumber;
}

@@ -436,13 +436,13 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
updateScore(user.getId(), addScoreNumber);

// 4. 记录历史
recordScoreHistory(addScoreNumber, user.getTenantId(), user.getId(), EnumScoreType.WECHAT_PHONE);
recordScoreHistory(addScoreNumber, user, user.getId(), EnumScoreType.WECHAT_PHONE);
return addScoreNumber;
}

private int checkCompleteInfoScoreCount(WxCUser cUser) {
WxScoreHistory scoreHistory = new WxScoreHistory();
scoreHistory.setTenantId(cUser.getTenantId());
scoreHistory.updateTenantInfo(cUser);
scoreHistory.setCUserId(cUser.getId());
scoreHistory.setScoreType(EnumScoreType.COMPLETE_INFO.getCode());
return wxScoreHistoryMapper.countList(scoreHistory);
@@ -465,7 +465,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
updateScore(user.getId(), addScoreNumber);

// 4. 记录历史
recordScoreHistory(addScoreNumber, user.getTenantId(), user.getId(), EnumScoreType.COMPLETE_INFO);
recordScoreHistory(addScoreNumber, user, user.getId(), EnumScoreType.COMPLETE_INFO);
return addScoreNumber;
}

@@ -490,14 +490,14 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
if (userInfo.getPhone() != null) {
WxCUser wxCUser = new WxCUser();
wxCUser.setId(userInfo.getId());
wxCUser.setTenantId(userInfo.getTenantId());
wxCUser.updateTenantInfo(userInfo);
wxCUser.setPhone(userInfo.getPhone());
wxCUser.setScore(score);
wxCUserService.saveOrUpdate(wxCUser);;
}

// 2. 记录历史
recordReduceScoreHistory(scoreNum, reason, userInfo.getTenantId(), userInfo.getId(), EnumScoreType.MEM_REDUCE);
recordReduceScoreHistory(scoreNum, reason, userInfo.getTenantInfo(), userInfo.getId(), EnumScoreType.MEM_REDUCE);
return score;
}

@@ -505,7 +505,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
final IdWorker idWorker = IdWorker.get();
WxScoreHistory history = new WxScoreHistory();
history.setId(idWorker.nextId());
history.setTenantId(userInfo.getTenantId());
history.updateTenantInfo(userInfo);
history.setCUserId(userInfo.getId());
history.setCreateDate(new Date());
history.setScoreType(wechatPhone.getCode());
@@ -513,11 +513,11 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
wxScoreHistoryMapper.insert(history);
}

private void recordScoreHistory(int addScoreNumber, String tenantId, Long id, EnumScoreType wechatPhone) {
private void recordScoreHistory(int addScoreNumber, TenantEntity tenantEntity, Long id, EnumScoreType wechatPhone) {
final IdWorker idWorker = IdWorker.get();
WxScoreHistory history = new WxScoreHistory();
history.setId(idWorker.nextId());
history.setTenantId(tenantId);
history.updateTenantInfo(tenantEntity);
history.setCUserId(id);
history.setCreateDate(new Date());
history.setScoreType(wechatPhone.getCode());
@@ -542,11 +542,11 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
wxScoreHistoryMapper.insert(history);
}

private void recordReduceScoreHistory(int reduceScore, String reason, String tenantId, Long id, EnumScoreType wechatPhone) {
private void recordReduceScoreHistory(int reduceScore, String reason, TenantEntity tenantEntity, Long id, EnumScoreType wechatPhone) {
final IdWorker idWorker = IdWorker.get();
WxScoreHistory history = new WxScoreHistory();
history.setId(idWorker.nextId());
history.setTenantId(tenantId);
history.updateTenantInfo(tenantEntity);
history.setCUserId(id);
history.setCreateDate(new Date());
history.setScoreType(wechatPhone.getCode());


Загрузка…
Отмена
Сохранить