Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/pom.xml

@@ -117,6 +117,14 @@
             <version>2.1.1</version>
         </dependency>
 
+        <!-- cache -->
+        <dependency>
+            <groupId>com.github.wxiaoqi</groupId>
+            <artifactId>ace-cache</artifactId>
+            <version>0.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
 

ace-common/src/main/java/com/ace/cache/parser/impl/DefaultResultParser.java

+package com.ace.cache.parser.impl;
+
+import com.ace.cache.parser.ICacheResultParser;
+import com.alibaba.fastjson.JSON;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 转map 有问题
+ */
+public class DefaultResultParser implements ICacheResultParser {
+    public DefaultResultParser() {
+    }
+
+    public Object parse(String value, Type type, Class<?>... origins) {
+        Object result = null;
+        if (type instanceof ParameterizedType) {
+            ParameterizedType parameterizedType = (ParameterizedType)type;
+            Type rawType = parameterizedType.getRawType();
+            if (((Class)rawType).isAssignableFrom(List.class)) {
+                result = JSON.parseArray(value, (Class)parameterizedType.getActualTypeArguments()[0]);
+            }else if(((Class)rawType).isAssignableFrom(Map.class)) {
+                Map transition = JSON.parseObject(value, Map.class);
+                transition.forEach((k, v) -> {
+                    transition.put(k, JSON.parseObject(v.toString(), (Class)parameterizedType.getActualTypeArguments()[1]));
+                });
+                result = transition;
+            }
+        } else if (origins == null) {
+            result = JSON.parseObject(value, (Class)type);
+        } else {
+            result = JSON.parseObject(value, origins[0]);
+        }
+
+        return result;
+    }
+}
\ No newline at end of file

ace-modules/ace-generator/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://10.5.52.3:3306/ag_admin_v1?useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://10.5.52.3:3306/xxfc_activity?useUnicode=true&characterEncoding=UTF-8
         username: root
         password: sslcloud123*()
     jackson:

ace-modules/ace-generator/src/main/resources/generator.properties

 #\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F
 
 #\u5305\u540D
-package=com.github.wxiaoqi.security.admin
+package=com.xxfc.platform.activity
 #\u4F5C\u8005
 author=libin
 #Email

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityList.java

+package com.xxfc.platform.activity.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 活动（活动列表）
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Data
+@Table(name = "activity_list")
+public class ActivityList implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  活动名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "活动名称")
+    private String name;
+	
+	    /**
+     *  活动开始时间
+     */
+    @Column(name = "start_time")
+	@ApiModelProperty(value = "活动开始时间")
+    private Long startTime;
+	
+	    /**
+     *  活动结束时间
+     */
+    @Column(name = "end_time")
+	@ApiModelProperty(value = "活动结束时间")
+    private Long endTime;
+	
+	    /**
+     *  人数限制 -1--无限制
+     */
+    @Column(name = "num_limit")
+	@ApiModelProperty(value = "人数限制 -1--无限制")
+    private Integer numLimit;
+	
+	    /**
+     *  已经参与人数
+     */
+    @Column(name = "has_join_num")
+	@ApiModelProperty(value = "已经参与人数")
+    private Integer hasJoinNum;
+	
+	    /**
+     *  当前状态 1--显示在活动页 2--隐藏
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "当前状态 1--显示在活动页 2--隐藏")
+    private Integer status;
+	
+	    /**
+     *  排序
+     */
+    @Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+    private Integer sort;
+	
+	    /**
+     *  活动图片
+     */
+    @Column(name = "picture")
+	@ApiModelProperty(value = "活动图片")
+    private Integer picture;
+	
+
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularize.java

+package com.xxfc.platform.activity.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 推广活动（邀请有礼）
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Data
+@Table(name = "activity_popularize")
+public class ActivityPopularize implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "名称")
+    private String name;
+	
+	    /**
+     *  描述、详情等（看情况使用）
+     */
+    @Column(name = "descr")
+	@ApiModelProperty(value = "描述、详情等（看情况使用）")
+    private String descr;
+	
+	    /**
+     *  奖励等 json数组格式 [{"type":1, "detail":{...}},...] //// type分类 1--现金；
+     */
+    @Column(name = "value")
+	@ApiModelProperty(value = "奖励等 json数组格式 [{\"type\":1, \"detail\":{...}},...] //// type分类 1--现金；")
+    private String value;
+	
+	    /**
+     *  当前活动的总需进度
+     */
+    @Column(name = "progress")
+	@ApiModelProperty(value = "当前活动的总需进度")
+    private Integer progress;
+	
+	    /**
+     *  推广活动类型 1--进度任务型
+     */
+    @Column(name = "type")
+	@ApiModelProperty(value = "推广活动类型 1--进度任务型")
+    private Integer type;
+	
+
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeItem.java

+package com.xxfc.platform.activity.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 推广活动项，一个活动对应多个项
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Data
+@Table(name = "activity_popularize_item")
+public class ActivityPopularizeItem implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "名称")
+    private String name;
+	
+	    /**
+     *  描述、详情等（看情况使用）
+     */
+    @Column(name = "descr")
+	@ApiModelProperty(value = "描述、详情等（看情况使用）")
+    private Integer descr;
+	
+	    /**
+     *  推广活动id
+     */
+    @Column(name = "popularize_id")
+	@ApiModelProperty(value = "推广活动id")
+    private Integer popularizeId;
+	
+	    /**
+     *  当前项代表的进度
+     */
+    @Column(name = "progress")
+	@ApiModelProperty(value = "当前项代表的进度")
+    private Integer progress;
+	
+	    /**
+     *  
+     */
+    @Column(name = "type")
+	@ApiModelProperty(value = "")
+    private Integer type;
+	
+
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeLog.java

+package com.xxfc.platform.activity.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Data
+@Table(name = "activity_popularize_log")
+public class ActivityPopularizeLog implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "名称")
+    private String name;
+	
+	    /**
+     *  描述、详情等（看情况使用）
+     */
+    @Column(name = "descr")
+	@ApiModelProperty(value = "描述、详情等（看情况使用）")
+    private String descr;
+	
+	    /**
+     *  推广活动id
+     */
+    @Column(name = "popularize_id")
+	@ApiModelProperty(value = "推广活动id")
+    private Integer popularizeId;
+	
+	    /**
+     *  用户id
+     */
+    @Column(name = "user_id")
+	@ApiModelProperty(value = "用户id")
+    private Integer userId;
+	
+	    /**
+     *  推广活动项id 
+     */
+    @Column(name = "item_id")
+	@ApiModelProperty(value = "推广活动项id ")
+    private Integer itemId;
+	
+
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeUser.java

+package com.xxfc.platform.activity.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户与推广活动（邀请有礼）的关系表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Data
+@Table(name = "activity_popularize_user")
+public class ActivityPopularizeUser implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "名称")
+    private String name;
+	
+	    /**
+     *  描述、详情等（看情况使用）
+     */
+    @Column(name = "descr")
+	@ApiModelProperty(value = "描述、详情等（看情况使用）")
+    private String descr;
+	
+	    /**
+     *  一共需要的进度
+     */
+    @Column(name = "end_progress")
+	@ApiModelProperty(value = "一共需要的进度")
+    private Integer endProgress;
+	
+	    /**
+     *  当前进度
+     */
+    @Column(name = "current_progress")
+	@ApiModelProperty(value = "当前进度")
+    private Integer currentProgress;
+	
+	    /**
+     *  推广活动id
+     */
+    @Column(name = "popularize_id")
+	@ApiModelProperty(value = "推广活动id")
+    private Integer popularizeId;
+	
+	    /**
+     *  已经完成了的项
+     */
+    @Column(name = "finish_item")
+	@ApiModelProperty(value = "已经完成了的项")
+    private String finishItem;
+	
+
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityListBiz.java

+package com.xxfc.platform.activity.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.activity.entity.ActivityList;
+import com.xxfc.platform.activity.mapper.ActivityListMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 活动（活动列表）
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Service
+public class ActivityListBiz extends BaseBiz<ActivityListMapper,ActivityList> {
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

+package com.xxfc.platform.activity.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.activity.entity.ActivityPopularize;
+import com.xxfc.platform.activity.mapper.ActivityPopularizeMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 推广活动（邀请有礼）
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Service
+public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,ActivityPopularize> {
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeItemBiz.java

+package com.xxfc.platform.activity.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
+import com.xxfc.platform.activity.mapper.ActivityPopularizeItemMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 推广活动项，一个活动对应多个项
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Service
+public class ActivityPopularizeItemBiz extends BaseBiz<ActivityPopularizeItemMapper,ActivityPopularizeItem> {
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeLogBiz.java

+package com.xxfc.platform.activity.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
+import com.xxfc.platform.activity.mapper.ActivityPopularizeLogMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Service
+public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMapper,ActivityPopularizeLog> {
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeUserBiz.java

+package com.xxfc.platform.activity.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
+import com.xxfc.platform.activity.mapper.ActivityPopularizeUserMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 用户与推广活动（邀请有礼）的关系表
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Service
+public class ActivityPopularizeUserBiz extends BaseBiz<ActivityPopularizeUserMapper,ActivityPopularizeUser> {
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityListMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.ActivityList;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 活动（活动列表）
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+public interface ActivityListMapper extends Mapper<ActivityList> {
+	
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPopularizeItemMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 推广活动项，一个活动对应多个项
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+public interface ActivityPopularizeItemMapper extends Mapper<ActivityPopularizeItem> {
+	
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPopularizeLogMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+public interface ActivityPopularizeLogMapper extends Mapper<ActivityPopularizeLog> {
+	
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPopularizeMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.ActivityPopularize;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 推广活动（邀请有礼）
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+public interface ActivityPopularizeMapper extends Mapper<ActivityPopularize> {
+	
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityPopularizeUserMapper.java

+package com.xxfc.platform.activity.mapper;
+
+import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户与推广活动（邀请有礼）的关系表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+public interface ActivityPopularizeUserMapper extends Mapper<ActivityPopularizeUser> {
+	
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityListController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.activity.biz.ActivityListBiz;
+import com.xxfc.platform.activity.entity.ActivityList;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("activityList")
+public class ActivityListController extends BaseController<ActivityListBiz,ActivityList> {
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.activity.biz.ActivityPopularizeBiz;
+import com.xxfc.platform.activity.entity.ActivityPopularize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("activityPopularize")
+public class ActivityPopularizeController extends BaseController<ActivityPopularizeBiz,ActivityPopularize> {
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeItemController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.activity.biz.ActivityPopularizeItemBiz;
+import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("activityPopularizeItem")
+public class ActivityPopularizeItemController extends BaseController<ActivityPopularizeItemBiz,ActivityPopularizeItem> {
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeLogController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.activity.biz.ActivityPopularizeLogBiz;
+import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("activityPopularizeLog")
+public class ActivityPopularizeLogController extends BaseController<ActivityPopularizeLogBiz,ActivityPopularizeLog> {
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeUserController.java

+package com.xxfc.platform.activity.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.activity.biz.ActivityPopularizeUserBiz;
+import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("activityPopularizeUser")
+public class ActivityPopularizeUserController extends BaseController<ActivityPopularizeUserBiz,ActivityPopularizeUser> {
+
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityListMapper.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.activity.mapper.ActivityListMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityList" id="activityListMap">
+        <result property="id" column="id"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="name" column="name"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="numLimit" column="num_limit"/>
+        <result property="hasJoinNum" column="has_join_num"/>
+        <result property="status" column="status"/>
+        <result property="sort" column="sort"/>
+        <result property="picture" column="picture"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPopularizeItemMapper.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.activity.mapper.ActivityPopularizeItemMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityPopularizeItem" id="activityPopularizeItemMap">
+        <result property="id" column="id"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="name" column="name"/>
+        <result property="descr" column="descr"/>
+        <result property="popularizeId" column="popularize_id"/>
+        <result property="progress" column="progress"/>
+        <result property="type" column="type"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPopularizeLogMapper.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.activity.mapper.ActivityPopularizeLogMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityPopularizeLog" id="activityPopularizeLogMap">
+        <result property="id" column="id"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="name" column="name"/>
+        <result property="descr" column="descr"/>
+        <result property="popularizeId" column="popularize_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="itemId" column="item_id"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPopularizeMapper.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.activity.mapper.ActivityPopularizeMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityPopularize" id="activityPopularizeMap">
+        <result property="id" column="id"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="name" column="name"/>
+        <result property="descr" column="descr"/>
+        <result property="value" column="value"/>
+        <result property="progress" column="progress"/>
+        <result property="type" column="type"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityPopularizeUserMapper.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.activity.mapper.ActivityPopularizeUserMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.activity.entity.ActivityPopularizeUser" id="activityPopularizeUserMap">
+        <result property="id" column="id"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="name" column="name"/>
+        <result property="descr" column="descr"/>
+        <result property="endProgress" column="end_progress"/>
+        <result property="currentProgress" column="current_progress"/>
+        <result property="popularizeId" column="popularize_id"/>
+        <result property="finishItem" column="finish_item"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file

xx-common/pom.xml

@@ -16,7 +16,6 @@
         <module>xx-common-platform</module>
         <module>xx-common-platform-web</module>
         <module>xx-common-platform-component</module>
-        <module>xx-common-demo</module>
     </modules>
 
 </project>
\ No newline at end of file

xx-common/xx-common-platform-component/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.xxfc.platform</groupId>
-    <artifactId>xx-common-platform-component</artifactId>
+    <artifactId>li</artifactId>
       <properties>
           <swagger.version>2.9.2</swagger.version>
       </properties>
@@ -51,5 +51,12 @@
              <version>${swagger.version}</version>
              <scope>provided</scope>
          </dependency>
+         <!-- cache -->
+         <dependency>
+             <groupId>com.github.wxiaoqi</groupId>
+             <artifactId>ace-cache</artifactId>
+             <version>0.0.2</version>
+             <scope>compile</scope>
+         </dependency>
      </dependencies>
 </project>
\ No newline at end of file

xx-common/xx-common-platform-component/src/main/java/com/ace/cache/parser/impl/DefaultResultParser.java

+package com.ace.cache.parser.impl;
+
+import com.ace.cache.parser.ICacheResultParser;
+import com.alibaba.fastjson.JSON;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 转map 有问题
+ */
+public class DefaultResultParser implements ICacheResultParser {
+    public DefaultResultParser() {
+    }
+
+    public Object parse(String value, Type type, Class<?>... origins) {
+        Object result = null;
+        if (type instanceof ParameterizedType) {
+            ParameterizedType parameterizedType = (ParameterizedType)type;
+            Type rawType = parameterizedType.getRawType();
+            if (((Class)rawType).isAssignableFrom(List.class)) {
+                result = JSON.parseArray(value, (Class)parameterizedType.getActualTypeArguments()[0]);
+            }else if(((Class)rawType).isAssignableFrom(Map.class)) {
+                Map transition = JSON.parseObject(value, Map.class);
+                transition.forEach((k, v) -> {
+                    transition.put(k, JSON.parseObject(value, (Class)parameterizedType.getActualTypeArguments()[1]));
+                });
+                result = transition;
+            }
+        } else if (origins == null) {
+            result = JSON.parseObject(value, (Class)type);
+        } else {
+            result = JSON.parseObject(value, origins[0]);
+        }
+
+        return result;
+    }
+}
\ No newline at end of file

xx-common/xx-common-platform-web/pom.xml

@@ -106,12 +106,6 @@
             <artifactId>ace-auth-client</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        <!-- 引用缓存开源项目 -->
-        <dependency>
-            <groupId>com.github.wxiaoqi</groupId>
-            <artifactId>ace-cache</artifactId>
-            <version>0.0.2</version>
-        </dependency>
 
         <!-- 其他 -->
         <dependency>

xx-common/xx-common-platform/pom.xml

@@ -25,12 +25,6 @@
             <groupId>com.github.wxiaoqi</groupId>
             <artifactId>ace-common</artifactId>
             <version>2.0-SNAPSHOT</version>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>tk.mybatis</groupId>-->
-<!--                    <artifactId>mapper</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

 package com.xxfc.platform.order.biz;
 
-import ch.qos.logback.core.rolling.TimeBasedFileNamingAndTriggeringPolicyBase;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -217,7 +216,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     vehicleFeign.unbookVehicle(orvd.getBookRecordId());
                 }else {
                     //未支付，拒绝之前的预约
-                    vehicleFeign.rejectVehicleBooking(orvd.getBookRecordId());
+                    vehicleFeign.rentRejectVehicleBooking(orvd.getBookRecordId());
                 }
 
                 //取消租车免费天数使用

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -27,6 +27,7 @@ import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,7 +41,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Service
-@Log4j
+@Slf4j
 public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicleBiz, RentVehicleBO> {
 
     private static BigDecimal DRIVER_PRICE;
@@ -87,6 +88,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
     public void initDictionary() {
         dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        log.info("out getAll4Map"+ System.currentTimeMillis());
         this.autoCancelTime = Long.valueOf(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ACT_RENT).getDetail());
         this.DRIVER_PRICE = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DRIVER_PRICE).getDetail());
         this.DAMAGE_SAFE = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DAMAGE_SAFE).getDetail());

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -6,6 +6,12 @@ public class DictionaryKey {
      * 订单类型
      */
     public static final String APP_ORDER ="APP_ORDER";
+
+    /**
+     * 支付
+     */
+    public static final String UNIVERSAL_PAY ="UNIVERSAL_PAY";
+
     /**
      *  租车，旅游退款
      */
@@ -29,4 +35,9 @@ public class DictionaryKey {
      */
     public static final String ACT_RENT = "ACT_RENT";
     public static final String ACT_TOUR = "ACT_TOUR";
+
+    /**
+     * 支付价格减低
+     */
+    public static final String PAY_DEMOTION = "PAY_DEMOTION";
 }

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/RedisKey.java

@@ -87,4 +87,11 @@ public class RedisKey {
      */
     public static final String MILEAGE_LAST_DAY_PREFIX ="mileage:last_day:";
 
+    /**
+     * 车辆预警，前一天检查的里程数redisKey前缀
+     */
+    public static final String CACHE_DICTIONARY_PREFIX ="cache:dictionary:";
+
+    public static final String CACHE_DICTIONARY_ALL =CACHE_DICTIONARY_PREFIX + "all:";
+    public static final String CACHE_DICTIONARY_ALL_MAP =CACHE_DICTIONARY_ALL + "map:";
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/DictionaryBiz.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.universal.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.google.common.collect.Lists;
@@ -17,6 +18,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static com.xxfc.platform.universal.constant.RedisKey.*;
+
 @Service
 @Slf4j
 public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
@@ -99,7 +102,7 @@ public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
         return dictionaryList;
     }
 
-    //@Cache()
+    @Cache(key = CACHE_DICTIONARY_ALL_MAP)
     public Map<String, Dictionary> getAll4Map(){
 //        List<Dictionary> dictionaries = this.getParentCommon(null);
         List<Dictionary> dictionaries = selectListAll();
@@ -111,6 +114,11 @@ public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
         return dictionaryMap;
     }
 
+    @CacheClear(pre = CACHE_DICTIONARY_PREFIX)
+    public void clear(){
+        ;
+    }
+
     public DictionaryVo buidTree(Dictionary dictionary) {
         DictionaryVo dictionaryVo = new DictionaryVo();
         if(dictionary.getPid() == 0) {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -7,18 +7,24 @@ import com.github.wxiaoqi.security.common.util.OrderUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
+import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.universal.weixin.api.WXPay;
 import com.xxfc.platform.universal.weixin.util.HTTPUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xxfc.platform.universal.entity.OrderPay;
 import com.xxfc.platform.universal.mapper.OrderPayMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 import java.util.List;
+import java.util.Map;
+
+import static com.xxfc.platform.universal.constant.DictionaryKey.PAY_DEMOTION;
+import static com.xxfc.platform.universal.constant.DictionaryKey.UNIVERSAL_PAY;
 
 /**
  * 订单支付
@@ -31,6 +37,8 @@ import java.util.List;
 @Slf4j
 public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
 
+    @Autowired
+    DictionaryBiz dictionaryBiz;
 
     public JSONObject preparepay( OrderPayVo orderPayVo) {
         if(null == orderPayVo) {
@@ -52,7 +60,9 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         //报名费回调路径
 
         //临时处理
-        amount = amount/100000;
+        Map<String, Dictionary> dictionaryMap = dictionaryBiz.getAll4Map();
+        Integer demotion = Integer.valueOf(dictionaryMap.get(UNIVERSAL_PAY+ "_"+ PAY_DEMOTION).getDetail());
+        amount = amount/demotion;
         if(amount <= 0) {
             amount = 1;
         }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderRefundBiz.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
+import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.entity.OrderPay;
 import com.xxfc.platform.universal.entity.OrderRefund;
 import com.xxfc.platform.universal.mapper.OrderRefundMapper;
@@ -19,6 +20,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 import java.util.List;
+import java.util.Map;
+
+import static com.xxfc.platform.universal.constant.DictionaryKey.PAY_DEMOTION;
+import static com.xxfc.platform.universal.constant.DictionaryKey.UNIVERSAL_PAY;
 
 /**
  * 订单支付退款表
@@ -36,6 +41,9 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
     @Value("${universal.cert}")
     private String APICLIENT_CERT ;
 
+    @Autowired
+    DictionaryBiz dictionaryBiz;
+
     //申请退款
     public JSONObject refund(OrderRefundVo orderRefundVo)throws Exception{
         if(orderRefundVo==null){
@@ -50,12 +58,14 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
         Integer refundAmount=orderRefundVo.getRefundAmount();
 
         //临时处理
-        payAmount = payAmount/100000;
+        Map<String, Dictionary> dictionaryMap = dictionaryBiz.getAll4Map();
+        Integer demotion = Integer.valueOf(dictionaryMap.get(UNIVERSAL_PAY+ "_"+ PAY_DEMOTION).getDetail());
+        payAmount = payAmount/demotion;
         if(payAmount <= 0) {
             payAmount = 1;
         }
 
-        refundAmount = refundAmount/100000;
+        refundAmount = refundAmount/demotion;
         if(refundAmount <= 0) {
             refundAmount = 1;
         }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/DictionaryController.java

 package com.xxfc.platform.universal.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.biz.DictionaryBiz;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -54,4 +55,12 @@ public class DictionaryController {
     public ObjectRestResponse<Map<String, Dictionary>> getAll4Map() {
         return ObjectRestResponse.succ(dictionaryBiz.getAll4Map());
     }
+
+    @GetMapping(value = "/app/unauth/clearCache")
+    @ApiOperation(value = "清除缓存")
+    @IgnoreUserToken
+    public ObjectRestResponse clearCache() {
+        dictionaryBiz.clear();
+        return ObjectRestResponse.succ();
+    }
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/VehicleConstant.java

@@ -3,4 +3,6 @@ package com.xxfc.platform.vehicle.constant;
 public class VehicleConstant {
     public static final Integer USER_SYS = -1;
     public static final Integer USER_APP = -2;
+
+    public static final String USER_APP_NAME = "APP用户";
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -37,9 +37,9 @@ public interface VehicleFeign {
     @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
     public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable Integer id);
 
-    //拒绝预约
-    @RequestMapping(value = "/vehicleInfo/book/4employee/reject/{bookRecordId}", method = RequestMethod.PUT)
-    public RestResponse<Integer> rejectVehicleBooking(@PathVariable Long bookRecordId);
+    //租车拒绝预约
+    @RequestMapping(value = "/vehicleInfo/rent/book/reject/{bookRecordId}", method = RequestMethod.PUT)
+    public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable Long bookRecordId);
 
     //取消预约
     @RequestMapping(value = "/vehicleInfo/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -47,6 +47,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
+import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP_NAME;
 
 @RestController
 @RequestMapping("/vehicleInfo")
@@ -239,6 +240,22 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName);
     }
 
+    /**
+     * 租车拒绝预定车辆申请
+     *
+     * @param bookRecordId
+     * @return
+     */
+    @RequestMapping(value = "/rent/book/reject/{bookRecordId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "租车拒绝预定车辆")
+    public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
+        //默认USER_APP 预约
+        Integer operatorId = USER_APP;
+        String userName = USER_APP_NAME;
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName);
+    }
+
+
 //    /**
 //     * 车辆归还
 //     * @param bookRecordId