Merge branch 'master_activity' into base-modify

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

@@ -56,6 +56,7 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
     @Column(name = "return_gmv")
     private BigDecimal returnGmv;
 
+
     /**
      *  违约总额
      */
@@ -68,4 +69,5 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
     @Column(name = "total_expenditure")
     private BigDecimal totalExpenditure;
 
+
 }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityBm.java

@@ -61,6 +61,7 @@ public class ActivityBm {
     @ApiModelProperty("创建时间")
     private Long updTime;
 
+
     @Column(name = "is_del")
     @ApiModelProperty("是否删除：0-正常；1-删除")
     private Integer isDel;

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityShow.java

@@ -20,7 +20,6 @@ public class ActivityShow {
     @GeneratedValue(generator = "JDBC")
     private Integer id;
 
-
     @Column(name = "activity_id")
     @ApiModelProperty("活动id")
     private Integer activityId;

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/AccessType.java

+package com.xxfc.platform.summit.pojo;
+
+import lombok.Data;
+
+
+public enum AccessType {
+    BACKSTAGE(1, "后台管理页面"),
+    PUBLIC(2,"公众号")
+    ;
+
+    AccessType(int code, String mas) {
+    }
+
+    private Integer code;
+
+    private String mas;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMas() {
+        return mas;
+    }
+}

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/ActivityBmQuery.java

+package com.xxfc.platform.summit.pojo;
+
+import lombok.Data;
+
+@Data
+public class ActivityBmQuery extends Query {
+    private String  inviter;
+    private String  name;
+    private Integer  qdStatus;
+    private Integer activityId;
+
+}

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/pojo/ActivityQuery.java

@@ -10,4 +10,8 @@ public class ActivityQuery extends Query {
     private String title;
     private Long startTime;
     private Integer status;
+    /**
+     * 1.管理后台,2.h5页面
+     */
+    private Integer type;
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.mapper.ActivityMapper;
+import com.xxfc.platform.summit.pojo.AccessType;
 import com.xxfc.platform.summit.pojo.ActivityQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -20,27 +21,43 @@ import java.util.List;
 @Service
 public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
 
+    /**
+     * 未删除
+     */
      private Integer NOT_DELETE=0;
+    private Activity activity;
+    /**
+     * 已发布
+     */
+    private Integer PUBLISHED=1;
 
-    public PageInfo<Activity> getList(ActivityQuery query) {
+    public Object getList(ActivityQuery query) {
 
         Example exa= new Example(Activity.class);
         Example.Criteria criteria = exa.createCriteria();
         criteria.andEqualTo("isDel",NOT_DELETE );
         if (StringUtils.isNotBlank(query.getTitle())) {
-            criteria.andLike("title",query.getTitle());
+            criteria.andLike("title",String.format("%%%s%%",query.getTitle().trim()));
         }
         if (query.getStartTime()!=null) {
-            criteria.andGreaterThanOrEqualTo("startTime",query.getStartTime());
+            criteria.andLike("startTime",query.getStartTime()/1000+"%");
         }
         if (query.getStatus()!=null) {
-            criteria.andGreaterThanOrEqualTo("status",query.getStatus());
+            criteria.andEqualTo("status",query.getStatus());
+        }
+        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
+            criteria.andEqualTo("isPublish",PUBLISHED);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
+        if(AccessType.BACKSTAGE.getCode().equals(query.getType())){
+            return mapper.selectByExample(exa);
+        }
+
+
+
         PageHelper.startPage(query.getPage(),query.getLimit());
         List<Activity> activities = mapper.selectByExample(exa);
         return new PageInfo<Activity>(activities);
-
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -56,4 +73,33 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         }
 
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean add(Activity activity) {
+        try {
+            activity.setCrtTime(System.currentTimeMillis());
+            activity.setIsDel(0);
+            if (activity.getIsOpenBm()==null) {
+                activity.setIsOpenBm(0);
+            }
+            if (activity.getIsPublish()==null) {
+                activity.setIsPublish(0);
+            }
+            if (activity.getIsShow()==null) {
+                activity.setIsShow(0);
+            }
+            mapper.insertSelective(activity);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+    }
+
+    @Override
+    public void updateSelectiveById(Activity activity) {
+        activity.setUpdTime(System.currentTimeMillis());
+          mapper.updateByPrimaryKeySelective(activity);
+    }
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java

@@ -2,6 +2,9 @@ package com.xxfc.platform.summit.biz;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.constant.RestCode;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -10,6 +13,7 @@ import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.entity.ActivityBm;
 import com.xxfc.platform.summit.entity.User;
 import com.xxfc.platform.summit.mapper.ActivityBmMapper;;
+import com.xxfc.platform.summit.pojo.ActivityBmQuery;
 import com.xxfc.platform.summit.vo.MeepoActivityVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -223,5 +227,28 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
     }
 
 
+    public PageInfo<ActivityBm> list(ActivityBmQuery query) {
+         Example exa = new Example(ActivityBm.class);
+        Example.Criteria criteria = exa.createCriteria();
+        if (StringUtils.isNotBlank(query.getInviter())) {
+            criteria.andEqualTo("inviter",String.format("%%%s%%",query.getInviter().trim()));
+        }
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            criteria.andLike("name",String.format("%%%s%%",query.getName().trim()));
+        }
+
+        if (query.getQdStatus()!=null) {
+            criteria.andEqualTo("qdStatus",query.getQdStatus());
+        }
+        criteria.andEqualTo("isDel",0).andEqualTo("activityId",query.getActivityId());
+        exa.orderBy("crtTime").desc();
+        PageHelper.startPage(query.getPage(),query.getLimit());
+        List<ActivityBm> activityBms = mapper.selectByExample(exa);
+        return PageInfo.of(activityBms);
+    }
 
+    public ActivityBm userBm(ActivityBm activityBm, Integer id) {
+        return null;
+    }
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityShowBiz.java

 package com.xxfc.platform.summit.biz;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.summit.dto.ActivityShowDto;
+import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.entity.ActivityShow;
 import com.xxfc.platform.summit.mapper.ActivityShowMapper;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * @author Administrator
  */
 @Service
 public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
+
+    @Autowired
+    private ActivityBiz activityBiz;
+
+    public ActivityShowDto getOne(Integer activityId) {
+       return mapper.getOne(activityId);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean save(ActivityShowDto showDto) {
+        try {
+            ActivityShow activityShow = new ActivityShow();
+            BeanUtilsBean.getInstance().copyProperties(activityShow,showDto);
+            Activity activity = new Activity();
+            activity.setId(showDto.getActivityId());
+            activity.setBanner(showDto.getBanner());
+            if (showDto.getId()==null) {
+                mapper.insertSelective(activityShow);
+                activityBiz.updateSelectiveById(activity);
+            }else {
+                mapper.updateByPrimaryKeySelective(activityShow);
+                activityBiz.updateSelectiveById(activity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+        return true;
+    }
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/config/WebConfiguration.java

@@ -2,7 +2,7 @@ package com.xxfc.platform.summit.config;
 
 
 import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
-import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceoptor;
+import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -27,8 +27,8 @@ public class WebConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    WeChatH5LoginInterceoptor  getWeChatH5LoginRestInterceptor() {
-        return new WeChatH5LoginInterceoptor();
+    WeChatH5LoginInterceptor getWeChatH5LoginRestInterceptor() {
+        return new WeChatH5LoginInterceptor();
     }
 
     /**
@@ -38,7 +38,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     private ArrayList<String> getIncludePathPatterns() {
         ArrayList<String> list = new ArrayList<>();
         String[] urls = {
-                "/activity/**"
+                "/auth/activity/**"
         };
         Collections.addAll(list, urls);
         return list;

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityBmController.java

+package com.xxfc.platform.summit.controller;
+
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.summit.biz.ActivityBmBiz;
+import com.xxfc.platform.summit.biz.UserBiz;
+import com.xxfc.platform.summit.entity.ActivityBm;
+import com.xxfc.platform.summit.entity.User;
+import com.xxfc.platform.summit.pojo.ActivityBmQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("front/activityBm")
+public class ActivityBmController extends BaseController<ActivityBmBiz,ActivityBm> {
+
+
+    @Autowired
+    UserBiz userBiz;
+
+
+    @PostMapping("/add")
+    public ObjectRestResponse bm(@RequestBody ActivityBm activityBm, HttpServletRequest request){
+        User user=userBiz.getSession(request);
+        try {
+            return ObjectRestResponse.succ(baseBiz.userBm(activityBm,user.getId()));
+        }catch (Exception e){
+            e.printStackTrace();
+            return  ObjectRestResponse.createDefaultFail();
+        }
+
+    }
+
+
+    @PostMapping("/list")
+    public ObjectRestResponse getList( @RequestBody ActivityBmQuery query ){
+        return ObjectRestResponse.succ(baseBiz.list(query));
+    }
+
+
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
 
-    @PostMapping("/list")
+    @PostMapping("/app/unauth/list")
     public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
 
         return ObjectRestResponse.succ(baseBiz.getList(query));
@@ -30,6 +30,13 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
         return ObjectRestResponse.createDefaultFail();
     }
 
-
+    @Override
+    @PostMapping("/add")
+    public ObjectRestResponse add(@RequestBody Activity activity ){
+        if (baseBiz.add(activity)) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
 
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityShowController.java

 package com.xxfc.platform.summit.controller;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.summit.biz.ActivityBiz;
 import com.xxfc.platform.summit.biz.ActivityShowBiz;
+import com.xxfc.platform.summit.dto.ActivityShowDto;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.entity.ActivityShow;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author Administrator
@@ -14,5 +15,18 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/activityShow")
 public class ActivityShowController extends BaseController<ActivityShowBiz, ActivityShow> {
+    @GetMapping("/one/{activityId}")
+    public ObjectRestResponse getOne(@PathVariable Integer activityId){
 
+      return ObjectRestResponse.succ( baseBiz.getOne(activityId));
+    }
+
+
+    @PostMapping("/save")
+    public ObjectRestResponse save(@RequestBody ActivityShowDto showDto){
+         if (baseBiz.save(showDto)){
+             return ObjectRestResponse.succ();
+         }
+         return ObjectRestResponse.createDefaultFail();
+    }
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/dto/ActivityShowDto.java

+package com.xxfc.platform.summit.dto;
+
+import com.xxfc.platform.summit.entity.ActivityShow;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ActivityShowDto extends ActivityShow {
+    private String banner;
+}

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceoptor.java → xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceptor.java

@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  *
  */
 @Slf4j
-public class WeChatH5LoginInterceoptor extends HandlerInterceptorAdapter {
+public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 
 
 	@Autowired

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/mapper/ActivityShowMapper.java

 package com.xxfc.platform.summit.mapper;
 
+import com.xxfc.platform.summit.dto.ActivityShowDto;
 import com.xxfc.platform.summit.entity.ActivityShow;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -7,4 +8,6 @@ import tk.mybatis.mapper.common.Mapper;
  * @author Administrator
  */
 public interface ActivityShowMapper extends Mapper<ActivityShow> {
+
+    ActivityShowDto getOne(Integer activityId);
 }

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityShowMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.summit.mapper.ActivityShowMapper">
+    <select id="getOne" parameterType="Integer" resultType="com.xxfc.platform.summit.entity.ActivityShow">
+      	 SELECT
+	    	a.banner,
+	    	s.*
+      	FROM
+		fc_activity a
+	 	LEFT JOIN fc_activity_show s ON a.id = s.activity_id
+		WHERE
+		a.id =#{activityId}
+   </select>
+</mapper>
\ No newline at end of file