1、解决es &符号问题

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/controller/app/luck/AppLuckLotteryController.java

@@ -41,4 +41,10 @@ public class AppLuckLotteryController {
         return success(BeanUtils.toBean(pageResult, LuckLotteryRespVO.class));
     }
 
+    @GetMapping("/get")
+    @Operation(summary = "获得幸运抽奖活动")
+    public CommonResult<LuckLotteryRespVO> get(@RequestParam("id") Long id) {
+        return success(BeanUtils.toBean(luckLotteryService.getLuckLottery(id), LuckLotteryRespVO.class));
+    }
+
 }

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/controller/app/luck/AppLuckPrizeController.java

@@ -46,4 +46,10 @@ public class AppLuckPrizeController {
         return success(luckPrizeService.getLuckPrizeExtendAreaMap(luckLottery.getId(), type, parentAreaId));
     }
 
+    @GetMapping("/get")
+    @Operation(summary = "根据活动id获取奖品")
+    public CommonResult<List<LuckPrizeDetailRespVO>> get(@RequestParam("lotteryId") Long lotteryId) {
+        return success(luckPrizeService.getByLotteryId(lotteryId));
+    }
+
 }

citu-module-mall/citu-module-promotion-biz/src/main/java/com/citu/module/promotion/service/luck/LuckPrizeServiceImpl.java

@@ -337,7 +337,7 @@ public class LuckPrizeServiceImpl implements LuckPrizeService {
             map.putAll(list.stream()
                     .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                     .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getProvinceName() != null)
-                    .collect(Collectors.groupingBy(k -> k.getExtend().getProvinceName())));
+                    .collect(Collectors.groupingBy(k -> k.getExtend().getProvinceId() + "," + k.getExtend().getProvinceName())));
         }
 
         if ("city".equals(type)) {
@@ -345,13 +345,13 @@ public class LuckPrizeServiceImpl implements LuckPrizeService {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getCityName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityId() + "," + k.getExtend().getCityName())));
             } else {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> parentAreaId.equals(luckPrizeDetailRespVO.getExtend().getProvinceId()))
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getCityName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getCityId() + "," + k.getExtend().getCityName())));
             }
         }
 
@@ -360,13 +360,13 @@ public class LuckPrizeServiceImpl implements LuckPrizeService {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getDistrictName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictId() + "," + k.getExtend().getDistrictName())));
             } else {
                 map.putAll(list.stream()
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend() != null)
                         .filter(luckPrizeDetailRespVO -> parentAreaId.equals(luckPrizeDetailRespVO.getExtend().getCityId()))
                         .filter(luckPrizeDetailRespVO -> luckPrizeDetailRespVO.getExtend().getDistrictName() != null)
-                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictName())));
+                        .collect(Collectors.groupingBy(k -> k.getExtend().getDistrictId() + "," + k.getExtend().getDistrictName())));
             }
         }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/ESConsumer.java

@@ -317,8 +317,11 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
     }
 
     public ESJobAdvertisedMergeDO build(ESJobAdvertisedMergeDO mergeDO, EnterpriseDO enterpriseDO) {
-        mergeDO.setEnterpriseName(enterpriseDO.getName());
-        mergeDO.setEnterpriseAnotherName(enterpriseDO.getAnotherName());
+        mergeDO.setName(replace(mergeDO.getName()));
+        mergeDO.setContent(replace(mergeDO.getContent()));
+        mergeDO.setRequirement(replace(mergeDO.getRequirement()));
+        mergeDO.setEnterpriseName(replace(enterpriseDO.getName()));
+        mergeDO.setEnterpriseAnotherName(replace(enterpriseDO.getAnotherName()));
         mergeDO.setIndustryId(enterpriseDO.getIndustryId());
         mergeDO.setLogoUrl(enterpriseDO.getLogoUrl());
         mergeDO.setScale(enterpriseDO.getScale());
@@ -336,4 +339,7 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
         return mergeDO;
     }
 
+    public String replace(String str) {
+        return str.replaceAll("&amp;", "&");
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -36,6 +36,7 @@ import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import com.citu.module.menduner.system.enums.sync.SyncConstants;
 import com.citu.module.menduner.system.mq.producer.ESProducer;
 import com.citu.module.menduner.system.mq.producer.GraphProducer;
+import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
@@ -80,7 +81,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Resource
     private JobAdvertisedExtendMapper extendMapper;
     @Resource
-    private EnterpriseMapper enterpriseMapper;
+    private EnterpriseService enterpriseService;
     @Resource
     private ESProducer esProducer;
     @Resource
@@ -463,7 +464,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         // 招聘会不做权益和额度扣除
         if (!fair) {
             // 如果发布职位的job.createTime超过了24小时则不可编辑,respVO.setEdit(false);
-            boolean isVip = enterpriseMapper.checkVip(existingJob.getEnterpriseId());
+            boolean isVip = enterpriseService.checkVip(existingJob.getEnterpriseId());
             if (!isVip && JobStatusEnum.ENABLE.getStatus().equals(existingJob.getStatus())
                     && ChronoUnit.HOURS.between(existingJob.getCreateTime(), LocalDateTime.now()) > 24) {
                 throw exception(MDE_JOB_ADVERTISED_TIME_ERROR_24);