Merge remote-tracking branch 'origin/dev' into dev

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BannerVo.java

@@ -11,7 +11,8 @@ import lombok.Data;
 @Data
 public class BannerVo {
 
-    private  String title;
+    private Long id;
+    private String title;
 
     /**
      * 封面地址

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -40,6 +40,7 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
             bannerVo.setCover(banner.getCover());
             bannerVo.setUrl(banner.getUrl());
             bannerVo.setTitle(banner.getTitle());
+            bannerVo.setId(banner.getId());
             bannerVos.add(bannerVo);
         });
         return bannerVos;

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/CustomerBehaviorNotesBiz.java

@@ -16,6 +16,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,10 +46,16 @@ public class CustomerBehaviorNotesBiz extends BaseBiz<CustomerBehaviorNotesMappe
 
     private final ActivityBehaviorRelationBiz activityBehaviorRelationBiz;
 
+    @Value("${activity.register.id}")
+    private Integer activityId;
+
     public void saveCustomerBehavior(CustomerBehaviorNoteDTO customerBehaviorNoteDTO) {
         CustomerBehaviorNotes customerBehaviorNotes = new CustomerBehaviorNotes();
         BeanUtils.copyProperties(customerBehaviorNoteDTO, customerBehaviorNotes);
         customerBehaviorNotes.setCrtTime(Instant.now().toEpochMilli());
+        if (customerBehaviorNoteDTO.getType()==BehaviorEnum.REGISTRY.getCode()){
+            customerBehaviorNotes.setTypeId(activityId);
+        }
         mapper.insertSelective(customerBehaviorNotes);
     }