Merge branch 'dev' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -88,7 +88,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             }else {
                 //判断用户是否有有效的上线
                 log.info("----userId==="+userId+"----bindTime===="+bindTime+"----relation.getBindTime()==="+relation.getBindTime());
-                if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&relation.getBindTime()<bindTime)){
+                if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&validTime>0&&relation.getBindTime()<bindTime)){
                     relation.setParentId(parentId);
                     relation.setBindType(type);
                     relation.setBindTime(time);

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/common/BehaviorEnum.java

@@ -16,7 +16,7 @@ public enum BehaviorEnum {
     /**
      * 立即前往（弹窗）
      */
-    DIALOG_WINDOW_TO(1, "立即前往(活动详情页)"),
+    DIALOG_WINDOW_TO(1, "立即前往(弹窗)"),
 
     /**
      * banner 点击
@@ -31,7 +31,7 @@ public enum BehaviorEnum {
     /**
      * 注册
      */
-    REGISTRY(4, "注册"),
+    REGISTRY(4, "成功注册"),
 
     /**
      * 活动页面访问量
@@ -46,7 +46,7 @@ public enum BehaviorEnum {
     /**
      * 分享
      */
-    SHARE(7, "分享"),
+    SHARE(7, "成功分享"),
 
     /**
      * App访问
@@ -61,7 +61,12 @@ public enum BehaviorEnum {
     /**
      * 成功邀请人数大于10
      */
-    SUCCESS_MORE_10_INVIT(10,"成功邀请人数大于10");
+    SUCCESS_MORE_10_INVIT(10,"成功邀请人数大于10"),
+
+    /**
+     * 立即领取(活动详情页)
+     */
+    IMMEDIATELY_TO_RECEIVE(11,"立即领取(活动详情页)");
 
     BehaviorEnum(int code, String name) {
         this.code = code;

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/ActivityBehaviorDTO.java

+package com.xxfc.platform.user.behavior.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:16
+ */
+@Data
+public class ActivityBehaviorDTO {
+    private Integer activityId;
+    private Integer behaviorTypeId;
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/ActivityBehaviorRelationDTO.java

+package com.xxfc.platform.user.behavior.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:05
+ */
+@Data
+public class ActivityBehaviorRelationDTO {
+
+
+    /**
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
+     * 行为类型
+     */
+    private Integer type;
+
+    /**
+     * 业务id (banner 精彩活动 app弹窗)
+     */
+    private Integer bizId;
+
+    /**
+     * 活动id
+     */
+    private Integer activityId;
+
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/dto/BehaviorTypeDTO.java

+package com.xxfc.platform.user.behavior.dto;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:16
+ */
+@Data
+public class BehaviorTypeDTO {
+    private String name;
+    private Integer code;
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/entity/ActivityBehavior.java

+package com.xxfc.platform.user.behavior.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:02
+ */
+@Data
+@Table(name = "activity_behavior")
+public class ActivityBehavior {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+    @Column(name = "activity_id")
+    private Integer activityId;
+    @Column(name = "behavior_type_id")
+    private Integer behaviorTypeId;
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/entity/ActivityBehaviorRelation.java

+package com.xxfc.platform.user.behavior.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:05
+ */
+@Data
+@Table(name = "activity_behavior_relation")
+public class ActivityBehaviorRelation {
+
+     @Id
+     @GeneratedValue(generator = "JDBC")
+      private Integer id;
+
+    /**
+     * @see com.xxfc.platform.user.behavior.common.BehaviorEnum
+     * 行为类型
+     */
+    private Integer type;
+
+    /**
+     * 业务id (banner 精彩活动 app弹窗)
+     */
+    @Column(name = "biz_id")
+    private Integer bizId;
+
+    /**
+     * 活动id
+     */
+    @Column(name = "activity_id")
+    private Integer activityId;
+
+}

xx-user-behavior-collect/xx-user-behavior-api/src/main/java/com/xxfc/platform/user/behavior/entity/BehaviorType.java

+package com.xxfc.platform.user.behavior.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:02
+ */
+@Data
+@Table(name = "behavior_type")
+public class BehaviorType {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "code")
+    private Integer code;
+}

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

+package com.xxfc.platform.user.behavior.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehavior;
+import com.xxfc.platform.user.behavior.mapper.ActivityBehaviorMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:10
+ */
+@Service
+public class ActivityBehaviorBiz extends BaseBiz<ActivityBehaviorMapper, ActivityBehavior> {
+
+       public List<ActivityBehaviorDTO> findActivityBehaviorsByActivityId(Integer activityId){
+           return  mapper.selectbyActivityId(activityId);
+       }
+}

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

+package com.xxfc.platform.user.behavior.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorRelationDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehaviorRelation;
+import com.xxfc.platform.user.behavior.mapper.ActivityBehaviorRelationMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:12
+ */
+@Service
+public class ActivityBehaviorRelationBiz extends BaseBiz<ActivityBehaviorRelationMapper, ActivityBehaviorRelation> {
+
+      public List<ActivityBehaviorRelationDTO> findActivityBehaviorRelationsByActivityId(Integer activityId){
+          return  mapper.selectAllByActivityId(activityId);
+      }
+}

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

+package com.xxfc.platform.user.behavior.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.user.behavior.dto.BehaviorTypeDTO;
+import com.xxfc.platform.user.behavior.entity.BehaviorType;
+import com.xxfc.platform.user.behavior.mapper.BehaviorTypeMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:09
+ */
+@Service
+public class BehaviorTypeBiz extends BaseBiz<BehaviorTypeMapper, BehaviorType> {
+
+       public List<BehaviorTypeDTO> findBehaviorTypesByIds(List<Integer> typeIds){
+           return mapper.selectAllByIdList(typeIds);
+       }
+
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/ActivityBehaviorMapper.java

+package com.xxfc.platform.user.behavior.mapper;
+
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehavior;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:10
+ */
+public interface ActivityBehaviorMapper extends Mapper<ActivityBehavior> {
+    @Select("select `activity_id`,`behavior_type_id` from `activity_behavior` where `activity_id`=#{activityId}")
+    @Results(value = {
+            @Result(column = "activity_id",property = "activityId"),
+            @Result(column = "behavior_type_id",property = "behaviorTypeId")
+    })
+    List<ActivityBehaviorDTO> selectbyActivityId(@Param("activityId") Integer activityId);
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/ActivityBehaviorRelationMapper.java

+package com.xxfc.platform.user.behavior.mapper;
+
+import com.xxfc.platform.user.behavior.dto.ActivityBehaviorRelationDTO;
+import com.xxfc.platform.user.behavior.entity.ActivityBehaviorRelation;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 17:11
+ */
+public interface ActivityBehaviorRelationMapper extends Mapper<ActivityBehaviorRelation> {
+
+    @Select("select `type`,`biz_id`,`activity_id` from `activity_behavior_relation` where `activity_id`=#{activityId}")
+    @Results(value = {
+            @Result(property = "type",column = "type"),
+            @Result(property = "bizId",column = "biz_id"),
+            @Result(property = "activityId",column = "activity_id")
+    })
+    List<ActivityBehaviorRelationDTO> selectAllByActivityId(@Param("activityId") Integer activityId);
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/BehaviorTypeMapper.java

+package com.xxfc.platform.user.behavior.mapper;
+
+import com.xxfc.platform.user.behavior.dto.BehaviorTypeDTO;
+import com.xxfc.platform.user.behavior.entity.BehaviorType;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.additional.idlist.IdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/13 14:13
+ */
+public interface BehaviorTypeMapper extends Mapper<BehaviorType>, IdListMapper<BehaviorType,Integer> {
+
+    @Select("<script>select `name`,`code` from  behavior_type where `id` in <foreach collection='typeIds' open='(' item='typeId' separator=',' close=')'> #{typeId}</foreach></script>")
+    @Results(value = {
+            @Result(column = "name",property = "name"),
+            @Result(column ="code",property = "code")
+    })
+    List<BehaviorTypeDTO> selectAllByIdList(@Param("typeIds") List<Integer> typeIds);
+}

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/mapper/CustomerBehaviorNotesMapper.java

@@ -16,4 +16,8 @@ import java.util.List;
 public interface CustomerBehaviorNotesMapper extends Mapper<CustomerBehaviorNotes> {
 
     List<CustomerBehaviorNotes> selectByActivityIdAndTime(@Param("activityId") Integer activityId,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
+
+    long selectAppVvisitsByType(@Param("code") int code);
+
+    List<CustomerBehaviorNotes> selectAllByTypeIdsAndTime(@Param("bizIds") List<Integer> bizIds,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
 }

xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/rest/CustomerBehaviorNotesController.java

@@ -21,13 +21,13 @@ import java.util.Objects;
  * @data 2019/8/12 14:14
  */
 @RestController
-@RequestMapping("customerBehaviorNotes")
+@RequestMapping("/customerBehaviorNotes")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class CustomerBehaviorNotesController {
 
     private final CustomerBehaviorNotesBiz customerBehaviorNotesBiz;
 
-    @PostMapping("app/unauth/save")
+    @PostMapping("/app/unauth/save")
     public ObjectRestResponse<Void> saveCustomerBehavior(@RequestBody CustomerBehaviorNoteDTO customerBehaviorNoteDTO, AppUserDTO appUserDTO) {
         if (Objects.nonNull(appUserDTO.getUserid())) {
             customerBehaviorNoteDTO.setCustomerId(String.valueOf(appUserDTO.getUserid()));

xx-user-behavior-collect/xx-user-behavior-server/src/main/resources/mapper/CustomerBehaviorNotesMapper.xml

@@ -26,4 +26,25 @@
             and <![CDATA[ `crt_time` <= #{endTime}]]>
         </if>
     </select>
+
+    <select id="selectAppVvisitsByType" resultType="long">
+        select count(id) from `customer_behavior_notes` where `type`=#{code}
+    </select>
+
+    <select id="selectAllByTypeIdsAndTime" resultMap="customerBehaviorNotesMap">
+        select * from  `customer_behavior_notes` where `type_id` in
+        <foreach collection="bizIds" item="bizId" open="(" close=")" separator=",">
+            #{bizId}
+        </foreach>
+        <if test="startTime != null != null and endTime !=null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and endTime == null">
+            and <![CDATA[`crt_time` >= #{startTime}]]>
+        </if>
+        <if test="endTime != null and startTime == null">
+            and <![CDATA[ `crt_time` <= #{endTime}]]>
+        </if>
+        and `type` in(0,1,2,3)
+    </select>
 </mapper>
\ No newline at end of file