Merge branch 'dev'

# Conflicts:
#	src/main/resources/mapper/TaRecommendCustomerMapper.xml

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.21</version>
+	<version>v3.5.29</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -56,7 +56,17 @@
 		<dependency>
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-miniapp</artifactId>
-			<version>3.6.0</version>
+			<version>3.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-mp</artifactId>
+			<version>3.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-pay</artifactId>
+			<version>3.8.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -129,6 +139,12 @@
 			<version>2.7.0</version>
 		</dependency>
 
+        <!-- aop 依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
 
 		<dependency>
 			<groupId>fadada</groupId>

src/main/java/com/huiju/estateagents/EstateagentsApplication.java

@@ -1,13 +1,11 @@
 package com.huiju.estateagents;
 
 import com.huiju.estateagents.websocket.ChatServer;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
 @SpringBootApplication
-@MapperScan("com.baomidou.mybatisplus.samples.quickstart.mapper")
 public class EstateagentsApplication {
 
 	public static void main(String[] args) {

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
@@ -140,3 +141,4 @@ public class BaseController {
         return taPersonBuildingList;
     }
 }
+

src/main/java/com/huiju/estateagents/bo/request/QrCodeStatisticResponseBO.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 二维码统计返回实体
+ *
+ * @author gusy
+ * @date 2020/5/21 13:53
+ */
+@Data
+public class QrCodeStatisticResponseBO {
+
+    /**
+     * 访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 新增用户
+     */
+    private Integer newPersons;
+
+}

src/main/java/com/huiju/estateagents/bo/request/SaveCzOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建充值订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveCzOrderRequestBO {
+
+    /**
+     * 充值金额
+     */
+    private Integer amount;
+}

src/main/java/com/huiju/estateagents/bo/request/SaveRefundOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建退款订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveRefundOrderRequestBO {
+
+    /**
+     * 退款金额
+     */
+    private Integer amount;
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthButtonController.java

@@ -36,7 +36,7 @@ public class TaUserAuthButtonController extends BaseController {
                                           @RequestParam("pageNum")Integer pageNum,
                                           @RequestParam("pageSize")Integer pageSize){
         Integer userId = getUserId(servletRequest);
-        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId.toString());
+        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId.toString(),getOrgId(servletRequest));
     }
 
 

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -287,7 +287,7 @@ public class TaUserController extends BaseController {
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
             ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
-            ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
+            ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
             QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
             taMiniappQueryWrapper.eq("org_id", getOrgId(request));
             TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthButtonService.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface ITaUserAuthButtonService extends IService<SysButtonInMenu> {
 
-    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId);
+    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
 
     ResponseBean getAllButton(Integer pageNum, Integer pageSize);
 

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthButtonServiceImpl.java

@@ -9,10 +9,15 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserAuthButtonMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.SysAdvancedConfigRelation;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaAdvancedController;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.mapper.SysAdvancedConfigRelationMapper;
+import com.huiju.estateagents.mapper.TaAdvancedControllerMapper;
 import com.huiju.estateagents.mapper.TaRoleButtonMapper;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author admin
@@ -38,11 +44,33 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
     private TaUserMapper taUserMapper;
     @Autowired
     private TaRoleMapper taRoleMapper;
+    @Autowired
+    private TaAdvancedControllerMapper taAdvancedControllerMapper;
+    @Autowired
+    private SysAdvancedConfigRelationMapper sysAdvancedConfigRelationMapper;
 
     @Override
-    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
-        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByUserId(userId);
+    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId) {
+        List<SysButtonInMenu> records = new ArrayList<>();
+        List<SysButtonInMenu> menuList = taUserAuthButtonMapper.sysButtonListByUserId(userId);
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type", CommConstant.ADVANCED_TYPE_BUTTON);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+        menuList.forEach(e -> {
+            sysAdvancedConfigRelations.forEach(s -> {
+                if ((e.getBtnId()).equals(Integer.valueOf(s.getTargetId()))){
+                    records.remove(e);
+                }
+            });
+        });
         return ResponseBean.success(records);
+
     }
 
     @Override

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -206,6 +206,17 @@ public class CommConstant {
      */
     public static final String BANNER_INDEX = "index";
 
+    /**
+     * 首屏广告_发布位置——项目
+     */
+    public static final String BANNER_BUILDING = "building";
+
+    //首页资讯
+    public static final String INDEX_NEWS = "indexNews";
+
+    //首页分享类型
+    public static final String IMG_TYPE = "imgType";
+
     //=================  首屏广告 / 轮播图 end =======================
 
     /**
@@ -541,6 +552,13 @@ public class CommConstant {
      */
     public static final String HOUSE = "house";
 
+
+    /**
+     * 首页分享
+     */
+    public static final String INDEX = "index";
+
+
     /**
      * 批量销售
      */
@@ -551,6 +569,11 @@ public class CommConstant {
      */
     public static final String LIVE = "live";
 
+    /**
+     * 红包类型标识
+     */
+    public static final String RED_PACKET = "RedPacket";
+
     /**
      * 系统参数  通知消息次时间间隔
      */
@@ -699,13 +722,11 @@ public class CommConstant {
 
     /**
      * 已经取消支付
-     *
      */
     public static final String PAY_STATUS_CANCEL = "cancel";
 
     /**
      * 支付超时
-     *
      */
     public static final String PAY_STATUS_TIMEOUT = "timeout";
 
@@ -719,6 +740,11 @@ public class CommConstant {
      */
     public static final Object ADVANCED_TYPE_MENU = "menu";
 
+    /**
+     * 菜单
+     */
+    public static final Object ADVANCED_TYPE_BUTTON = "button";
+
     /**
      * 线下缴费
      */
@@ -808,10 +834,76 @@ public class CommConstant {
 
     public static final String AUTO_UNAUTH_STATUS = "3001";
 
-    public static final String  AUTH_SUCCESS_DESC = "签章成功";
+    public static final String AUTH_SUCCESS_DESC = "签章成功";
 
     /**
      * 审核通过
      */
     public static final Integer STATUS_VERIFY_PASS = 4;
+
+    /**
+     * 充值操作
+     */
+    public static final String RECHARGE = "CZ";
+
+    /**
+     * 退款操作
+     */
+    public static final String REFUND = "TK";
+
+    /**
+     * 明细类型--充值
+     */
+    public static final String ITEM_TYPE_RECHARGE = "recharge";
+
+    /**
+     * 明细类型--退费
+     */
+    public static final String ITEM_TYPE_REFUND = "refund";
+
+    /**
+     * 明细类型--退费
+     */
+    public static final String ITEM_TYPE_REJECT = "reject";
+
+
+    /**
+     * 明细类型--红包
+     */
+    public static final String ITEM_TYPE_REDPACKAGE = "RedPacket";
+
+    /**
+     * 交易状态 成功
+     */
+    public static final String TRADING_STATUS_SUCCESS = "success";
+
+    /**
+     * 交易状态 失败
+     */
+    public static final String TRADING_STATUS_FAIL = "fail";
+
+    /**
+     * 交易状态 进行中
+     */
+    public static final String TRADING_STATUS_PROCESSING = "processing";
+
+    /**
+     * 人员类型---财务
+     */
+    public static final String FINANCE = "finance";
+
+    /**
+     * 审核状态-审核中
+     */
+    public static final String CHECK_STATUS_CHECKING = "checking";
+
+    /**
+     * 微信商户手续费率
+     */
+    public static final Double WXMCH_PAY_RATE = 0.01;
+
+    /**
+     * 微信商户手续费率-前端展示
+     */
+    public static final String WXMCH_PAY_RATE_STRING = "1%";
 }

src/main/java/com/huiju/estateagents/common/CommonUtils.java

@@ -1,5 +1,10 @@
 package com.huiju.estateagents.common;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -19,4 +24,63 @@ public class CommonUtils {
             return true;
         }
     }
+
+
+    /**
+     * 获取uuid
+     *
+     * @return
+     */
+    public static String getUUIDS() {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        return uuid;
+    }
+
+    /**
+     * 生成订单号
+     *
+     * @param tradeType
+     * @return
+     */
+    public static String generateTradeNo(String tradeType) {
+        String sdf = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+        int randNum = (int) (new Random().nextDouble() * (9999 - 1000 + 1)) + 1000;// 获取5位随机数
+        return tradeType + sdf + randNum;
+    }
+
+    /**
+     * 元转分
+     *
+     * @param money
+     * @return
+     */
+    public static Integer yuanToFen(Double money) {
+        Double moneyd = money * 100;
+        Integer moneyi = moneyd.intValue();
+        return moneyi;
+    }
+
+    /**
+     * 元转分
+     *
+     * @param money
+     * @return
+     */
+    public static Double fenToYuan(Integer money) {
+        return Double.parseDouble(BigDecimal.valueOf(Long.valueOf(money)).divide(new BigDecimal(100)).toString());
+    }
+
+    /**
+     * double减法运算,防止直接相减失去精度
+     *
+     * @param m1 减数
+     * @param m2 被减数
+     * @return
+     */
+    public static Double subDouble(double m1, double m2) {
+        BigDecimal p1 = new BigDecimal(Double.toString(m1));
+        BigDecimal p2 = new BigDecimal(Double.toString(m2));
+        return p1.subtract(p2).doubleValue();
+    }
+
 }

src/main/java/com/huiju/estateagents/common/MiniAppPageEnum.java

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.common;
+
+/**
+ * 小程序页面枚举
+ *
+ * @author gusy
+ * @date 2020/5/21 15:58
+ */
+public enum MiniAppPageEnum {
+
+    /**
+     * 项目
+     */
+    PROJECT("project", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/detail/index"),
+
+    /**
+     * 报名活动
+     */
+    ACTIVITY("activity", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/index"),
+
+    /**
+     * 助力活动
+     */
+    HELP("help", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assistance"),
+
+    /**
+     * 拼团活动
+     */
+    GROUP("group", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assemble"),
+
+    /**
+     * h5活动
+     */
+    H5("h5", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/h5Page"),
+
+    /**
+     * 直播活动
+     */
+    LIVE("live", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/live/index"),
+
+    /**
+     * 资讯
+     */
+    NEWS("news", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/news/detail/index"),
+
+    /**
+     * 在线选房
+     */
+    SALESBATCH("salesBatch", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/houseList/index");
+
+    private String type;
+    private String scene;
+    private String page;
+
+    MiniAppPageEnum(String type, String scene, String page) {
+        this.type = type;
+        this.scene = scene;
+        this.page = page;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getScene() {
+        return scene;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public static String getSceneByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getScene();
+            }
+        }
+        return null;
+    }
+
+    public static String getPageByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getPage();
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/huiju/estateagents/common/NumberUtils.java

@@ -1,4 +1,18 @@
 package com.huiju.estateagents.common;
 
+import java.math.BigDecimal;
+
 public class NumberUtils {
+    /**
+     * 元转分（乘以100）
+     * @param amount 金额 分（支持大数字，16位以上）
+     * @return
+     */
+    public static Integer yuanToFen(String amount){
+        return new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
+    }
+
+    public static String  fenToYuan(String price) {
+        return BigDecimal.valueOf(Long.valueOf(price)).divide(new BigDecimal(100)).toString();
+    }
 }

src/main/java/com/huiju/estateagents/common/StringUtils.java

@@ -26,7 +26,7 @@ public class StringUtils {
     }
 
     public static String ifNull(String src, String defaultVal) {
-        return null == src || "".equals(src) ? defaultVal : src;
+        return isEmpty(src) ? defaultVal : src;
     }
 
     public static String random(int length) {
@@ -69,4 +69,8 @@ public class StringUtils {
         }
         return returnStr;
     }
+
+    public static String strReplace(String objectStr){
+        return objectStr.replaceAll( "finance,|,finance|finance","");
+    }
 }

src/main/java/com/huiju/estateagents/common/WxQrCodeUtils.java

@@ -0,0 +1,33 @@
+package com.huiju.estateagents.common;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 微信二维码生成工具类
+ *
+ * @author gusy
+ * @date 2020/5/21 15:40
+ */
+public class WxQrCodeUtils {
+
+    /**
+     * 生成scene和页面
+     *
+     * @param type
+     * @param scene  为空则使用配置的通用模板
+     * @param params scene为空是必须按照模板内容填写
+     * @return
+     */
+    public static String generateSceneAndPage(String type, String scene, String... params) {
+        if (StringUtils.isBlank(scene)) {
+            String sceneTemplate = MiniAppPageEnum.getSceneByType(type);
+            scene = String.format(sceneTemplate, params);
+        }
+
+        JSONObject obj = new JSONObject();
+        obj.put("scene", scene);
+        obj.put("page", MiniAppPageEnum.getPageByType(type));
+        return obj.toJSONString();
+    }
+}

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.impl.HelpActivityServiceImpl;
@@ -110,7 +111,7 @@ public class ExtendContentController extends BaseController {
                 taBuildingQueryWrapper.eq("building_id", e.getBuildingId());
                 TaBuilding taBuilding = iTaBuildingService.getOne(taBuildingQueryWrapper);
                 e.setCityName(null == tdCity ? "" : tdCity.getName());
-                if (taBuilding != null){
+                if (taBuilding != null && e.getIsHaveActive()){
                     e.setBuildingName(taBuilding.getBuildingName());
                 }
             });
@@ -172,7 +173,7 @@ public class ExtendContentController extends BaseController {
         //一个城市只能有一个开屏广告
         boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
         if (!existFlag){
-            responseBean.addError("该城市已有开屏广告，请勿再次上架");
+            responseBean.addError("该发布位置已有开屏广告，请勿再次上架");
             return responseBean;
         }
 
@@ -251,7 +252,7 @@ public class ExtendContentController extends BaseController {
             //一个城市只能有一个开屏广告
             boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
             if (!existFlag){
-                responseBean.addError("该城市已有开屏广告，请勿再次上架");
+                responseBean.addError("该发布位置已有开屏广告，请勿再次上架");
                 return responseBean;
             }
 

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -17,6 +17,7 @@ import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.excel.PublicCustomerExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -457,8 +458,12 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
     })
     @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "help")
     public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,
-                                          @RequestParam(value = "initiateId",required = false) Integer initiateId,HttpServletRequest request) {
+                                          @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                          @RequestParam(value = "channelId", required = false) String channelId,
+                                          @RequestParam(value = "sceneId", required = false) String sceneId,
+                                          HttpServletRequest request, @RequestParam(value = "initiateId",required = false) Integer initiateId) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

src/main/java/com/huiju/estateagents/controller/IndexController.java

@@ -1,19 +1,28 @@
 package com.huiju.estateagents.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 微信首页
  */
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/api/wx")
 public class IndexController {
 
 
 
-
-
-
+    @PostMapping("/indexCustomer")
+    @ReportCustomer(type = "index")
+    public ResponseBean getPreloadData(@RequestParam(value = "id", required = false) String id,
+                                       @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                       @RequestParam(value = "channelId", required = false) String channelId,
+                                       @RequestParam(value = "sceneId", required = false) String sceneId,
+                                       HttpServletRequest request) {
+        return ResponseBean.success("success");
+    }
 
 }

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -12,6 +12,7 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.*;
@@ -22,7 +23,6 @@ import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -194,10 +194,10 @@ public class MiniAppController extends BaseController {
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
-        if (StringUtils.isBlank(code)) {
+        if (StringUtils.isEmpty(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        if (StringUtils.isBlank(appid)) {
+        if (StringUtils.isEmpty(appid)) {
             return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -254,8 +254,8 @@ public class MiniAppController extends BaseController {
             // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
 //            ExecutorService threadPool = Executors.newCachedThreadPool();
 //            threadPool.execute(() -> {
-////                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
-//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
+////                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender)) {
 //                    // 校验是否点击过此人的分享
 //                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
 //                    if (checkPoint) {
@@ -265,7 +265,7 @@ public class MiniAppController extends BaseController {
 //                }
 //            });
 
-            if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
+            if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
                 taSharePersonFrom.setCreateDate(LocalDateTime.now());
@@ -509,12 +509,18 @@ public class MiniAppController extends BaseController {
         String targetId = params.getString("targetId");
         // 目标名称
         String targetName = params.getString("targetName");
-        // 推广用户
+        // 推广用户 - 分享人
         String promoter = params.getString("promoter");
+        // 置业顾问
+        String consultantPersonId = request.getHeader("x-consultant");
+        // 渠道ID
+        String channelId = params.getString("channelId");
+        // 推广码ID
+        String qrCodeId = params.getString("qrCodeId");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
-        if (null == phoneNoInfo || com.huiju.estateagents.common.StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
+        if (null == phoneNoInfo || StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
             ResponseBean.error("解析用户手机号码出错", ResponseBean.ERROR_UNAVAILABLE);
         }
 
@@ -522,21 +528,32 @@ public class MiniAppController extends BaseController {
         Integer orgId = getOrgId(request);
         String phone = phoneNoInfo.getPhoneNumber();
 
+        TaCustomerFrom customerFrom = new TaCustomerFrom();
+        customerFrom.setTargetType(targetType);
+        customerFrom.setTargetId(targetId);
+        customerFrom.setTargetName(targetName);
+        customerFrom.setOrgId(orgId);
+        customerFrom.setSceneId(sceneId);
+        if (!StringUtils.isEmpty(channelId)) {
+            customerFrom.setChannelId(Integer.valueOf(channelId));
+        }
+        if (!StringUtils.isEmpty(qrCodeId)) {
+            customerFrom.setQrCodeId(Integer.valueOf(qrCodeId));
+        }
+
         try {
             taPersonService.authPhone(
                     orgId,
                     openid,
                     phone,
                     buildingId,
-                    sceneId,
-                    targetType,
-                    targetId,
-                    targetName,
-                    promoter);
+                    promoter,
+                    consultantPersonId,
+                    customerFrom);
 
             return ResponseBean.success(phoneNoInfo);
         } catch (Exception e) {
-//           e.printStackTrace();
+           e.printStackTrace();
             return ResponseBean.error("授权手机失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -11,6 +11,7 @@ import com.huiju.estateagents.entity.TaOrg;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
@@ -355,7 +356,12 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "building")
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -19,6 +19,7 @@ import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -272,7 +273,11 @@ public class TaBuildingDynamicController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
     })
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "activity")
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "sceneId", required = false) String sceneId,
                                              HttpServletRequest request){
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/controller/TaChannelController.java

@@ -1,41 +1,34 @@
 package com.huiju.estateagents.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import io.swagger.annotations.ApiOperation;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaBuildingReport;
 import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.excel.ActivityStatistics.*;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.TaChannelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import org.apache.http.HttpRequest;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-
-import java.time.LocalDateTime;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**
@@ -260,4 +253,170 @@ public class TaChannelController extends BaseController {
         ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
         return taPerson;
     }
+
+    /**
+     * 渠道引进客户统计
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introductionList")
+    public ResponseBean getChannelIntroductionList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                                     @RequestParam(value = "targetType", required = false)String targetType,
+                                                     @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                     @RequestParam(value = "channelId") Integer channelId,
+                                                     @RequestParam(value = "sortField", required = false) String sortField,
+                                                     @RequestParam(value = "sortOrder", required = false) String sortOrder,
+                                                     HttpServletRequest request) {
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder, getTaPersonBuildingListByUserId(request));
+    }
+
+    /**
+     * 渠道注册用户列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/newuserList")
+    public ResponseBean getNewuserList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                       @RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                       HttpServletRequest request) {
+        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 渠道访问次数列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/visitNumList")
+    public ResponseBean getVisitNumList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                       @RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                       HttpServletRequest request) {
+        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+
+    /**
+     * 渠道访问人数列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/personNumList")
+    public ResponseBean getPersonNumList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                        @RequestParam(value = "targetId", required = false) String targetId,
+                                        @RequestParam(value = "targetType", required = false) String targetType,
+                                        @RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                         @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                        HttpServletRequest request) {
+        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 渠道引进客户统计导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introductionListExport")
+    public void getChannelIntroductionListExport(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                                         @RequestParam(value = "targetType", required = false)String targetType,
+                                                         @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                         @RequestParam(value = "channelId") Integer channelId,
+                                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=引进注册用户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TsChannelDaily.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("引进注册用户").build();
+        List<TsChannelDaily> data = taChannelService.getChannelIntroductionListExport(getOrgId(request), startDate, endDate, targetType, buildingId, channelId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 渠道注册用户列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/newuserListExport")
+    public void getNewuserListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                       HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=注册用户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelAddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("注册用户").build();
+        List<ChannelAddRegistNum> data =  taChannelService.getNewuserListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 渠道访问次数列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/visitNumListExport")
+    public void getVisitNumListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                        @RequestParam(value = "targetType", required = false) String targetType,
+                                        @RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                      @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                      @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                        HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=访问次数.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("访问次数").build();
+        List<ChannelVisitNum> data = taChannelService.getVisitNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+
+    /**
+     * 渠道访问人数列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/personNumListExport")
+    public void getPersonNumListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                         @RequestParam(value = "targetType", required = false) String targetType,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                         HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=访问人数.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("访问人数").build();
+        List<ChannelVisitPersonNum> data = taChannelService.getPersonNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaCustomImgController.java

@@ -8,7 +8,6 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaCustomImg;
 import com.huiju.estateagents.service.ITaCustomImgService;
-import org.apache.commons.codec.language.DaitchMokotoffSoundex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -82,9 +82,34 @@ public class TaCustomImgController extends BaseController {
                 return responseBean;
             }
 
-            taCustomImg.setOrgId(getOrgId(request));
             taCustomImg.setStatus(CommConstant.STATUS_NORMAL);
-            if (iTaCustomImgService.save(taCustomImg)){
+            taCustomImg.setOrgId(getOrgId(request));
+
+            List<TaCustomImg> taCustomImgs = new ArrayList<>();
+            taCustomImgs.add(taCustomImg);
+            if (CommConstant.IMG_TYPE.equals(taCustomImg.getImgType())){
+                TaCustomImg customImg = new TaCustomImg();
+                customImg.setCreateTime(LocalDateTime.now());
+                customImg.setUpdateTime(LocalDateTime.now());
+                customImg.setOrgId(getOrgId(request));
+                customImg.setStatus(CommConstant.STATUS_NORMAL);
+                customImg.setImgUrl("https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg");
+                customImg.setImgType(CommConstant.BANNER_INDEX);
+                customImg.setImgDesc("小程序首页分享配图");
+                taCustomImgs.add(customImg);
+            }
+            if (CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType())){
+                TaCustomImg customImg = new TaCustomImg();
+                customImg.setCreateTime(LocalDateTime.now());
+                customImg.setUpdateTime(LocalDateTime.now());
+                customImg.setOrgId(getOrgId(request));
+                customImg.setStatus(CommConstant.STATUS_NORMAL);
+                customImg.setImgUrl("http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png");
+                customImg.setImgType(CommConstant.INDEX_NEWS);
+                customImg.setImgDesc("首页资讯logo");
+                taCustomImgs.add(customImg);
+            }
+            if (iTaCustomImgService.saveBatch(taCustomImgs)){
                 responseBean.addSuccess(taCustomImg);
             }else {
                 responseBean.addError("fail");

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -244,9 +245,14 @@ public class TaHousingResourcesController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
+    @ReportCustomer(type = "house")
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source,
-                                             HttpServletRequest request) {
+                                             @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "sceneId", required = false) String sceneId,
+                                             HttpServletRequest request,
+                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source
+                                             ) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaLiveActivityService;
 import org.slf4j.Logger;
@@ -51,18 +52,23 @@ public class TaLiveActivityController extends BaseController {
      * @param buildingId        所属楼盘
      * @param liveDetailType    详情类型 0是模板，1是自定义
      * @param status            状态
+     * @param source            查询来源，1:直播等活动，2:开屏广告
      * @param request
      * @return
      */
     @RequestMapping(value = "/admin/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                           String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                           String liveActivityTitle,
+                                           String cityId,
+                                           String buildingId,
+                                           Integer status,
+                                           @RequestParam(value = "source", defaultValue = "1") Integer source,
                                            HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request));
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request), source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -160,8 +166,8 @@ public class TaLiveActivityController extends BaseController {
                 iExtendContentService.updateBatchById(list);
             }
 
-            if(!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())){
-                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html",""));
+            if (!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())) {
+                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
             }
 
             if (iTaLiveActivityService.updateById(taLiveActivity)) {
@@ -221,7 +227,12 @@ public class TaLiveActivityController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taLiveActivity/{id}", method = RequestMethod.GET)
-    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "live")
+    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id,
+                                                  @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                                  @RequestParam(value = "channelId", required = false) String channelId,
+                                                  @RequestParam(value = "sceneId", required = false) String sceneId,
+                                                  HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaLiveActivityService.getLiveActivityDetailById(id, getOrgId(request));
@@ -248,14 +259,18 @@ public class TaLiveActivityController extends BaseController {
     @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                     String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                                     String liveActivityTitle,
+                                                     String cityId,
+                                                     String buildingId,
+                                                     Integer status,
+                                                     @RequestParam(value = "source", defaultValue = "1") Integer source,
                                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null, null);
+                    liveActivityTitle, cityId, buildingId, status, null, null, source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

src/main/java/com/huiju/estateagents/controller/TaNewsController.java

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -215,7 +216,12 @@ public class TaNewsController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsGet(@PathVariable Integer id,HttpServletRequest request){
+    @ReportCustomer(type = "news")
+    public ResponseBean wxTaNewsGet(@PathVariable Integer id,
+                                    @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                    @RequestParam(value = "channelId", required = false) String channelId,
+                                    @RequestParam(value = "sceneId", required = false) String sceneId,
+                                    HttpServletRequest request){
         String openid = getOpenId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -783,4 +783,16 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/wx/userInfo/updatePhoto")
+    public ResponseBean updateUserPhoto(@RequestBody Map<String, String> photoUrl, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+
+        String openId = getOpenId(request);
+        String imgUrl = photoUrl.get("photoUrl");
+        if (StringUtils.isEmpty(imgUrl)){
+            responseBean.addError("请上传图片");
+            return responseBean;
+        }
+        return taPersonService.updateUserPhoto(imgUrl, openId);
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java

@@ -0,0 +1,244 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.service.ITaQrcodeService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 二维码管理表 前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@RestController
+@RequestMapping("/api")
+public class TaQrcodeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaQrcodeController.class);
+
+    @Autowired
+    public ITaQrcodeService iTaQrcodeService;
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/admin/listQrCode", method = RequestMethod.GET)
+    public ResponseBean listQrCodeByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                              String targetType, String targetName, Integer channelId, String buildingId,
+                                              HttpServletRequest request) {
+        logger.info("接收参数：targetType：{}，targetName：{}，channelId：{}，buildingId：{}",
+                targetType, targetName, channelId, buildingId);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getUserId(request), getOrgId(request), personBuildingList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taQrcode 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taQrcode", method = RequestMethod.POST)
+    public ResponseBean saveQrcode(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验参数
+            if (StringUtils.isBlank(taQrcode.getTargetId()) || StringUtils.isBlank(taQrcode.getTargetType())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+            responseBean = iTaQrcodeService.saveQrcode(taQrcode, getUserId(request), getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("saveQrcode -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taQrcode/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taQrcodeDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaQrcodeService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/qrCode/batchDelete", method = RequestMethod.DELETE)
+    public ResponseBean batchDelete(@RequestBody List<TaQrcode> taQrcodeList) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            taQrcodeList.stream().forEach((record) -> {
+                record.setStatus(CommConstant.STATUS_DELETE);
+            });
+
+            responseBean.addSuccess(iTaQrcodeService.updateBatchById(taQrcodeList));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 修改对象
+     *
+     * @param id       实体ID
+     * @param taQrcode 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taQrcode/{id}", method = RequestMethod.PUT)
+    public ResponseBean taQrcodeUpdate(@PathVariable Integer id,
+                                       @RequestBody TaQrcode taQrcode) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaQrcodeService.updateById(taQrcode)) {
+                responseBean.addSuccess(taQrcode);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/taQrcode/{id}", method = RequestMethod.GET)
+    public ResponseBean taQrcodeGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaQrcodeService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取二维码统计信息
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/qrCode/getStatisticData", method = RequestMethod.GET)
+    public ResponseBean getStatisticData(Integer qrCodeId, HttpServletRequest request) {
+        logger.info("getStatisticData 接收参数：qrCodeId：{}", qrCodeId);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaQrcodeService.getStatisticData(qrCodeId, getOrgId(request));
+            logger.info("getStatisticData 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("getStatisticData 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取二维码统计信息记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param qrCodeId
+     * @param type     1：访问人数，2：访问次数，3：新增注册用户数
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecord", method = RequestMethod.GET)
+    public ResponseBean getStatisticRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           Integer qrCodeId, Integer type, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaQrcodeService.getStatisticRecord(type, pageNum, pageSize, qrCodeId, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getStatisticRecord 异常：", e);
+            responseBean.addError("fail");
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecordExport", method = RequestMethod.GET)
+    public void getStatisticRecordExport(@RequestParam(value = "qrCodeId") Integer qrCodeId,
+                                         @RequestParam(value = "type") Integer type, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        try {
+            iTaQrcodeService.getStatisticRecordExport(type, qrCodeId, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("getStatisticRecordExport 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+}
+
+

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -7,23 +7,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
-import com.huiju.estateagents.entity.TaRaiseInvite;
 import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
+import com.huiju.estateagents.service.ITdCityService;
 import com.huiju.estateagents.service.impl.TaRaiseInviteServiceImpl;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Array;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -848,6 +848,8 @@ public class TaRecommendCustomerController extends BaseController {
                                       @RequestParam(value = "customerType") String customerType,
                                       @RequestParam(value = "status", required = false) Integer status,
                                       @RequestParam(value = "sceneType", required = false) String sceneType,
+                                      @RequestParam(value = "startCreateDate", required = false) String startCreateDate,
+                                      @RequestParam(value = "endCreateDate", required = false) String endCreateDate,
                                       @RequestParam(value = "belongStatus", required = false) Integer belongStatus) throws IOException { // public 公  private 私
 
         //        response.setContentType("application/vnd.ms-excel");
@@ -876,7 +878,9 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-            List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, getTaPersonBuildingListByUserId(request), belongStatus);
+            List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize,
+                    buildingId, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, getTaPersonBuildingListByUserId(request),
+                    belongStatus, startCreateDate, endCreateDate);
             excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;
@@ -898,7 +902,9 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PrivateCustomerExport> privateList = null;
 //            do {
-            List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, sceneType, getTaPersonBuildingListByUserId(request));
+            List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode * pageSize, pageSize,
+                    buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, sceneType, startCreateDate,
+                    endCreateDate, getTaPersonBuildingListByUserId(request));
             excelWriter.write(privateList, writeSheet);
 
 //                pageCode ++;
@@ -978,35 +984,37 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 校验此职业顾问下有没有私客存在
+     *
      * @return
      */
     @GetMapping("/admin/consultant/customer/list")
     public ResponseBean consultantCustomerList(@RequestParam(value = "userId") Integer userId,
                                                @RequestParam(value = "personId") String personId,
                                                @RequestParam(value = "buildingId") String buildingId,
-                                               HttpServletRequest request){
+                                               HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        try{
-            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId,personId,buildingId,orgId,getTaPersonBuildingListByUserId(request));
+        try {
+            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId, personId, buildingId, orgId, getTaPersonBuildingListByUserId(request));
             return ResponseBean.success(list);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 迁移私客到新的置业顾问
+     *
      * @return
      */
     @PutMapping("/admin/consultant/customer/move")
-    public ResponseBean moveConsultantCustomer(@RequestBody List<TaRecommendCustomer> list,HttpServletRequest request){
-        try{
+    public ResponseBean moveConsultantCustomer(@RequestBody List<TaRecommendCustomer> list, HttpServletRequest request) {
+        try {
             taRecommendCustomerService.updateBatchById(list);
             return ResponseBean.success(list);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 }

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
@@ -360,8 +361,13 @@ public class TaShareActivityController extends BaseController {
      * @param groupActivityId  实体ID
      */
     @RequestMapping(value="/wx/taShareActivity/{groupActivityId}",method= RequestMethod.GET)
+    @ReportCustomer(type = "group")
     public ResponseBean wxShareActivityGet(@PathVariable Integer groupActivityId,
-                                           @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request,
+                                           @RequestParam(value = "recordId",required = false) Integer recordId ){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -9,15 +9,16 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
-import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.ExtendContent;
-import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
-import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.third.entity.TaMpInfo;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import com.huiju.estateagents.third.service.ITaMpInfoService;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,93 +28,102 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 
 /**
  * <p>
-    * 引流项目  前端控制器
-    * </p>
+ * 引流项目  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-10-18
  */
 @RestController
 @RequestMapping("/api")
-public class TaDrainageController extends BaseController {
+public class    TaDrainageController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaDrainageController.class);
 
     @Autowired
     public ITaDrainageService iTaDrainageService;
-    
-    @Autowired
-    public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
     @Autowired
-    private ITaDrainageRecordService iTaDrainageRecordService;
+    public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
     @Autowired
     public IExtendContentService iExtendContentService;
 
     @Autowired
-    private TaMiniappMapper taMiniappMapper;
+    public ITaMpInfoService iTaMpInfoService;
 
     @Autowired
-    private IMiniAppService miniAppService;
+    public TaPersonMapper taPersonMapper;
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param drainageId
+     * @param name
+     * @param isMiniapp
+     * @param status
+     * @param buildingId
+     * @param source     查询来源,1:H5等活动，2:开屏广告
+     * @param request
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage",method= RequestMethod.GET)
-    public ResponseBean taDrainageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value ="drainageId",required = false) Integer drainageId,
-                                       @RequestParam(value ="name",required = false) String name,
-                                       @RequestParam(value ="isMiniapp",required = false) Integer isMiniapp,
-                                       @RequestParam(value ="status",required = false) Integer status,
-                                       @RequestParam(value ="buildingId",required = false) String buildingId,
-                                       HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage", method = RequestMethod.GET)
+    public ResponseBean taDrainageList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "drainageId", required = false) Integer drainageId,
+                                       @RequestParam(value = "name", required = false) String name,
+                                       @RequestParam(value = "isMiniapp", required = false) Integer isMiniapp,
+                                       @RequestParam(value = "status", required = false) Integer status,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "source", defaultValue = "1") Integer source,
+                                       HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
             //使用分页插件
-		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
+            IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq(null != isMiniapp,"is_miniapp",isMiniapp);
-            if (null == status){
-                queryWrapper.gt("status",-1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq(null != isMiniapp, "is_miniapp", isMiniapp);
+            if (null == status) {
+                queryWrapper.gt("status", -1);
             }
-            queryWrapper.eq(null != status,"status",status);
-            queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
-            queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
-            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
-            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
+            queryWrapper.eq(null != status, "status", status);
+            if(2 == source){
+                queryWrapper.isNull(StringUtils.isEmpty(buildingId), "building_id");
+            }else{
+                queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+            }
+            queryWrapper.eq(null != drainageId, "drainage_id", drainageId);
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id", taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user", getUserId(request)));
+            queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
             List<TaDrainage> records = result.getRecords();
             records.forEach(e -> {
                 QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-                taThirdPartyMiniappConfigQueryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
-                taThirdPartyMiniappConfigQueryWrapper.eq("target_id",e.getDrainageId());
-                taThirdPartyMiniappConfigQueryWrapper.eq("org_id",getOrgId(request));
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_id", e.getDrainageId());
+                taThirdPartyMiniappConfigQueryWrapper.eq("org_id", getOrgId(request));
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-                if (null != taThirdPartyMiniappConfig){
+                if (null != taThirdPartyMiniappConfig) {
                     e.setAppid(taThirdPartyMiniappConfig.getAppid());
                     e.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
                 }
             });
             result.setRecords(records);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageList -=- {}",e.toString());
+            logger.error("taDrainageList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -121,67 +131,31 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/add",method= RequestMethod.POST)
-    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage,HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/add", method = RequestMethod.POST)
+    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            taDrainage.setOrgId(getOrgId(request));
-            taDrainage.setCreateDate(LocalDateTime.now());
-            taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
-            if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())){
-                taDrainage.setStatus(CommConstant.STATUS_NORMAL);
-            }
-            taDrainage.setCreateUser(getUserId(request));
-            if (iTaDrainageService.save(taDrainage)){
-                // 根据ORGID查询当前小程序表的miniapp_id
-                QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
-                taMiniappQuery.eq("org_id",getOrgId(request));
-                TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
-                // 生成二维码
-                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
-                taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
-                iTaDrainageService.updateById(taDrainage);
-
-                //添加第三方appid和secretis
-                TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
-                taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
-                taThirdPartyMiniappConfig.setAppid(getUUIDS());
-                taThirdPartyMiniappConfig.setAppSecret(getUUIDS());
-                taThirdPartyMiniappConfig.setExpirationDate(LocalDateTime.now().plusDays(7));
-                taThirdPartyMiniappConfig.setTargetType(CommConstant.TARGET_TYPE_H5);
-                taThirdPartyMiniappConfig.setTargetId(taDrainage.getDrainageId().toString());
-                iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig);
-                responseBean.addSuccess(taDrainage);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
+            responseBean = iTaDrainageService.saveDrainage(taDrainage,getOrgId(request),getUserId(request));
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageAdd -=- {}",e.toString());
+            logger.error("taDrainageAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
-    
-    /**
-     * 获取uuid
-     * @return
-     */
-    private String getUUIDS() {
-        String uuid= UUID.randomUUID().toString().replace("-", "");
-        return uuid;
-    }
-    
+
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/admin/taDrainage/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -193,24 +167,24 @@ public class TaDrainageController extends BaseController {
             }
 
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",drainage.getOrgId());
-            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
-            queryWrapper.eq("target_id",drainage.getDrainageId());
+            queryWrapper.eq("org_id", drainage.getOrgId());
+            queryWrapper.eq("content_type", CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id", drainage.getDrainageId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (null != drainage.getStatus() && drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0){
+            if (null != drainage.getStatus() && drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0) {
                 responseBean.addError("删除项目会删除全部数据，不建议删除数据。可以点击下架按钮终止活动。");
                 return responseBean;
             }
 
             drainage.setStatus(-1);
-            if(iTaDrainageService.updateById(drainage)){
+            if (iTaDrainageService.updateById(drainage)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -218,30 +192,31 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.PUT)
     public ResponseBean taDrainageUpdate(@PathVariable Integer id,
-                                        @RequestBody TaDrainage taDrainage){
+                                         @RequestBody TaDrainage taDrainage) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setDrainageId(id);
-            if (!taDrainage.getIsMiniapp()){
+            if (!taDrainage.getIsMiniapp()) {
                 taDrainage.setShareImg("");
                 taDrainage.setH5Address("");
                 taDrainage.setShareTitle("");
                 taDrainage.setMiddleImg("");
             }
-            if (iTaDrainageService.updateById(taDrainage)){
+            if (iTaDrainageService.updateById(taDrainage)) {
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageUpdate -=- {}",e.toString());
+            logger.error("taDrainageUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -249,26 +224,27 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean taDrainageGet(@PathVariable Integer id,HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.GET)
+    public ResponseBean taDrainageGet(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaDrainage taDrainage = iTaDrainageService.getById(id);
             QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
-            queryWrapper.eq("target_id",taDrainage.getDrainageId());
-            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+            queryWrapper.eq("target_id", taDrainage.getDrainageId());
+            queryWrapper.eq("org_id", getOrgId(request));
             TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
-            if (null != taThirdPartyMiniappConfig){
+            if (null != taThirdPartyMiniappConfig) {
                 taDrainage.setAppid(taThirdPartyMiniappConfig.getAppid());
                 taDrainage.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
             }
             responseBean.addSuccess(taDrainage);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -276,32 +252,33 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 更改上架下架状态
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/exchange/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taDrainage/exchange/{id}", method = RequestMethod.PUT)
     public ResponseBean exchangeDrainage(@PathVariable Integer id,
-                                         @RequestBody TaDrainage taDrainage){
+                                         @RequestBody TaDrainage taDrainage) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setDrainageId(id);
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",taDrainage.getOrgId());
-            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
-            queryWrapper.eq("target_id",taDrainage.getDrainageId());
+            queryWrapper.eq("org_id", taDrainage.getOrgId());
+            queryWrapper.eq("content_type", CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id", taDrainage.getDrainageId());
 
             queryWrapper.gt("status", CommConstant.STATUS_DELETE); // fix bug #6816
 
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
+            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)) {
                 taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
                 //如果H5有被轮播图或开屏广告选中则轮播图和开屏广告都要下架
                 list.forEach(e -> {
                     e.setStatus(CommConstant.STATUS_UNACCALIMED);
                 });
-            }else{
-                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())){
+            } else {
+                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())) {
                     responseBean.addError("已过下架时间，无法上架");
                     return responseBean;
                 }
@@ -311,17 +288,17 @@ public class TaDrainageController extends BaseController {
                     e.setStatus(CommConstant.STATUS_NORMAL);
                 });
             }
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
-            if (iTaDrainageService.updateById(taDrainage)){
+            if (iTaDrainageService.updateById(taDrainage)) {
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageUpdate -=- {}",e.toString());
+            logger.error("taDrainageUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -329,16 +306,33 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 微信端获取数据
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/wx/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean wxDrainageGet(@PathVariable Integer id){
+    @RequestMapping(value = "/wx/taDrainage/{id}", method = RequestMethod.GET)
+    @ReportCustomer(type = "h5")
+    public ResponseBean wxDrainageGet(@PathVariable Integer id,
+                                      @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                      @RequestParam(value = "channelId", required = false) String channelId,
+                                      @RequestParam(value = "sceneId", required = false) String sceneId,
+                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaDrainageService.getById(id));
-        }catch (Exception e){
+            TaPerson taPerson = taPersonMapper.selectById(getPersonId(request));
+
+            TaDrainage taDrainage = iTaDrainageService.getById(id);
+            taDrainage.setShareTitle(taDrainage.getShareTitle().replace("{name}",taPerson.getNickname()));
+            QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("org_id", 0);
+            List<TaMpInfo> mplist = iTaMpInfoService.list(queryWrapper);
+            if (mplist.size() > 0){
+                taDrainage.setMpAppid(mplist.get(0).getAppid());
+            }
+            responseBean.addSuccess(taDrainage);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -86,4 +86,29 @@ public class TaDrainage implements Serializable {
     @TableField(exist = false)
     private String appSecret;
 
+    /**
+     * 对应的H5的活动类型
+     */
+    private String activityType;
+
+    /**
+     * 对应的H5的活动id
+     */
+    private String activityId;
+
+    @TableField(exist = false)
+    private String mpAppid;
+
+    /**
+     * h5模板ID
+     */
+    @TableField(exist = false)
+    private Integer h5SampleId;
+
+    /**
+     * 是否为从模板创建h5活动，true：是，false：否
+     */
+    @TableField(exist = false)
+    private Boolean fromH5Sample;
+
 }

src/main/java/com/huiju/estateagents/drainage/service/ITaDrainageService.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.drainage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 
 /**
@@ -13,4 +14,6 @@ import com.huiju.estateagents.drainage.entity.TaDrainage;
  */
 public interface ITaDrainageService extends IService<TaDrainage> {
     void updateDrainageToEnd();
+
+    ResponseBean saveDrainage(TaDrainage taDrainage, Integer orgId, Integer userId);
 }

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java

@@ -1,12 +1,33 @@
 package com.huiju.estateagents.drainage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.CommonUtils;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.redpack.entity.TaH5Template;
+import com.huiju.estateagents.redpack.entity.TaRedPacket;
+import com.huiju.estateagents.redpack.mapper.TaH5TemplateMapper;
+import com.huiju.estateagents.redpack.service.ITaRedPacketService;
+import com.huiju.estateagents.sample.entity.TaH5Sample;
+import com.huiju.estateagents.sample.mapper.TaH5SampleMapper;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 引流项目  服务实现类
@@ -18,11 +39,102 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrainage> implements ITaDrainageService {
 
+    private Logger logger = LoggerFactory.getLogger(TaDrainageServiceImpl.class);
+
     @Autowired
     private TaDrainageMapper taDrainageMapper;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
+    @Autowired
+    private ITaRedPacketService iTaRedPacketService;
+
+    @Autowired
+    private ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
+
+    @Autowired
+    private TaH5SampleMapper taH5SampleMapper;
+
+    @Autowired
+    private TaH5TemplateMapper taH5TemplateMapper;
+
     @Override
     public void updateDrainageToEnd() {
         taDrainageMapper.updateDrainageToEnd();
     }
+
+    @Override
+    public ResponseBean saveDrainage(TaDrainage taDrainage, Integer orgId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 1.保存H5活动信息
+        taDrainage.setOrgId(orgId);
+        taDrainage.setCreateUser(userId);
+        taDrainage.setCreateDate(LocalDateTime.now());
+        taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
+        if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())) {
+            taDrainage.setStatus(CommConstant.STATUS_NORMAL);
+        }
+        Boolean saveResult = save(taDrainage);
+        if (!saveResult) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 2.生成二维码
+        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+        taMiniappQuery.eq("org_id", orgId);
+        TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0", taDrainage.getDrainageId().toString()).replace("#1", "h5"), taMiniapp.getMiniappId());
+        taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+
+        // 3.判断是否从h5样例入口创建
+        if (taDrainage.getFromH5Sample() && taDrainage.getH5SampleId() != null) {
+
+            // 5.查询h5样例是否配置默认模板
+            TaH5Sample taH5Sample = taH5SampleMapper.selectById(taDrainage.getH5SampleId());
+            if (taH5Sample != null && !StringUtils.isEmpty(taH5Sample.getH5TemplateId())) {
+
+                TaH5Template taH5Template = taH5TemplateMapper.selectById(taH5Sample.getH5TemplateId());
+                if (CommConstant.RED_PACKET.equals(taH5Template.getActivityType())) {
+
+                    // 7.初始化活动(红包)相关数据
+                    String activityId = CommonUtils.getUUIDS();
+                    TaRedPacket taRedPacket = new TaRedPacket();
+                    taRedPacket.setOrgId(orgId);
+                    taRedPacket.setActivityId(activityId);
+                    taRedPacket.setTempleActivityId(taH5Template.getActivityId());
+                    taRedPacket.setName(taDrainage.getName());
+                    taRedPacket.setCreateDate(LocalDateTime.now());
+                    taRedPacket.setStartDate(LocalDateTime.now().plusDays(1));
+                    taRedPacket.setQrcode(taDrainage.getQrCode());
+                    taRedPacket.setEndDate(DateUtils.dayToLocalDateime(taDrainage.getEndDate()));
+                    taRedPacket.setBuildingId(taDrainage.getBuildingId());
+                    iTaRedPacketService.initializeRedPacket(taRedPacket,orgId);
+
+                    taDrainage.setH5Address(String.format(taH5Template.getActivityUrl(), activityId));
+                    taDrainage.setActivityType(taH5Template.getActivityType());
+                    taDrainage.setActivityId(activityId);
+                }
+            }
+        }
+        updateById(taDrainage);
+
+        // 4.添加第三方appid和secretis
+        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
+        taThirdPartyMiniappConfig.setOrgId(orgId);
+        taThirdPartyMiniappConfig.setAppid(CommonUtils.getUUIDS());
+        taThirdPartyMiniappConfig.setAppSecret(CommonUtils.getUUIDS());
+        taThirdPartyMiniappConfig.setExpirationDate(LocalDateTime.now().plusDays(7));
+        taThirdPartyMiniappConfig.setTargetType(CommConstant.TARGET_TYPE_H5);
+        taThirdPartyMiniappConfig.setTargetId(taDrainage.getDrainageId().toString());
+        iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig);
+
+        responseBean.addSuccess(taDrainage);
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/entity/ExtendContent.java

@@ -104,6 +104,8 @@ public class ExtendContent implements Serializable {
      */
     private Integer createUser;
 
+    private Boolean isHaveActive;
+
     /**
      * 排序
      */

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -351,4 +351,7 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaSalesBatch> salesBatch;
+
+    @TableField(exist = false)
+    private List<ExtendContent> extendContent;
 }

src/main/java/com/huiju/estateagents/entity/TaChannel.java

@@ -1,15 +1,16 @@
 package com.huiju.estateagents.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  
@@ -70,6 +71,9 @@ public class TaChannel implements Serializable {
     @TableField(exist = false)
     private Integer inviteCount;
 
+    @TableField(exist = false)
+    private Integer customerNum;
+
     /**
      * 创建时间
      */

src/main/java/com/huiju/estateagents/entity/TaCustomerFrom.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -18,7 +19,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 public class TaCustomerFrom implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -109,5 +109,76 @@ public class TaCustomerFrom implements Serializable {
      */
     private String remark;
 
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 用户手机号码
+     */
+    @TableField(exist = false)
+    private String userTel;
+
+    /**
+     * 用户性别
+     */
+    @TableField(exist = false)
+    private Integer sex;
+
+    /**
+     * 归属城市
+     */
+    @TableField(exist = false)
+    private String city;
+
+    /**
+     * 用户注册时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime registerTime;
+
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
+
+    /**
+     * 用户头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
+
+    /**
+     * 分享人昵称
+     */
+    @TableField(exist = false)
+    private String sharePersonNickname;
+
+    /**
+     * 分享人手机号
+     */
+    @TableField(exist = false)
+    private String sharePersonPhone;
+
+    /**
+     * 用户昵称
+     */
+    @TableField(exist = false)
+    private String nickname;
+
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String name;
 
+    @TableField(exist = false)
+    private String phone;
 }

src/main/java/com/huiju/estateagents/entity/TaMiniappQrcode.java

@@ -55,4 +55,6 @@ public class TaMiniappQrcode implements Serializable {
      */
     private String qrCode;
 
+    private Integer targetId;
+
 }

src/main/java/com/huiju/estateagents/entity/TaOrg.java

@@ -81,4 +81,9 @@ public class TaOrg implements Serializable {
      */
     @TableField(exist = false)
     private String channelProxyName;
+
+    /**
+     * 短地址
+     */
+    private String shortId;
 }

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -330,4 +330,14 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String targetName;
+
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
 }

src/main/java/com/huiju/estateagents/entity/TaPersonVisitRecord.java

@@ -202,4 +202,41 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String customerId;
+
+    /**
+     * 客户性别
+     */
+    @TableField(exist = false)
+    private Integer sex;
+
+    /**
+     * 客户归属地
+     */
+    @TableField(exist = false)
+    private String city;
+
+    private Integer qrCodeId;
+
+    private Integer channelId;
+
+    /**
+     * 分享人昵称
+     */
+    @TableField(exist = false)
+    private String sharePersonNickname;
+
+    /**
+     * 分享人手机号
+     */
+    @TableField(exist = false)
+    private String sharePersonPhone;
+
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private String phone;
 }

src/main/java/com/huiju/estateagents/entity/TaQrcode.java

@@ -0,0 +1,99 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 二维码管理表
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaQrcode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * qr_code_id id
+     */
+    @TableId(value = "qr_code_id", type = IdType.AUTO)
+    private Integer qrCodeId;
+
+    /**
+     * org_id
+     */
+    private Integer orgId;
+
+    /**
+     * building_id 关联项目ID
+     */
+    private String buildingId;
+
+    /**
+     * channel_id 渠道ID
+     */
+    private Integer channelId;
+
+    /**
+     * target_type 二维码类型
+     */
+    private String targetType;
+
+    /**
+     * target_name 二维码内容
+     */
+    private String targetName;
+
+    /**
+     * target_id
+     */
+    private String targetId;
+
+    /**
+     * qr_code_url 二维码地址
+     */
+    private String qrCodeUrl;
+
+    /**
+     * status 状态
+     */
+    private Integer status;
+
+    /**
+     * create_date 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * create_user 创建人
+     */
+    private Integer createUser;
+
+    @TableField(exist = false)
+    private List<TaQrcode> qrcodeList;
+
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 渠道名称
+     */
+    @TableField(exist = false)
+    private String channelName;
+}

src/main/java/com/huiju/estateagents/entity/TsActivityDaily.java

@@ -1,12 +1,14 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 活动统计 
@@ -93,5 +95,14 @@ public class TsActivityDaily implements Serializable {
      */
     private Integer newCustomers;
 
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
 
+    /**
+     * 统计类型
+     */
+    @TableField(exist = false)
+    private String statisticType;
 }

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelAddRegistNum.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelAddRegistNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "注册时间", index = 4)
+    private String createDate;
+
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitNum.java

@@ -0,0 +1,79 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelVisitNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+//    /**
+//     * 来源渠道
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "来源渠道", index = 4)
+//    private String personFrom;
+//
+//    /**
+//     * 置业顾问
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问", index = 5)
+//    private String realtyConsultant;
+//
+//    /**
+//     * 置业顾问电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问电话", index = 6)
+//    private String realtyConsultantPhone;
+//
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
+
+    /**
+     * 访问时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 4)
+    private String visitDate;
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitPersonNum.java

@@ -0,0 +1,86 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelVisitPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+//    /**
+//     * 来源渠道
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "来源渠道", index = 4)
+//    private String personFrom;
+//
+//    /**
+//     * 置业顾问
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问", index = 5)
+//    private String realtyConsultant;
+//
+//    /**
+//     * 置业顾问电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问电话", index = 6)
+//    private String realtyConsultantPhone;
+//
+//    /**
+//     * 推广人
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "推广人", index = 7)
+//    private String sharePersonName;
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 4)
+    private String visitNum;
+
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/TsChannelDaily.java

@@ -0,0 +1,58 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TsChannelDaily {
+    /**
+     * 类型
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "类型", index = 0)
+    private String targetType;
+
+    /**
+     * 内容
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "内容", index = 1)
+    private String targetName;
+
+    /**
+     * 关联项目
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关联项目", index = 2)
+    private String buildingName;
+
+    /**
+     * 新增注册用户
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增注册用户", index = 3)
+    private Integer newCustomers;
+
+    /**
+     * 访问人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer visitPersons;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer visitNum;
+
+    /**
+     * 活动ID
+     */
+    @ExcelIgnore
+    private String targetId;
+
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeNewPersonNum.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class QrCodeNewPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "注册时间", index = 4)
+    private String registerTime;
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeVisitNum.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class QrCodeVisitNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 4)
+    private String visitTime;
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeVisitPersonNum.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class QrCodeVisitPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 4)
+    private String visitNum;
+
+}

src/main/java/com/huiju/estateagents/excel/redPacket/AccountConsumeRecordExport.java

@@ -0,0 +1,47 @@
+package com.huiju.estateagents.excel.redPacket;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 账户消费记录导出
+ *
+ * @author gusy
+ * @date 2020/6/5 16:36
+ */
+@Data
+public class AccountConsumeRecordExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费金额（元）", index = 1)
+    private String amount;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费方式", index = 2)
+    private String consumeType;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动名称", index = 3)
+    private String activityName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费下单时间", index = 4)
+    private String createDate;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "接收人手机号码", index = 5)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费状态", index = 6)
+    private String consumeStatus;
+}

src/main/java/com/huiju/estateagents/excel/redPacket/AccountPayRecordExport.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.excel.redPacket;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 账户充值记录导出
+ *
+ * @author gusy
+ * @date 2020/6/5 16:36
+ */
+@Data
+public class AccountPayRecordExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值金额（元）", index = 1)
+    private String amount;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值方式", index = 2)
+    private String isOffline;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "下单时间", index = 3)
+    private String createDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值方式", index = 4)
+    private String tradingStatus;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "支付时间", index = 5)
+    private String payDate;
+}

src/main/java/com/huiju/estateagents/excel/redPacket/AccountRefundRecordExport.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.excel.redPacket;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 账户退款记录导出
+ *
+ * @author gusy
+ * @date 2020/6/5 16:36
+ */
+@Data
+public class AccountRefundRecordExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款金额（元）", index = 1)
+    private String amount;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款创建时间", index = 2)
+    private String createDate;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款状态", index = 3)
+    private String tradingStatus;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "驳回原因", index = 4)
+    private String auditResult;
+}

src/main/java/com/huiju/estateagents/excel/redPacket/RedPacketRankingListExport.java

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.excel.redPacket;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 红包排行榜导出实体
+ *
+ * @author gusy
+ * @date 2020/6/7 15:46
+ */
+@Data
+public class RedPacketRankingListExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "昵称", index = 0)
+    private String nickname;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 1)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 2)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "发起时间", index = 3)
+    private String createDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "助力人数", index = 4)
+    private String votes;
+}

src/main/java/com/huiju/estateagents/excel/redPacket/RedPacketVisitRecordtExport.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.excel.redPacket;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 红包访问记录导出实体
+ *
+ * @author gusy
+ * @date 2020/6/7 15:46
+ */
+@Data
+public class RedPacketVisitRecordtExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "昵称", index = 0)
+    private String nickname;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 1)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 2)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 3)
+    private String createDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享人昵称", index = 4)
+    private String sharePersonNickName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享人手机号", index = 5)
+    private String sharePersonPhone;
+}

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -17,6 +17,7 @@ import com.huiju.estateagents.service.ISysButtonInMenuService;
 import com.huiju.estateagents.service.ITaRoleButtonService;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.jsonwebtoken.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Component
 public class AccessInterceptor implements HandlerInterceptor {
     
@@ -73,6 +75,8 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/notify",//微信支付所有回调放过
             "/api/refund/",//微信退款所有回调放过
             "/api/fadd/",//所有的法大大回调放过
+            "/api/third",
+            "/api/third/redirect/"
     };
 
     /*
@@ -95,6 +99,7 @@ public class AccessInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+        log.info("接口请求路径是{}",request.getRequestURI());
         //第三方权限校验
         String tokenHeader = request.getHeader("x-token");
         if (!StringUtils.isEmpty(tokenHeader)){

src/main/java/com/huiju/estateagents/job/OrgOrderTimeJob.java

@@ -0,0 +1,55 @@
+package com.huiju.estateagents.job;//package com.huiju.estateagents.job;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * 订单相关操作
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class OrgOrderTimeJob extends BaseController {
+
+    private Logger logger = LoggerFactory.getLogger(OrgOrderTimeJob.class);
+
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
+    /**
+     * 处理过期订单
+     */
+    @Scheduled(cron = "0 0/5 * * * ?")
+    private void dealExpireOrder() {
+        logger.info("处理过期订单 定时任务开始");
+
+        try {
+            TaOrgOrder taOrgOrder = new TaOrgOrder();
+            taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_FAIL);
+
+            UpdateWrapper<TaOrgOrder> taOrgOrderUpdateWrapper = new UpdateWrapper<>();
+            taOrgOrderUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taOrgOrderUpdateWrapper.lt("expiry_date", DateUtils.localDateTimeToString(LocalDateTime.now()));
+            taOrgOrderUpdateWrapper.eq("trading_status",CommConstant.TRADING_STATUS_PROCESSING);
+            Integer result = taOrgOrderMapper.update(taOrgOrder, taOrgOrderUpdateWrapper);
+            logger.info("处理过期订单 共更新" + result + "条数据");
+        } catch (Exception e) {
+            logger.error("处理过期订单 异常", e);
+        }
+        logger.info("处理过期订单 定时任务结束");
+    }
+
+}

src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java

@@ -3,9 +3,16 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -39,4 +46,30 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
     IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
 
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
+
+    /**
+     * 渠道引进客户统计
+     * @param pg
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @return
+     */
+    IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg, @Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("channelType") String channelType, @Param("buildingId") String buildingId, @Param("channelId") Integer channelId, @Param("sortField") String sortField, @Param("orderType") String orderType, @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    IPage<ChannelVisitNum> getChannelVisitNumList(IPage<ChannelVisitNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<TsChannelDaily> getChannelIntroductionListExport(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId,@Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<ChannelVisitNum> getChannelVisitNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<ChannelVisitPersonNum> getChannelPersonNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 }

src/main/java/com/huiju/estateagents/mapper/TaLiveActivityMapper.java

@@ -30,7 +30,15 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     Boolean addVisitNum(@Param("id") String id);
 
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("userId") Integer userId);
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg,
+                                                    @Param("liveActivityTitle") String liveActivityTitle,
+                                                    @Param("cityId") String cityId,
+                                                    @Param("buildingId") String buildingId,
+                                                    @Param("status") Integer status,
+                                                    @Param("orgId") Integer orgId,
+                                                    @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                                    @Param("userId") Integer userId,
+                                                    @Param("source") Integer source);
     /**
      * 批量更新直播活动状态
      *

src/main/java/com/huiju/estateagents/mapper/TaMiniappMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @since 2019-09-11
  */
 @Mapper
+@Component
 public interface TaMiniappMapper extends BaseMapper<TaMiniapp> {
 
     List<TaMiniapp> getAllAvaliableMiniapps();

src/main/java/com/huiju/estateagents/mapper/TaPersonBuildingMapper.java

@@ -26,4 +26,5 @@ public interface TaPersonBuildingMapper extends BaseMapper<TaPersonBuilding> {
     List<SalesExport> selectSalesList(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId, @Param("startCreateDate")  String startCreateDate,@Param("endCreateDate") String endCreateDate, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList);
 
     List<TaBuilding> getBuildingsOf(@Param("personOrUser") String personOrUser);
+
 }

src/main/java/com/huiju/estateagents/mapper/TaQrcodeMapper.java

@@ -0,0 +1,92 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 二维码管理表 Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@Mapper
+@Component
+public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
+
+    QrCodeStatisticResponseBO getStatisticData(@Param("orgId") Integer orgId);
+
+    IPage<TaQrcode> listQrCodeByCondition(IPage<TaQrcode> page,
+                                          @Param("targetType") String targetType,
+                                          @Param("targetName") String targetName,
+                                          @Param("channelId") Integer channelId,
+                                          @Param("buildingId") String buildingId,
+                                          @Param("userId") Integer userId,
+                                          @Param("orgId") Integer orgId,
+                                          @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取访问用户人数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getVisitPersons(@Param("qrCodeId") Integer qrCodeId,
+                            @Param("orgId") Integer orgId);
+
+    /**
+     * 获取访问次数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getVisitNum(@Param("qrCodeId") Integer qrCodeId,
+                        @Param("orgId") Integer orgId);
+
+    /**
+     * 获取新增用户数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getNewPersons(@Param("qrCodeId") Integer qrCodeId,
+                          @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getVisitPersonsRecord(IPage<TaPersonVisitRecord> page,
+                                                     @Param("qrCodeId") Integer qrCodeId,
+                                                     @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getVisitNumRecord(IPage<TaPersonVisitRecord> page,
+                                                 @Param("qrCodeId") Integer qrCodeId,
+                                                 @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getNewPersonsRecord(IPage<TaPersonVisitRecord> page,
+                                                   @Param("qrCodeId") Integer qrCodeId,
+                                                   @Param("orgId") Integer orgId);
+
+    List<QrCodeVisitPersonNum> getVisitPersonsRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                           @Param("orgId") Integer orgId);
+
+
+    List<QrCodeVisitNum> getVisitNumRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                 @Param("orgId") Integer orgId);
+
+    List<QrCodeNewPersonNum> getNewPersonsRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                       @Param("orgId") Integer orgId);
+}

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.excel.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -27,19 +28,23 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     Integer getMyCutsomerNum(@Param("personId") String personId);
 
-    String getCustomerPersonId(@Param("customerId")String customerId);
+    String getCustomerPersonId(@Param("customerId") String customerId);
 
-    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId,@Param("personId")String personId);
+    TaRecommendCustomer getCustomerDetail(@Param("customerId") String customerId, @Param("personId") String personId);
 
-    TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
+    TaRecommendCustomer getCustomerById(@Param("customerId") String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
-    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status") Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
+
+    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客
+     *
      * @param page
      * @param name
      * @param tel
@@ -67,34 +72,39 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 导出数据 获取推荐用户数据
+     *
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取推荐用户数据 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex,@Param("orgId")Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据
+     *
      * @param orgId
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取经纪人数据 总数
+     *
      * @param orgId
      * @return
      */
@@ -102,15 +112,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 导出数据 获取经纪人数据
+     *
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name")String name, @Param("tel")String tel, @Param("channelId")String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
      * 导出数据 公客总数
+     *
      * @param name
      * @param tel
      * @param entryType
@@ -120,10 +132,11 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    Integer getPublicCustomerExportListCount(@Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    Integer getPublicCustomerExportListCount(@Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel);
 
     /**
      * 导出数据 公客
+     *
      * @param name
      * @param tel
      * @param entryType
@@ -135,20 +148,23 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      */
     List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode,
                                                            @Param("pageSize") Integer pageSize,
-                                                           @Param("buildingId")String buildingId,
+                                                           @Param("buildingId") String buildingId,
                                                            @Param("name") String name,
                                                            @Param("tel") String tel,
                                                            @Param("entryType") String entryType,
                                                            @Param("verifyStatus") String verifyStatus,
                                                            @Param("sex") Integer sex,
                                                            @Param("orgId") Integer orgId,
-                                                           @Param("consultTel")String consultTel,
-                                                           @Param("sceneType")String sceneType,
+                                                           @Param("consultTel") String consultTel,
+                                                           @Param("sceneType") String sceneType,
                                                            @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
-                                                           @Param("belongStatus") Integer belongStatus);
+                                                           @Param("belongStatus") Integer belongStatus,
+                                                           @Param("startCreateDate") String startCreateDate,
+                                                           @Param("endCreateDate") String endCreateDate);
 
     /**
      * 导出数据 私客总数
+     *
      * @param buildingId
      * @param name
      * @param tel
@@ -161,10 +177,11 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status") Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 私客
+     *
      * @param pageCode
      * @param pageSize
      * @param buildingId
@@ -179,18 +196,35 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status,@Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode,
+                                                      @Param("pageSize") Integer pageSize,
+                                                      @Param("building") String buildingId,
+                                                      @Param("name") String name,
+                                                      @Param("tel") String tel,
+                                                      @Param("consultName") String consultName,
+                                                      @Param("consultTel") String consultTel,
+                                                      @Param("entryType") String entryType,
+                                                      @Param("verifyStatus") String verifyStatus,
+                                                      @Param("sex") Integer sex,
+                                                      @Param("orgId") Integer orgId,
+                                                      @Param("status") Integer status,
+                                                      @Param("sceneType") String sceneType,
+                                                      @Param("startCreateDate") String startCreateDate,
+                                                      @Param("endCreateDate") String endCreateDate,
+                                                      @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
     /**
      * 获取我的客户的人数统计
+     *
      * @param personId
      * @param userId
      * @return
      */
-	Map<String, Object> getMyCustStatistics(@Param("personId") String personId,@Param("userId") Integer userId,@Param("orgId") Integer orgId);
-    
+    Map<String, Object> getMyCustStatistics(@Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
+
     /**
      * 获取我的跟进客户数据
+     *
      * @param page
      * @param personId
      * @param userId
@@ -205,19 +239,30 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param endArrivalDate
      * @return
      */
-    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status,@Param("startReportDate") String startReportDate,@Param("endReportDate") String endReportDate,@Param("startArrivalDate") String startArrivalDate,@Param("endArrivalDate") String endArrivalDate);
-    
+    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status, @Param("startReportDate") String startReportDate, @Param("endReportDate") String endReportDate, @Param("startArrivalDate") String startArrivalDate, @Param("endArrivalDate") String endArrivalDate);
+
     /**
      * 获取我的客户详情数据
+     *
      * @param customerId
      * @return
      */
     TaRecommendCustomer getMyCustDetailById(String customerId);
 
-    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<PersonIntention> getCustomerIntentions(@Param("personId") String personId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaRecommendCustomer> getCustomersIRecommended(IPage<TaRecommendCustomer> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
+    /**
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @param personId
+     * @return
+     */
     IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page,
                                                            @Param("orgId") Integer orgId,
                                                            @Param("userId") String userId,
@@ -230,6 +275,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * 查询 person 对应 楼盘 的客户
      * 如果对应的楼盘没有客户, 则返回无楼盘的, 小程序级别的客户信息
      * 如果没有无小程序级别客户, 则返回最早的一条
+     *
      * @param orgId
      * @param personId
      * @param buildingId
@@ -239,12 +285,22 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 获取置业福问下的客户
+     *
      * @param userId
      * @param personId
      * @param buildingId
      * @param orgId
      * @return
      */
-    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
+    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId, @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
 
+    /**
+     * 校验客户存在记录
+     * @param orgId
+     * @param personId
+     * @param consultBuildingIds
+     * @param buildingId
+     * @return
+     */
+    Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/redpack/controller/TaH5ImagesController.java

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.redpack.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaH5Images;
+import com.huiju.estateagents.redpack.service.ITaH5ImagesService;
+
+/**
+ * <p>
+    * H5图片列表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaH5ImagesController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaH5ImagesController.class);
+
+    @Autowired
+    public ITaH5ImagesService iTaH5ImagesService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taH5Images",method= RequestMethod.GET)
+    public ResponseBean taH5ImagesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaH5Images> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Images> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaH5Images> result = iTaH5ImagesService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5ImagesList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taH5Images 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taH5Images",method= RequestMethod.POST)
+    public ResponseBean taH5ImagesAdd(@RequestBody TaH5Images taH5Images){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaH5ImagesService.save(taH5Images)){
+                responseBean.addSuccess(taH5Images);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5ImagesAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taH5Images/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taH5ImagesDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaH5ImagesService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5ImagesDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taH5Images 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taH5Images/{id}",method= RequestMethod.PUT)
+    public ResponseBean taH5ImagesUpdate(@PathVariable Integer id,
+                                        @RequestBody TaH5Images taH5Images){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaH5ImagesService.updateById(taH5Images)){
+                responseBean.addSuccess(taH5Images);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5ImagesUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taH5Images/{id}",method= RequestMethod.GET)
+    public ResponseBean taH5ImagesGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaH5ImagesService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5ImagesDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaH5TemplateController.java

@@ -0,0 +1,155 @@
+package com.huiju.estateagents.redpack.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.redpack.entity.TaH5Template;
+import com.huiju.estateagents.redpack.service.ITaH5TemplateService;
+
+/**
+ * <p>
+    * H5模板  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaH5TemplateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaH5TemplateController.class);
+
+    @Autowired
+    public ITaH5TemplateService iTaH5TemplateService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Template",method= RequestMethod.GET)
+    public ResponseBean taH5TemplateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value ="h5TemplateId", required = false) String h5TemplateId,
+                                        @RequestParam(value ="name", required = false) String name){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaH5Template> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Template> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(!StringUtils.isEmpty(h5TemplateId), "h5_template_id", h5TemplateId);
+            queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaH5Template> result = iTaH5TemplateService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5TemplateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taH5Template 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taH5Template",method= RequestMethod.POST)
+    public ResponseBean taH5TemplateAdd(@RequestBody TaH5Template taH5Template){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaH5TemplateService.save(taH5Template)){
+                responseBean.addSuccess(taH5Template);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5TemplateAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taH5Template/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taH5TemplateDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaH5TemplateService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5TemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taH5Template 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taH5Template/{id}",method= RequestMethod.PUT)
+    public ResponseBean taH5TemplateUpdate(@PathVariable Integer id,
+                                        @RequestBody TaH5Template taH5Template){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaH5TemplateService.updateById(taH5Template)){
+                responseBean.addSuccess(taH5Template);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5TemplateUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taH5Template/{id}",method= RequestMethod.GET)
+    public ResponseBean taH5TemplateGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaH5TemplateService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5TemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaMpMiniappController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
+import com.huiju.estateagents.redpack.service.ITaMpMiniappService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 公众号小程序账户映射  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-02
+ */
+@RestController
+@RequestMapping("/")
+public class TaMpMiniappController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMpMiniappController.class);
+
+    @Autowired
+    public ITaMpMiniappService iTaMpMiniappService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taMpMiniapp",method= RequestMethod.GET)
+    public ResponseBean taMpMiniappList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaMpMiniapp> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaMpMiniapp> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMpMiniapp> result = iTaMpMiniappService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpMiniappList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMpMiniapp 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMpMiniapp",method= RequestMethod.POST)
+    public ResponseBean taMpMiniappAdd(@RequestBody TaMpMiniapp taMpMiniapp){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMpMiniappService.save(taMpMiniapp)){
+                responseBean.addSuccess(taMpMiniapp);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpMiniappAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taMpMiniapp/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMpMiniappDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMpMiniappService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpMiniappDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMpMiniapp 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMpMiniapp/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMpMiniappUpdate(@PathVariable Integer id,
+                                        @RequestBody TaMpMiniapp taMpMiniapp){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMpMiniappService.updateById(taMpMiniapp)){
+                responseBean.addSuccess(taMpMiniapp);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpMiniappUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taMpMiniapp/{id}",method= RequestMethod.GET)
+    public ResponseBean taMpMiniappGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMpMiniappService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpMiniappDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaMpPersonController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaMpPerson;
+import com.huiju.estateagents.redpack.service.ITaMpPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 公众号用户表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-02
+ */
+@RestController
+@RequestMapping("/")
+public class TaMpPersonController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMpPersonController.class);
+
+    @Autowired
+    public ITaMpPersonService iTaMpPersonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taMpPerson",method= RequestMethod.GET)
+    public ResponseBean taMpPersonList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaMpPerson> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaMpPerson> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMpPerson> result = iTaMpPersonService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpPersonList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMpPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMpPerson",method= RequestMethod.POST)
+    public ResponseBean taMpPersonAdd(@RequestBody TaMpPerson taMpPerson){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMpPersonService.save(taMpPerson)){
+                responseBean.addSuccess(taMpPerson);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpPersonAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taMpPerson/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMpPersonDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMpPersonService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpPersonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMpPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMpPerson/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMpPersonUpdate(@PathVariable Integer id,
+                                        @RequestBody TaMpPerson taMpPerson){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMpPersonService.updateById(taMpPerson)){
+                responseBean.addSuccess(taMpPerson);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpPersonUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taMpPerson/{id}",method= RequestMethod.GET)
+    public ResponseBean taMpPersonGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMpPersonService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMpPersonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountBlockedController.java

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.redpack.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
+import com.huiju.estateagents.redpack.service.ITaOrgAccountBlockedService;
+
+/**
+ * <p>
+    * 账户冻结记录  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrgAccountBlockedController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgAccountBlockedController.class);
+
+    @Autowired
+    public ITaOrgAccountBlockedService iTaOrgAccountBlockedService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountBlocked",method= RequestMethod.GET)
+    public ResponseBean taOrgAccountBlockedList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrgAccountBlocked> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrgAccountBlocked> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrgAccountBlocked> result = iTaOrgAccountBlockedService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountBlockedList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrgAccountBlocked 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountBlocked",method= RequestMethod.POST)
+    public ResponseBean taOrgAccountBlockedAdd(@RequestBody TaOrgAccountBlocked taOrgAccountBlocked){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountBlockedService.save(taOrgAccountBlocked)){
+                responseBean.addSuccess(taOrgAccountBlocked);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountBlockedAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrgAccountBlocked/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrgAccountBlockedDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrgAccountBlockedService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountBlockedDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrgAccountBlocked 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountBlocked/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgAccountBlockedUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrgAccountBlocked taOrgAccountBlocked){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountBlockedService.updateById(taOrgAccountBlocked)){
+                responseBean.addSuccess(taOrgAccountBlocked);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountBlockedUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taOrgAccountBlocked/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrgAccountBlockedGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgAccountBlockedService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountBlockedDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountCertificateController.java

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.redpack.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountCertificate;
+import com.huiju.estateagents.redpack.service.ITaOrgAccountCertificateService;
+
+/**
+ * <p>
+    * 账户相关凭证  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrgAccountCertificateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgAccountCertificateController.class);
+
+    @Autowired
+    public ITaOrgAccountCertificateService iTaOrgAccountCertificateService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountCertificate",method= RequestMethod.GET)
+    public ResponseBean taOrgAccountCertificateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrgAccountCertificate> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrgAccountCertificate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrgAccountCertificate> result = iTaOrgAccountCertificateService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountCertificateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrgAccountCertificate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountCertificate",method= RequestMethod.POST)
+    public ResponseBean taOrgAccountCertificateAdd(@RequestBody TaOrgAccountCertificate taOrgAccountCertificate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountCertificateService.save(taOrgAccountCertificate)){
+                responseBean.addSuccess(taOrgAccountCertificate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountCertificateAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrgAccountCertificate/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrgAccountCertificateDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrgAccountCertificateService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountCertificateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrgAccountCertificate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountCertificate/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgAccountCertificateUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrgAccountCertificate taOrgAccountCertificate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountCertificateService.updateById(taOrgAccountCertificate)){
+                responseBean.addSuccess(taOrgAccountCertificate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountCertificateUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taOrgAccountCertificate/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrgAccountCertificateGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgAccountCertificateService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountCertificateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountController.java

@@ -0,0 +1,365 @@
+package com.huiju.estateagents.redpack.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.NumberUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.redpack.entity.OrgAccountExport;
+import com.huiju.estateagents.redpack.entity.RechargeOrder;
+import com.huiju.estateagents.redpack.entity.TaOrgAccount;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
+import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
+import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 系统账户表  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api")
+public class TaOrgAccountController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgAccountController.class);
+
+    @Autowired
+    public ITaOrgAccountService iTaOrgAccountService;
+
+    @Autowired
+    public ITaOrgOrderService iTaOrgOrderService;
+
+    @Autowired
+    public TaOrgOrderMapper taOrgOrderMapper;
+
+    @Autowired
+    public TaOrgAccountBlockedMapper taOrgAccountBlockedMapper;
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgAccount", method = RequestMethod.GET)
+    public ResponseBean taOrgAccountList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "miniAppName", required = false) String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaOrgAccount> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrgAccount> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(miniAppName), "miniapp_name", miniAppName);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrgAccount> result = iTaOrgAccountService.page(pg, queryWrapper);
+            result.getRecords().forEach(e -> {
+                Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(e.getOrgId());
+                e.setTotalRechargeAmount(totalRechargeAmount);
+                //查询退款冻结额
+                Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(e.getOrgId());
+
+                //账户余额=总充值金额-已消费金额-已退款额-退款冻结额
+                Integer balance = totalRechargeAmount - e.getPurchaseAmount() - e.getTotalRefund() - totalBlockAmount;
+                e.setRealBalance(balance);
+            });
+            responseBean.addSuccess(result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 账户信息导出
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgAccount/taOrgAccountListExport")
+    public void taOrgAccountListExport(@RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=账户统计.xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), OrgAccountExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        //使用分页插件
+        QueryWrapper<TaOrgAccount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(miniAppName), "miniapp_name", miniAppName);
+        queryWrapper.orderByDesc("create_date");
+
+        List<OrgAccountExport> data = new ArrayList<>();
+        List<TaOrgAccount> result = iTaOrgAccountService.list(queryWrapper);
+
+        result.forEach(e -> {
+            Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(e.getOrgId());
+            //查询退款冻结额
+            Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(e.getOrgId());
+            OrgAccountExport export = new OrgAccountExport();
+            export.setMiniAppName(e.getMiniappName());
+            export.setTotalRecharge(NumberUtils.fenToYuan(taOrgOrderMapper.countTotalRechargeAmount(e.getOrgId()).toString()));
+            export.setConsumeAmount(NumberUtils.fenToYuan(e.getPurchaseAmount().toString()));
+            export.setRefundAmount(NumberUtils.fenToYuan(e.getTotalRefund().toString()));
+            Integer balance = totalRechargeAmount - e.getPurchaseAmount() - e.getTotalRefund() - totalBlockAmount;
+            export.setBalance(NumberUtils.fenToYuan(balance.toString()));
+
+            data.add(export);
+        });
+
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taOrgAccount 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/api/taOrgAccount", method = RequestMethod.POST)
+    public ResponseBean taOrgAccountAdd(@RequestBody TaOrgAccount taOrgAccount) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountService.save(taOrgAccount)) {
+                responseBean.addSuccess(taOrgAccount);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/api/taOrgAccount/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taOrgAccountDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id           实体ID
+     * @param taOrgAccount 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/api/taOrgAccount/{id}", method = RequestMethod.PUT)
+    public ResponseBean taOrgAccountUpdate(@PathVariable Integer id,
+                                           @RequestBody TaOrgAccount taOrgAccount) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountService.updateById(taOrgAccount)) {
+                responseBean.addSuccess(taOrgAccount);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/taOrgAccount/{id}", method = RequestMethod.GET)
+    public ResponseBean taOrgAccountGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgAccountService.getOrgAccountById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 系统账户充值
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/taOrgAccount/recharge/{id}", method = RequestMethod.PUT)
+    public ResponseBean taOrgAccountRecharge(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
+                                             HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer userId = getUserId(request);
+            iTaOrgAccountService.rechargeAccount(id, taOrgAccount, taOrgAccount.getOrgId(), userId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountRecharge -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 系统账户退款
+     *
+     * @param id
+     * @param taOrgAccount
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgAccount/refund/{id}", method = RequestMethod.PUT)
+    public ResponseBean taOrgAccountRefund(@PathVariable String id, @RequestBody TaOrgAccount taOrgAccount,
+                                           HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer userId = getUserId(request);
+            responseBean = iTaOrgAccountService.refundAccount(id, taOrgAccount, taOrgAccount.getOrgId(), userId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountRefund -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 订单退款
+     *
+     * @param id
+     * @param refundApplication
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/refund/{id}", method = RequestMethod.PUT)
+    public ResponseBean taOrgOrderRefund(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
+                                         HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer userId = getUserId(request);
+            responseBean = iTaOrgOrderService.refundOrder(id, refundApplication, userId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountRefund -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 订单驳回
+     *
+     * @param id
+     * @param refundApplication
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/reject/{id}")
+    public ResponseBean taOrgOrderReject(@PathVariable String id, @RequestBody TaOrgRefundApplication refundApplication,
+                                         HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer userId = getUserId(request);
+            responseBean = iTaOrgOrderService.rejectOrder(id, refundApplication, userId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgAccountRefund -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取账户资金信息
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgAccount/get", method = RequestMethod.GET)
+    public ResponseBean getOrgAccountInfoByOrgId(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgAccountService.getOrgAccountInfoByOrgId(getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getOrgAccountInfo -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信统一下单接口
+     *
+     * @param taOrgOrder
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/unifiedOrder",method = RequestMethod.POST)
+    public ResponseBean wxUnifiedOrder(@RequestBody TaOrgOrder taOrgOrder,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taOrgOrder.setOrgId(getOrgId(request));
+            taOrgOrder.setUserId(getUserId(request));
+            responseBean = iTaOrgOrderService.payUnifiedOrder(taOrgOrder,request.getRemoteAddr());
+        } catch (Exception e) {
+            log.error("微信统一下单失败： {}" , e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountDetailedListController.java

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.redpack.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
+import com.huiju.estateagents.redpack.service.ITaOrgAccountDetailedListService;
+
+/**
+ * <p>
+    * 账户消费流水  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrgAccountDetailedListController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgAccountDetailedListController.class);
+
+    @Autowired
+    public ITaOrgAccountDetailedListService iTaOrgAccountDetailedListService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountDetailedList",method= RequestMethod.GET)
+    public ResponseBean taOrgAccountDetailedListList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrgAccountDetailedList> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrgAccountDetailedList> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrgAccountDetailedList> result = iTaOrgAccountDetailedListService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountDetailedListList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrgAccountDetailedList 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountDetailedList",method= RequestMethod.POST)
+    public ResponseBean taOrgAccountDetailedListAdd(@RequestBody TaOrgAccountDetailedList taOrgAccountDetailedList){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountDetailedListService.save(taOrgAccountDetailedList)){
+                responseBean.addSuccess(taOrgAccountDetailedList);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountDetailedListAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrgAccountDetailedList/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrgAccountDetailedListDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrgAccountDetailedListService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountDetailedListDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrgAccountDetailedList 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgAccountDetailedList/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgAccountDetailedListUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrgAccountDetailedList taOrgAccountDetailedList){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgAccountDetailedListService.updateById(taOrgAccountDetailedList)){
+                responseBean.addSuccess(taOrgAccountDetailedList);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountDetailedListUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taOrgAccountDetailedList/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrgAccountDetailedListGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgAccountDetailedListService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAccountDetailedListDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

@@ -0,0 +1,562 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.SaveCzOrderRequestBO;
+import com.huiju.estateagents.bo.request.SaveRefundOrderRequestBO;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.redpack.entity.ConsumeOrder;
+import com.huiju.estateagents.redpack.entity.RechargeOrder;
+import com.huiju.estateagents.redpack.entity.RefundOrder;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 组织订单表  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaOrgOrderController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgOrderController.class);
+
+    @Autowired
+    public ITaOrgOrderService iTaOrgOrderService;
+
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder", method = RequestMethod.GET)
+    public ResponseBean taOrgOrderList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "orderType", required = false) String orderType,
+                                       @RequestParam(value = "orgId", required = false) Integer orgId,
+                                       @RequestParam(value = "tradeNo", required = false) String tradeNo,
+                                       @RequestParam(value = "isOffline", required = false) Integer isOffline,
+                                       @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
+                                       @RequestParam(value = "receivePhone", required = false) String receivePhone,
+                                       @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                       @RequestParam(value = "itemType", required = false) String itemType,
+                                       @RequestParam(value = "startDate", required = false) String startDate,
+                                       @RequestParam(value = "endDate", required = false) String endDate,
+                                       @RequestParam(value = "payStartDate", required = false) String payStartDate,
+                                       @RequestParam(value = "payEndDate", required = false) String payEndDate,
+                                       @RequestParam(value = "auditStatus", required = false) String auditStatus) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
+            IPage<TaOrgOrder> result = iTaOrgOrderService.listByCondition(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, receivePhone, itemType, startDate, endDate, miniAppName, auditStatus, payStartDate, payEndDate);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgOrderList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 充值订单导出
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/rechargeOrderExport")
+    public void rechargeOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
+                                                   @RequestParam(value = "isOffline", required = false) Boolean isOffline,
+                                                   @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
+                                                   @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                                   @RequestParam(value = "startDate", required = false) String startDate,
+                                                   @RequestParam(value = "endDate", required = false) String endDate,
+                                                   @RequestParam(value = "orderType", required = false) String orderType,
+                                                   @RequestParam(value = "orgId", required = false) Integer orgId,
+                                                   HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), RechargeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        List<RechargeOrder> data = iTaOrgOrderService.rechargeListByConditionExport(orderType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 消费订单导出
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/consumeOrderExport")
+    public void consumeOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
+                                   @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
+                                   @RequestParam(value = "receivePhone", required = false) String receivePhone,
+                                   @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                   @RequestParam(value = "startDate", required = false) String startDate,
+                                   @RequestParam(value = "endDate", required = false) String endDate,
+                                   @RequestParam(value = "orderType", required = false) String orderType,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ConsumeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        List<ConsumeOrder> data = iTaOrgOrderService.consumeListByConditionExport(orderType, tradeNo, receivePhone, tradingStatus, startDate, endDate, miniAppName, orgId);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 退款订单导出
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/refundOrderExport")
+    public void refundOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
+                                   @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                   @RequestParam(value = "startDate", required = false) String startDate,
+                                   @RequestParam(value = "endDate", required = false) String endDate,
+                                   @RequestParam(value = "orderType", required = false) String orderType,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   @RequestParam(value = "auditStatus", required = false) String auditStatus,
+                                   HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), RefundOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+
+        // 设置 sheet, 同一个sheet只需要设置一次
+        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName, orgId, auditStatus);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taOrgOrder 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taOrgOrder", method = RequestMethod.POST)
+    public ResponseBean taOrgOrderAdd(@RequestBody TaOrgOrder taOrgOrder) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgOrderService.save(taOrgOrder)) {
+                responseBean.addSuccess(taOrgOrder);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgOrderAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taOrgOrder/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taOrgOrderDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgOrderService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgOrderDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id         实体ID
+     * @param taOrgOrder 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taOrgOrder/{id}", method = RequestMethod.PUT)
+    public ResponseBean taOrgOrderUpdate(@PathVariable Integer id,
+                                         @RequestBody TaOrgOrder taOrgOrder) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgOrderService.updateById(taOrgOrder)) {
+                responseBean.addSuccess(taOrgOrder);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgOrderUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/taOrgOrder/{id}", method = RequestMethod.GET)
+    public ResponseBean taOrgOrderGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgOrderService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taOrgOrderDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 查询接收人信息
+     *
+     */
+    @RequestMapping(value = "/channel/receiveInfo", method = RequestMethod.GET)
+    public ResponseBean receiveInfoGet(@RequestParam(required = false) String phone,
+                                       @RequestParam(required = false) Integer orgId,
+                                       HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("phone", phone);
+            taPersonQueryWrapper.eq("org_id", orgId);
+            responseBean.addSuccess(iTaPersonService.getOne(taPersonQueryWrapper));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("receiveInfoGet -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 创建充值订单
+     *
+     * @param requestBO
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/cz/saveOrder", method = RequestMethod.PUT)
+    public ResponseBean saveCzOrder(@RequestBody SaveCzOrderRequestBO requestBO, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.saveCzOrder(requestBO.getAmount(), getOrgId(request), getUserId(request), request.getRemoteAddr());
+        } catch (Exception e) {
+            logger.error("saveCzOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 创建退款订单
+     *
+     * @param requestBO
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/refund/saveOrder", method = RequestMethod.PUT)
+    public ResponseBean saveRefundOrder(@RequestBody SaveRefundOrderRequestBO requestBO, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.saveRefundOrder(requestBO.getAmount(), getOrgId(request), getUserId(request));
+        } catch (Exception e) {
+            logger.error("refundOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取充值订单列表
+     *
+     * @param pageNum       页码
+     * @param pageSize      分页大小
+     * @param payStartTime  支付开始时间
+     * @param payEndTime    支付结束时间
+     * @param orderId       订单编号
+     * @param tradeNo       交易号
+     * @param wxOrderId     微信订单编号
+     * @param isOffline     是否线下订单，true是，false否
+     * @param tradingStatus
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/cz/list", method = RequestMethod.GET)
+    public ResponseBean listCzOrderByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payStartTime,
+                                               @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payEndTime,
+                                               String orderId,
+                                               String tradeNo,
+                                               String wxOrderId,
+                                               Boolean isOffline,
+                                               String tradingStatus,
+                                               HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listCzOrderByCondition(pageNum, pageSize, payStartTime, payEndTime, orderId, tradeNo, wxOrderId, isOffline, tradingStatus, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("refundOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 导出充值订单列表
+     *
+     * @param payStartTime  支付开始时间
+     * @param payEndTime    支付结束时间
+     * @param orderId       订单编号
+     * @param tradeNo       交易号
+     * @param wxOrderId     微信订单编号
+     * @param isOffline     是否线下订单，true是，false否
+     * @param tradingStatus
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/cz/exportList", method = RequestMethod.GET)
+    public void exportCzOrderByCondition(@RequestParam(value = "payStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payStartTime,
+                                         @RequestParam(value = "payEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime payEndTime,
+                                         String orderId,
+                                         String tradeNo,
+                                         String wxOrderId,
+                                         Boolean isOffline,
+                                         String tradingStatus,
+                                         HttpServletRequest request,
+                                         HttpServletResponse response) throws Exception {
+        try {
+            iTaOrgOrderService.exportCzOrderByCondition(payStartTime, payEndTime, orderId, tradeNo, wxOrderId, isOffline, tradingStatus, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportCzOrderByCondition 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+    /**
+     * 获取退款订单列表
+     *
+     * @param pageNum         页码
+     * @param pageSize        分页大小
+     * @param refundStartTime 退款开始时间
+     * @param refundEndTime   退款结束时间
+     * @param orderId         订单编号
+     * @param auditStatus
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/refund/list", method = RequestMethod.GET)
+    public ResponseBean listRefundOrderByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundStartTime,
+                                                   @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundEndTime,
+                                                   String orderId,
+                                                   String wxOrderId,
+                                                   String tradeNo,
+                                                   String auditStatus,
+                                                   HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listRefundOrderByCondition(pageNum, pageSize, refundStartTime, refundEndTime, orderId, auditStatus, wxOrderId, tradeNo, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("refundOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 导出退款订单列表
+     *
+     * @param refundStartTime 退款开始时间
+     * @param refundEndTime   退款结束时间
+     * @param orderId         订单编号
+     * @param auditStatus     checking待审核，agree同意，unAgree 不同意
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/refund/exportList", method = RequestMethod.GET)
+    public void exportRefundOrderByCondition(@RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundStartTime,
+                                             @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime refundEndTime,
+                                             String orderId,
+                                             String wxOrderId,
+                                             String tradeNo,
+                                             String auditStatus,
+                                             HttpServletRequest request,
+                                             HttpServletResponse response) throws Exception {
+        try {
+            iTaOrgOrderService.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, auditStatus, wxOrderId, tradeNo, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportRefundOrderByCondition 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+    /**
+     * 获取消费订单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime     消费开始时间
+     * @param endTime       消费结束时间
+     * @param orderId       订单编号
+     * @param tradingStatus success:成功；fail:失败
+     * @param consumeType   消费方式，红包：redPacket
+     * @param phone         接收人手机号
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/listConsumeOrderByCondition", method = RequestMethod.GET)
+    public ResponseBean listConsumeOrderByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                                    @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
+                                                    String orderId,
+                                                    String wxOrderId,
+                                                    String tradeNo,
+                                                    String tradingStatus,
+                                                    String consumeType,
+                                                    String phone,
+                                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("listConsumeOrderByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 导出消费订单列表
+     *
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param tradingStatus success:成功；fail:失败
+     * @param consumeType
+     * @param phone
+     * @param request
+     * @param response
+     * @throws Exception
+     */
+    @RequestMapping(value = "/admin/orgOrder/exportConsumeOrderByCondition", method = RequestMethod.GET)
+    public void exportConsumeOrderByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                              @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
+                                              String orderId,
+                                              String wxOrderId,
+                                              String tradeNo,
+                                              String tradingStatus,
+                                              String consumeType,
+                                              String phone,
+                                              HttpServletRequest request,
+                                              HttpServletResponse response) throws Exception {
+        try {
+            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportConsumeOrderByCondition 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+    /**
+     * 根据订单号查询订单状态
+     *
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/getByInfo", method = RequestMethod.GET)
+    public ResponseBean getOrgOrderInfo(String orderId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaOrgOrder result = iTaOrgOrderService.getById(orderId);
+            if (result == null) {
+                responseBean.addError("fail");
+                return responseBean;
+            }
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            logger.error("getOrgOrderInfo 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderDetailController.java

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.redpack.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaOrgOrderDetail;
+import com.huiju.estateagents.redpack.service.ITaOrgOrderDetailService;
+
+/**
+ * <p>
+    * 组织订单明细  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrgOrderDetailController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgOrderDetailController.class);
+
+    @Autowired
+    public ITaOrgOrderDetailService iTaOrgOrderDetailService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taOrgOrderDetail",method= RequestMethod.GET)
+    public ResponseBean taOrgOrderDetailList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrgOrderDetail> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrgOrderDetail> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrgOrderDetail> result = iTaOrgOrderDetailService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgOrderDetailList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrgOrderDetail 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgOrderDetail",method= RequestMethod.POST)
+    public ResponseBean taOrgOrderDetailAdd(@RequestBody TaOrgOrderDetail taOrgOrderDetail){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgOrderDetailService.save(taOrgOrderDetail)){
+                responseBean.addSuccess(taOrgOrderDetail);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgOrderDetailAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrgOrderDetail/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrgOrderDetailDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrgOrderDetailService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgOrderDetailDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrgOrderDetail 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgOrderDetail/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgOrderDetailUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrgOrderDetail taOrgOrderDetail){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgOrderDetailService.updateById(taOrgOrderDetail)){
+                responseBean.addSuccess(taOrgOrderDetail);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgOrderDetailUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taOrgOrderDetail/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrgOrderDetailGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgOrderDetailService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgOrderDetailDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgRefundApplicationController.java

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.redpack.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
+import com.huiju.estateagents.redpack.service.ITaOrgRefundApplicationService;
+
+/**
+ * <p>
+    * 账户退款申请  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrgRefundApplicationController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgRefundApplicationController.class);
+
+    @Autowired
+    public ITaOrgRefundApplicationService iTaOrgRefundApplicationService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taOrgRefundApplication",method= RequestMethod.GET)
+    public ResponseBean taOrgRefundApplicationList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrgRefundApplication> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrgRefundApplication> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrgRefundApplication> result = iTaOrgRefundApplicationService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgRefundApplicationList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrgRefundApplication 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgRefundApplication",method= RequestMethod.POST)
+    public ResponseBean taOrgRefundApplicationAdd(@RequestBody TaOrgRefundApplication taOrgRefundApplication){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgRefundApplicationService.save(taOrgRefundApplication)){
+                responseBean.addSuccess(taOrgRefundApplication);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgRefundApplicationAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrgRefundApplication/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrgRefundApplicationDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrgRefundApplicationService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgRefundApplicationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrgRefundApplication 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrgRefundApplication/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgRefundApplicationUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrgRefundApplication taOrgRefundApplication){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgRefundApplicationService.updateById(taOrgRefundApplication)){
+                responseBean.addSuccess(taOrgRefundApplication);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgRefundApplicationUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taOrgRefundApplication/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrgRefundApplicationGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgRefundApplicationService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgRefundApplicationDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketClientController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaRedPacketClient;
+import com.huiju.estateagents.redpack.service.ITaRedPacketClientService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 红包客户端消息配置  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaRedPacketClientController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRedPacketClientController.class);
+
+    @Autowired
+    public ITaRedPacketClientService iTaRedPacketClientService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRedPacketClient",method= RequestMethod.GET)
+    public ResponseBean taRedPacketClientList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRedPacketClient> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRedPacketClient> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRedPacketClient> result = iTaRedPacketClientService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketClientList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRedPacketClient 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRedPacketClient",method= RequestMethod.POST)
+    public ResponseBean taRedPacketClientAdd(@RequestBody TaRedPacketClient taRedPacketClient){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketClientService.save(taRedPacketClient)){
+                responseBean.addSuccess(taRedPacketClient);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketClientAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRedPacketClient/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRedPacketClientDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRedPacketClientService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketClientDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRedPacketClient 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRedPacketClient/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRedPacketClientUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRedPacketClient taRedPacketClient){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketClientService.updateById(taRedPacketClient)){
+                responseBean.addSuccess(taRedPacketClient);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketClientUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRedPacketClient/{id}",method= RequestMethod.GET)
+    public ResponseBean taRedPacketClientGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRedPacketClientService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketClientDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketController.java

@@ -0,0 +1,316 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
+import com.huiju.estateagents.redpack.entity.TaRedPacket;
+import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
+import com.huiju.estateagents.redpack.service.ITaRedPacketService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 红包助力活动  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRedPacketController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRedPacketController.class);
+
+    @Autowired
+    public ITaRedPacketService iTaRedPacketService;
+
+    @Autowired
+    private ITaOrgOrderService iTaOrgOrderService;
+
+    @Autowired
+    private ITaRedPacketPersonService iTaRedPacketPersonService;
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/listByCondition", method = RequestMethod.GET)
+    public ResponseBean taRedPacketList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaRedPacket> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRedPacket> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRedPacket> result = iTaRedPacketService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taRedPacket 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/save", method = RequestMethod.POST)
+    public ResponseBean taRedPacketAdd(@RequestBody TaRedPacket taRedPacket) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketService.save(taRedPacket)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("taRedPacketAdd -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taRedPacket/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRedPacketDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param taRedPacket 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/update", method = RequestMethod.PUT)
+    public ResponseBean taRedPacketUpdate(@RequestBody TaRedPacket taRedPacket,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketService.updateRedPacket(taRedPacket,getOrgId(request));
+        } catch (Exception e) {
+            logger.error("taRedPacketUpdate -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/redPacket/{id}", method = RequestMethod.GET)
+    public ResponseBean taRedPacketGet(@PathVariable String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaRedPacket record = iTaRedPacketService.getById(id);
+            if (record != null) {
+                record = iTaRedPacketService.getRedPacketImages(record);
+                responseBean.addSuccess(record);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            logger.error("taRedPacketDelete -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询红包发送记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orderId
+     * @param wxOrderId
+     * @param tradeNo
+     * @param phone
+     * @param tradingStatus
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/listSendRecord", method = RequestMethod.GET)
+    public ResponseBean listSendRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       String activityId,
+                                       String orderId,
+                                       String wxOrderId,
+                                       String tradeNo,
+                                       String phone,
+                                       String tradingStatus,
+                                       HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listRedPacketRecords(pageNum, pageSize, phone, activityId, orderId, wxOrderId, tradeNo, tradingStatus, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("listSendRecord -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取红包排行榜
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param activityId
+     * @param phone
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/getRedPacketRankingList", method = RequestMethod.GET)
+    public ResponseBean getRedPacketRankingList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                String activityId,
+                                                String phone,
+                                                HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketPersonService.getRedPacketRankingList(pageNum, pageSize, activityId, phone, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getRedPacketRankingList -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 导出红包排行榜
+     *
+     * @param activityId
+     * @param phone
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/admin/redPacket/exportRedPacketRankingList", method = RequestMethod.GET)
+    public void exportRedPacketRankingList(String activityId,
+                                           String phone,
+                                           HttpServletRequest request,
+                                           HttpServletResponse response) throws Exception {
+        try {
+            iTaRedPacketPersonService.exportRedPacketRankingList(activityId, phone, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportRefundOrderByCondition 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+    /**
+     * 查询客户访问数据
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone 分享人手机号
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/listVisitRecordByCondition", method = RequestMethod.GET)
+    public ResponseBean listVisitRecordByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
+                                                   String drainageId,
+                                                   String phone,
+                                                   String sharePersonPhone,
+                                                   HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketService.listVisitRecordByCondition(pageNum, pageSize, startTime, endTime, drainageId, phone, sharePersonPhone, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("listVisitRecordByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 导出客户访问数据
+     *
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/exportVisitRecordByCondition", method = RequestMethod.GET)
+    public void exportVisitRecordByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+                                             @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime,
+                                             String drainageId,
+                                             String phone,
+                                             String sharePersonPhone,
+                                             HttpServletRequest request,
+                                             HttpServletResponse response) throws Exception {
+        try {
+            iTaRedPacketService.exportVisitRecordByCondition(startTime, endTime, drainageId, phone, sharePersonPhone, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("exportVisitRecordByCondition 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketHelpController.java

@@ -0,0 +1,145 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaRedPacketHelp;
+import com.huiju.estateagents.redpack.service.ITaRedPacketHelpService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 红包助力设置  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRedPacketHelpController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRedPacketHelpController.class);
+
+    @Autowired
+    public ITaRedPacketHelpService iTaRedPacketHelpService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/taRedPacketHelp", method = RequestMethod.GET)
+    public ResponseBean taRedPacketHelpList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaRedPacketHelp> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRedPacketHelp> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRedPacketHelp> result = iTaRedPacketHelpService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketHelpList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taRedPacketHelp 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/help/save", method = RequestMethod.POST)
+    public ResponseBean taRedPacketHelpAdd(@RequestBody TaRedPacketHelp taRedPacketHelp) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketHelpService.save(taRedPacketHelp)) {
+                responseBean.addSuccess(taRedPacketHelp);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketHelpAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taRedPacketHelp/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRedPacketHelpDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketHelpService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketHelpDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id              实体ID
+     * @param taRedPacketHelp 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/help/{id}", method = RequestMethod.PUT)
+    public ResponseBean taRedPacketHelpUpdate(@RequestBody TaRedPacketHelp taRedPacketHelp) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketHelpService.updateRedPackHelp(taRedPacketHelp);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketHelpUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/redPacket/help/{id}", method = RequestMethod.GET)
+    public ResponseBean taRedPacketHelpGet(@PathVariable String id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketHelpService.getRedPacketHelpById(id,getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketHelpDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketHistoryController.java

@@ -0,0 +1,144 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaRedPacketHistory;
+import com.huiju.estateagents.redpack.service.ITaRedPacketHistoryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 红包助力人员列表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRedPacketHistoryController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRedPacketHistoryController.class);
+
+    @Autowired
+    public ITaRedPacketHistoryService iTaRedPacketHistoryService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/redPacket/history/list",method= RequestMethod.GET)
+    public ResponseBean taRedPacketHistoryList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               String phone){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRedPacketHistory> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRedPacketHistory> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRedPacketHistory> result = iTaRedPacketHistoryService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketHistoryList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRedPacketHistory 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRedPacketHistory",method= RequestMethod.POST)
+    public ResponseBean taRedPacketHistoryAdd(@RequestBody TaRedPacketHistory taRedPacketHistory){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketHistoryService.save(taRedPacketHistory)){
+                responseBean.addSuccess(taRedPacketHistory);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketHistoryAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRedPacketHistory/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRedPacketHistoryDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRedPacketHistoryService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketHistoryDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRedPacketHistory 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRedPacketHistory/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRedPacketHistoryUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRedPacketHistory taRedPacketHistory){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketHistoryService.updateById(taRedPacketHistory)){
+                responseBean.addSuccess(taRedPacketHistory);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketHistoryUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRedPacketHistory/{id}",method= RequestMethod.GET)
+    public ResponseBean taRedPacketHistoryGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRedPacketHistoryService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketHistoryDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketMoneyController.java

@@ -0,0 +1,146 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaRedPacketMoney;
+import com.huiju.estateagents.redpack.service.ITaRedPacketMoneyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 红包金额设置  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRedPacketMoneyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRedPacketMoneyController.class);
+
+    @Autowired
+    public ITaRedPacketMoneyService iTaRedPacketMoneyService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/taRedPacketMoney", method = RequestMethod.GET)
+    public ResponseBean taRedPacketMoneyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaRedPacketMoney> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRedPacketMoney> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRedPacketMoney> result = iTaRedPacketMoneyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketMoneyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taRedPacketMoney 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taRedPacketMoney", method = RequestMethod.POST)
+    public ResponseBean taRedPacketMoneyAdd(@RequestBody TaRedPacketMoney taRedPacketMoney) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketMoneyService.save(taRedPacketMoney)) {
+                responseBean.addSuccess(taRedPacketMoney);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketMoneyAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taRedPacketMoney/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRedPacketMoneyDelete(@PathVariable String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketMoneyService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketMoneyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id               实体ID
+     * @param taRedPacketMoney 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/redPacket/money/{id}", method = RequestMethod.PUT)
+    public ResponseBean taRedPacketMoneyUpdate(@PathVariable("id") String id, @RequestBody TaRedPacketMoney taRedPacketMoney) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taRedPacketMoney.setActivityId(id);
+            responseBean = iTaRedPacketMoneyService.updateRedPacketMoney(taRedPacketMoney);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketMoneyUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/redPacket/money/{id}", method = RequestMethod.GET)
+    public ResponseBean taRedPacketMoneyGet(@PathVariable String id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaRedPacketMoneyService.getRedPacketMoneyById(id, getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taRedPacketMoneyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketPersonController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.redpack.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaRedPacketPerson;
+import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 红包助力报名表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRedPacketPersonController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRedPacketPersonController.class);
+
+    @Autowired
+    public ITaRedPacketPersonService iTaRedPacketPersonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/redPacket/person/list",method= RequestMethod.GET)
+    public ResponseBean taRedPacketPersonList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRedPacketPerson> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRedPacketPerson> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRedPacketPerson> result = iTaRedPacketPersonService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketPersonList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRedPacketPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRedPacketPerson",method= RequestMethod.POST)
+    public ResponseBean taRedPacketPersonAdd(@RequestBody TaRedPacketPerson taRedPacketPerson){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketPersonService.save(taRedPacketPerson)){
+                responseBean.addSuccess(taRedPacketPerson);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketPersonAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRedPacketPerson/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRedPacketPersonDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRedPacketPersonService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketPersonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRedPacketPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRedPacketPerson/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRedPacketPersonUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRedPacketPerson taRedPacketPerson){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRedPacketPersonService.updateById(taRedPacketPerson)){
+                responseBean.addSuccess(taRedPacketPerson);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketPersonUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRedPacketPerson/{id}",method= RequestMethod.GET)
+    public ResponseBean taRedPacketPersonGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRedPacketPersonService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRedPacketPersonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/redpack/entity/ConsumeOrder.java

@@ -0,0 +1,68 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class ConsumeOrder {
+    /**
+     * 订单编号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+    /**
+     * 消费组织
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费组织", index = 1)
+    private String miniAppName;
+
+    /**
+     * 消费金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费金额", index = 2)
+    private String amount;
+
+    /**
+     * 消费方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费方式", index = 3)
+    private String consumeType;
+
+    /**
+     * 活动名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动名称", index = 4)
+    private String activityName;
+
+    /**
+     * 消费下单时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费下单时间", index = 5)
+    private String createDate;
+
+    /**
+     * 接收人手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "接收人手机号", index = 6)
+    private String phone;
+
+    /**
+     * 消费状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费状态", index = 7)
+    private String tradingStatus;
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/OrgAccountExport.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class OrgAccountExport {
+    /**
+     * 账户
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "账户", index = 0)
+    private String miniAppName;
+
+    /**
+     * 总充值金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "总充值金额", index = 1)
+    private String totalRecharge;
+
+    /**
+     * 消费金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "消费金额", index = 2)
+    private String consumeAmount;
+
+    /**
+     * 已退款金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "已退款金额", index = 3)
+    private String refundAmount;
+
+    /**
+     * 余额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "余额", index = 4)
+    private String balance;
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/RechargeOrder.java

@@ -0,0 +1,60 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class RechargeOrder {
+    /**
+     * 订单编号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+    /**
+     * 充值组织
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值组织", index = 1)
+    private String miniAppName;
+
+    /**
+     * 充值金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值金额", index = 2)
+    private String amount;
+
+    /**
+     * 充值方式
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值方式", index = 3)
+    private String isOffline;
+
+    /**
+     * 下单时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "下单时间", index = 4)
+    private String createDate;
+
+    /**
+     * 充值状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "充值状态", index = 5)
+    private String tradingStatus;
+
+    /**
+     * 支付时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "支付时间", index = 6)
+    private String payDate;
+}

src/main/java/com/huiju/estateagents/redpack/entity/RefundOrder.java

@@ -0,0 +1,54 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Data;
+
+@Data
+public class RefundOrder {
+    /**
+     * 订单编号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String tradeNo;
+
+    /**
+     * 退款组织
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款组织", index = 1)
+    private String miniAppName;
+
+    /**
+     * 退款金额
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款金额", index = 2)
+    private String amount;
+
+    /**
+     * 退款创建时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款创建时间", index = 3)
+    private String createDate;
+
+    /**
+     * 退款状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "退款状态", index = 4)
+    private String auditStatus;
+
+    /**
+     * 驳回原因
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "驳回原因", index = 5)
+    private String auditResult;
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaH5Images.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * H5图片列表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaH5Images implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 活动类型 RedPacket红包
+     */
+    private String activityType;
+
+    /**
+     * 活动ID
+     */
+    private String activityId;
+
+    /**
+     * 图片类型 活动类型+dot+图片类型
+     */
+    private String imageType;
+
+    /**
+     * 图片地址
+     */
+    private String imageUrl;
+
+    /**
+     * 排序
+     */
+    private Integer sortNo;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaH5Template.java

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.UUID;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * H5模板 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaH5Template implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板ID
+     */
+    @TableId(value = "h5_template_id", type = IdType.UUID)
+    private String h5TemplateId;
+
+    /**
+     * 模板名称
+     */
+    private String name;
+
+    /**
+     * 活动类型 RedPacket红包
+     */
+    private String activityType;
+
+    /**
+     * 活动样例
+     */
+    private String activityId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 活动地址
+     */
+    private String activityUrl;
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaMpMiniapp.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.redpack.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 公众号小程序账户映射 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMpMiniapp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 公众号人员ID
+     */
+    private String mpPersonId;
+
+    /**
+     * 小程序人员ID
+     */
+    private String miniappPersonId;
+
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaMpPerson.java

@@ -0,0 +1,89 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 公众号用户表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMpPerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 人员ID
+     */
+    @TableId(value = "mp_person_id", type = IdType.UUID)
+    private String mpPersonId;
+
+    /**
+     * openid
+     */
+    private String mpOpenid;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String headimgurl;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 国家
+     */
+    private String country;
+
+    /**
+     * unionid
+     */
+    private String unionid;
+
+    /**
+     * 公众号ID
+     */
+    private String appid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgAccount.java

@@ -0,0 +1,123 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 系统账户表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgAccount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账户ID
+     */
+    @TableId(value = "account_id", type = IdType.UUID)
+    private String accountId;
+
+    /**
+     * 组织ID
+     */
+    private Integer orgId;
+
+    /**
+     * 可用余额 单位分
+     */
+    private Integer availableBalance;
+
+    /**
+     * 实际余额 单位分
+     */
+    private Integer realBalance;
+
+    /**
+     * 已消费 单位分
+     */
+    private Integer purchaseAmount;
+
+    /**
+     * 累计退费 单位分
+     */
+    private Integer totalRefund;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime modifyDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 小程序名称
+     */
+    private String miniappName;
+
+
+    /**
+     * 充值凭证
+     */
+    @TableField(exist = false)
+    private List<String> certificateList;
+
+    /**
+     * 充值金额
+     */
+    @TableField(exist = false)
+    private String rechargeAmount;
+
+    /**
+     * 退费金额
+     */
+    @TableField(exist = false)
+    private String refundAmount;
+
+    /**
+     * 退款冻结金额
+     */
+    @TableField(exist = false)
+    private Integer refundBlockedAmount;
+
+    /**
+     * 代理商名称
+     */
+    @TableField(exist = false)
+    private String channelProxyName;
+
+    /**
+     * 总充值金额
+     */
+    @TableField(exist = false)
+    private Integer totalRechargeAmount;
+
+    /**
+     * 公司/组织名称
+     */
+    @TableField(exist = false)
+    private String orgName;
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgAccountBlocked.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 账户冻结记录 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgAccountBlocked implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 账户ID
+     */
+    private String accountId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 冻结金额 单位分
+     */
+    private Integer blockedBalance;
+
+    /**
+     * 冻结理由
+     */
+    private String blockedReason;
+
+    /**
+     * 冻结时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgAccountCertificate.java

@@ -0,0 +1,88 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 账户相关凭证 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgAccountCertificate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 凭证ID
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 账户ID
+     */
+    private String accountId;
+
+    /**
+     * 账户流水ID
+     */
+    private Integer accountSerialNo;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 关联用处 充值,退费
+     */
+    private String consumptionType;
+
+    /**
+     * 凭证说明
+     */
+    private String remark;
+
+    /**
+     * 凭证地址
+     */
+    private String url;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 上传人
+     */
+    private Integer userId;
+
+    /**
+     * 上传人名称
+     */
+    private String userName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgAccountDetailedList.java

@@ -0,0 +1,83 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 账户消费流水 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgAccountDetailedList implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 账户ID
+     */
+    private String accountId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 发生额 单位分
+     */
+    private Integer amount;
+
+    /**
+     * 发生类型 1收入,-1支出
+     */
+    private Integer signType;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 说明
+     */
+    private String remark;
+
+    /**
+     * 消费时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 操作人ID
+     */
+    private Integer userId;
+
+    /**
+     * 操作人名称
+     */
+    private String userName;
+
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgOrder.java

@@ -0,0 +1,175 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 组织订单表
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单ID
+     */
+    @TableId(value = "order_id", type = IdType.UUID)
+    private String orderId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 交易号
+     */
+    private String tradeNo;
+
+    /**
+     * 发生金额 单位分
+     */
+    private Integer amount;
+
+    /**
+     * 发生时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expiryDate;
+
+    /**
+     * 支付时间
+     */
+    private LocalDateTime payDate;
+
+    /**
+     * 微信订单ID
+     */
+    private String wxOrderId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态 记录是否有效
+     */
+    private Integer status;
+
+    /**
+     * 交易状态 进行中,成功,失败
+     */
+    private String tradingStatus;
+
+    /**
+     * 线下操作
+     */
+    private Boolean isOffline;
+
+    /**
+     * 下单人
+     */
+    private Integer userId;
+
+    /**
+     * 下单人名称
+     */
+    private String userName;
+
+    @TableField(exist = false)
+    private String miniAppName;
+
+    @TableField(exist = false)
+    private String certificateUrl;
+
+    @TableField(exist = false)
+    private List<String> certificateUrlList;
+
+    @TableField(exist = false)
+    private List<TaOrgAccountCertificate> certificateList;
+
+    @TableField(exist = false)
+    private String auditStatus;
+
+    @TableField(exist = false)
+    private String auditResult;
+
+    @TableField(exist = false)
+    private String phone;
+
+    /**
+     * 接收红包人昵称
+     */
+    @TableField(exist = false)
+    private String nickname;
+
+    /**
+     * 子订单金额
+     */
+    @TableField(exist = false)
+    private String detailAmount;
+
+    /**
+     * 接受红包人头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
+
+    /**
+     * 消费方式
+     */
+    @TableField(exist = false)
+    private String consumeType;
+
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
+
+    /**
+     * 账户实际余额
+     */
+    @TableField(exist = false)
+    private Integer realBalance;
+
+    /**
+     * 账户可用余额
+     */
+    @TableField(exist = false)
+    private Integer availableBalance;
+
+    /**
+     * 实付金额
+     */
+    private Integer realAmount;
+
+    /**
+     * 用户姓名
+     */
+    @TableField(exist = false)
+    private String name;
+
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgOrderDetail.java

@@ -0,0 +1,95 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 组织订单明细 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgOrderDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 明细ID
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 明细类型 充值,退费,红包
+     */
+    private String itemType;
+
+    /**
+     * 关联对象 比如活动
+     */
+    private String targetType;
+
+    /**
+     * 对象ID
+     */
+    private String targetId;
+
+    /**
+     * 单价 单位分
+     */
+    private Integer unitPrice;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 金额 单位分
+     */
+    private Integer amount;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 接收人(小程序) 红包接收人
+     */
+    private String receiverId;
+
+    /**
+     * 接收人名称
+     */
+    private String receiverName;
+
+    /**
+     * 接收人公众号
+     */
+    private String receiverMpId;
+
+    /**
+     * 实付金额
+     */
+    private Integer realAmount;
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgRefundApplication.java

@@ -0,0 +1,103 @@
+package com.huiju.estateagents.redpack.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 账户退款申请 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgRefundApplication implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 申请ID
+     */
+    @TableId(value = "refund_id", type = IdType.UUID)
+    private String refundId;
+
+    /**
+     * 申请公司
+     */
+    private Integer orgId;
+
+    /**
+     * 申请人
+     */
+    private Integer userId;
+
+    /**
+     * 申请人名称
+     */
+    private String userName;
+
+    /**
+     * 申请原因
+     */
+    private String reason;
+
+    /**
+     * 退款金额
+     */
+    private Integer amount;
+
+    /**
+     * 审核人
+     */
+    private Integer auditorId;
+
+    /**
+     * 审核人名称
+     */
+    private String auditorName;
+
+    /**
+     * 审核状态 未审核,同意,不同意
+     */
+    private String auditStatus;
+
+    /**
+     * 审核意见
+     */
+    private String auditResult;
+
+    /**
+     * 订单ID
+     */
+    private String orderId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 冻结ID
+     */
+    private Integer blockedId;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    @TableField(exist = false)
+    private List<String> certificateList;
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaRedPacket.java

@@ -0,0 +1,157 @@
+package com.huiju.estateagents.redpack.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 红包助力活动
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRedPacket implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动ID
+     */
+    @TableId(value = "activity_id", type = IdType.UUID)
+    private String activityId;
+
+    /**
+     * 活动名称
+     */
+    private String name;
+
+    /**
+     * 活动开始时间
+     */
+    private LocalDateTime startDate;
+
+    /**
+     * 活动结束时间
+     */
+    private LocalDateTime endDate;
+
+    /**
+     * 活动结束提示
+     */
+    private String activityEndTip;
+
+    /**
+     * qrcode
+     */
+    private String qrcode;
+
+    /**
+     * 上榜人数限制
+     */
+    private Integer topLimitPersons;
+
+    /**
+     * 查看楼盘按钮位置 index首页,help助力页,rule规则页,多个逗号连接
+     */
+    private String buildingShowPos;
+
+    /**
+     * 关联楼盘
+     */
+    private String buildingId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 生成海报按钮位置
+     */
+    private String posterShowPos;
+
+    /**
+     * 报名字段 json
+     */
+    private String joinFields;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 首页背景图
+     */
+    @TableField(exist = false)
+    private String indexBackgroundImg;
+
+    /**
+     * 分享海报图
+     */
+    @TableField(exist = false)
+    private String sharePosterImg;
+
+    /**
+     * 活动规则图
+     */
+    @TableField(exist = false)
+    private String activityRulesImg;
+
+    /**
+     * 助力页背景图
+     */
+    @TableField(exist = false)
+    private String helpBackgroundImg;
+
+    /**
+     * 排行榜背景图
+     */
+    @TableField(exist = false)
+    private String rankingBackgroundImg;
+
+    /**
+     * 红包助力配置
+     */
+    @TableField(exist = false)
+    private TaRedPacketHelp taRedPacketHelp;
+
+    /**
+     * 红包金额配置
+     */
+    @TableField(exist = false)
+    private TaRedPacketMoney taRedPacketMoney;
+
+    /**
+     * 红包客户端消息配置
+     */
+    @TableField(exist = false)
+    private TaRedPacketClient taRedPacketClient;
+
+    /**
+     * 模板表配置的活动ID
+     */
+    @TableField(exist = false)
+    private String templeActivityId;
+}