记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit bfeef577 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改bug

parent cfd0961f
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 43 deletions
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantStationController.java
View file @ bfeef577
...@@ -147,7 +147,6 @@ public class MerchantStationController { ...@@ -147,7 +147,6 @@ public class MerchantStationController {
for (MerchantStationPerformanceVo r : voList) { for (MerchantStationPerformanceVo r : voList) {
List<String> permissionIds = authorizationPerformanceVoMap.getOrDefault(r.getPerformancesId(), defaultAuthorizationPerformanceVo).getPermissionIds(); List<String> permissionIds = authorizationPerformanceVoMap.getOrDefault(r.getPerformancesId(), defaultAuthorizationPerformanceVo).getPermissionIds();
r.setPermissionIds(StringUtils.join(permissionIds.toArray(), ".")); r.setPermissionIds(StringUtils.join(permissionIds.toArray(), "."));
r.setTicketTimeList(null);
MerchantAuthorizationPerformanceVo authorizationPerformanceVo = authorizationPerformanceVoMap.get(r.getPerformancesId()); MerchantAuthorizationPerformanceVo authorizationPerformanceVo = authorizationPerformanceVoMap.get(r.getPerformancesId());
if (authorizationPerformanceVo.getPermissionIds().contains(MerchantAuthorizationConst.PerformancePermission.SALES.getId())) { if (authorizationPerformanceVo.getPermissionIds().contains(MerchantAuthorizationConst.PerformancePermission.SALES.getId())) {
...@@ -158,6 +157,7 @@ public class MerchantStationController { ...@@ -158,6 +157,7 @@ public class MerchantStationController {
merchantStationService.salesStatisticsSetter(r, performanceTicketEntitiesVoList); merchantStationService.salesStatisticsSetter(r, performanceTicketEntitiesVoList);
} }
} }
r.setTicketTimeList(null);
} }
} else { } else {
voList.forEach(r -> { voList.forEach(r -> {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ bfeef577
...@@ -167,44 +167,48 @@ public class DataImpl { ...@@ -167,44 +167,48 @@ public class DataImpl {
MerchantFieldsVo vo = MerchantFieldsVo.getNew().copy(fields); MerchantFieldsVo vo = MerchantFieldsVo.getNew().copy(fields);
MerchantFieldApplies applies = new MerchantFieldApplies(); MerchantFieldApplies applies = new MerchantFieldApplies();
applies.setFieldApplyId(IDGenerator.nextSnowId()); MerchantFieldAppliesVo appliesVo = null;
applies.setApplyStatus(1); if (fields.getClaimStatus() != 0) {
applies.setUid(fields.getUid()); applies.setFieldApplyId(IDGenerator.nextSnowId());
applies.setFieldId(fields.getFieldId()); applies.setApplyStatus(1);
applies.setName(fields.getName()); applies.setUid(fields.getUid());
applies.setLogo(fields.getLogo()); applies.setFieldId(fields.getFieldId());
applies.setBackground(fields.getBackground()); applies.setName(fields.getName());
applies.setDescription(fields.getDescription()); applies.setLogo(fields.getLogo());
applies.setBuiltDate(fields.getBuiltDate()); applies.setBackground(fields.getBackground());
applies.setProvinceId(fields.getProvinceId()); applies.setDescription(fields.getDescription());
applies.setProvinceName(fields.getProvinceName()); applies.setBuiltDate(fields.getBuiltDate());
applies.setCityId(fields.getCityId()); applies.setProvinceId(fields.getProvinceId());
applies.setCityName(fields.getCityName()); applies.setProvinceName(fields.getProvinceName());
applies.setDistrictId(fields.getDistrictId()); applies.setCityId(fields.getCityId());
applies.setDistrictName(fields.getDistrictName()); applies.setCityName(fields.getCityName());
applies.setAddress(fields.getAddress()); applies.setDistrictId(fields.getDistrictId());
applies.setLongitude(fields.getLongitude()); applies.setDistrictName(fields.getDistrictName());
applies.setLatitude(fields.getLatitude()); applies.setAddress(fields.getAddress());
if (row.getInt("admin_id") == 0) { applies.setLongitude(fields.getLongitude());
applies.setApplyType("create"); applies.setLatitude(fields.getLatitude());
} else { if (row.getInt("admin_id") == 0) {
applies.setApplyType("claim"); applies.setApplyType("create");
applies.setContactName(row.getString("name")); } else {
applies.setContactEmail(row.getString("email")); applies.setApplyType("claim");
applies.setCompanyName(row.getString("enterprise_name")); applies.setContactName(row.getString("name"));
applies.setLicenseCode(row.getString("business_license")); applies.setContactEmail(row.getString("email"));
applies.setLicenseImg(row.getString("business_license_img")); applies.setCompanyName(row.getString("enterprise_name"));
applies.setLegalName(row.getString("legal_person")); applies.setLicenseCode(row.getString("business_license"));
applies.setLegalIdentity(row.getString("identity_card")); applies.setLicenseImg(row.getString("business_license_img"));
applies.setLegalIdentityObverse(row.getString("identity_card_img_front")); applies.setLegalName(row.getString("legal_person"));
applies.setLegalIdentityReverse(row.getString("identity_card_img_back")); applies.setLegalIdentity(row.getString("identity_card"));
applies.setLegalIdentityObverse(row.getString("identity_card_img_front"));
applies.setLegalIdentityReverse(row.getString("identity_card_img_back"));
}
applies.setCreatedAt(LocalDateTime.now());
appliesVo = MerchantFieldAppliesVo.getNew().copy(applies);
} }
applies.setCreatedAt(LocalDateTime.now());
MerchantFieldAppliesVo appliesVo = MerchantFieldAppliesVo.getNew().copy(applies);
//MYSQL //MYSQL
merchantFieldsMapper.insert(fields); merchantFieldsMapper.insert(fields);
merchantFieldAppliesMapper.insert(applies); if (fields.getClaimStatus() != 0) {
merchantFieldAppliesMapper.insert(applies);
}
//OTHER //OTHER
judgeFields(fields.getFieldId(), fields.getUid(), appliesVo, vo); judgeFields(fields.getFieldId(), fields.getUid(), appliesVo, vo);
//场地权限 //场地权限
...@@ -370,6 +374,7 @@ public class DataImpl { ...@@ -370,6 +374,7 @@ public class DataImpl {
//相关权限迁移 //相关权限迁移
public void checkTicket() { public void checkTicket() {
// initPermission("check", "585768981301944329909622", "201357233419837447752118", null, "王斐", "3065512271283404835770393", "18518013286");
try { try {
String sql = "select kcup.performance_id,kcu.mobile,kpr.merchant_id\n" + String sql = "select kcup.performance_id,kcu.mobile,kpr.merchant_id\n" +
"from kylin_check_user_performances kcup\n" + "from kylin_check_user_performances kcup\n" +
...@@ -420,18 +425,19 @@ public class DataImpl { ...@@ -420,18 +425,19 @@ public class DataImpl {
} }
private void judgeFields(String fieldId, String uid, MerchantFieldAppliesVo appliesVo, MerchantFieldsVo vo) { private void judgeFields(String fieldId, String uid, MerchantFieldAppliesVo appliesVo, MerchantFieldsVo vo) {
//MerchantFieldAppliesVo MONGO if (appliesVo != null) {
mongoTemplate.insert(appliesVo, MerchantFieldAppliesVo.class.getSimpleName()); //MerchantFieldAppliesVo MONGO
mongoTemplate.insert(appliesVo, MerchantFieldAppliesVo.class.getSimpleName());
//MerchantFieldAppliesVo MONGO
List<MerchantFieldAppliesVo> vos = new ArrayList();
vos.add(appliesVo);
redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
}
// MerchantFieldsVo MONGO // MerchantFieldsVo MONGO
Query query = Query.query(Criteria.where("fieldId").is(fieldId)); Query query = Query.query(Criteria.where("fieldId").is(fieldId));
Document document = (Document) mongoConverter.convertToMongoType(vo); Document document = (Document) mongoConverter.convertToMongoType(vo);
Update update = Update.fromDocument(document); Update update = Update.fromDocument(document);
mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName()); mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
//MerchantFieldAppliesVo MONGO
List<MerchantFieldAppliesVo> vos = new ArrayList();
vos.add(appliesVo);
redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
// MerchantFieldsVo REDIS // MerchantFieldsVo REDIS
redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD.concat(fieldId), vo); redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD.concat(fieldId), vo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment