Merge branch 'open_v2' into 'master'

恢复

See merge request !769
This commit is contained in:
2023-12-14 14:49:59 +08:00
@@ -70,9 +70,9 @@ public class SellTriggerServiceImpl implements TriggerService {
for (BSONObject object : bSONDocList) {
try {
ServerArea city = ServerAreaData.getServerAreaByDisplayDefaultNull(String.valueOf(object.get("city")));
// DistrictKey districtKey = new DistrictKey((String) object.get("city"), (String) object.get("region"),
// (String) object.get("district_name"));
// District district = districtMap.get(districtKey);
DistrictKey districtKey = new DistrictKey((String) object.get("city"), (String) object.get("region"),
(String) object.get("district_name"));
District district = districtMap.get(districtKey);
// if (district != null && district.getName() != null) {
// districtKey = new DistrictKey(district.getCity(), district.getRegion(),district.getName());
// }
@@ -156,16 +156,16 @@ public class SellTriggerServiceImpl implements TriggerService {
newObj.put("fitment", object.get("fitment"));
newObj.put("contact_people", object.get("contact_people"));
ScoreCalculatorInputData inputDate = new ScoreCalculatorInputData();
// if (district != null) {
// newObj.put("region", district.getRegion());
// if (StringUtils.isNotBlank(district.getBlock())) {
// newObj.put("block", district.getBlock());
// }
// if (district.getName() != null) {
// newObj.put("districtname_key", district.getName() + "_" + newObj.get("region") + "_" + object.get("city"));
// newObj.put("district_name", district.getName());
// }
// }
if (district != null) {
newObj.put("region", district.getRegion());
if (StringUtils.isNotBlank(district.getBlock())) {
newObj.put("block", district.getBlock());
}
if (district.getName() != null) {
newObj.put("districtname_key", district.getName() + "_" + newObj.get("region") + "_" + object.get("city"));
newObj.put("district_name", district.getName());
}
}
// newObj.put("if_school", 0);
// if (districtSchoolMap != null && districtSchoolMap.containsKey(districtKey)) {