Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/redpack/entity/TaOrgOrder.java

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

 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.TaPersonBuilding;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
 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;
     @Autowired
     public IExtendContentService iExtendContentService;
 
+    @Autowired
+    public ITaMpInfoService iTaMpInfoService;
+
     /**
      * 分页查询列表
      *
                                       HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaDrainageService.getById(id));
+            TaDrainage taDrainage = iTaDrainageService.getById(id);
+            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());

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

      */
     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/impl/TaDrainageServiceImpl.java

 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;
 
 @Service
 public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrainage> implements ITaDrainageService {
 
+    private Logger logger = LoggerFactory.getLogger(TaDrainageServiceImpl.class);
+
     @Autowired
     private TaDrainageMapper taDrainageMapper;
 
     @Autowired
     private ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private TaH5SampleMapper taH5SampleMapper;
+
+    @Autowired
+    private TaH5TemplateMapper taH5TemplateMapper;
+
     @Override
     public void updateDrainageToEnd() {
         taDrainageMapper.updateDrainageToEnd();
     public ResponseBean saveDrainage(TaDrainage taDrainage, Integer orgId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
-
         // 1.保存H5活动信息
         taDrainage.setOrgId(orgId);
         taDrainage.setCreateUser(userId);
         ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0", taDrainage.getDrainageId().toString()).replace("#1", "h5"), taMiniapp.getMiniappId());
         taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
 
-        // 3.初始化活动(红包)相关数据
-        String activityId = CommonUtils.getUUIDS();
-        TaRedPacket taRedPacket = new TaRedPacket();
-        taRedPacket.setOrgId(orgId);
-        taRedPacket.setActivityId(activityId);
-        taRedPacket.setName(taDrainage.getName());
-        taRedPacket.setCreateDate(LocalDateTime.now());
-        taRedPacket.setStartDate(LocalDateTime.now().plusDays(1));
-        taRedPacket.setEndDate(DateUtils.dayToLocalDateime(taDrainage.getEndDate()));
-        ResponseBean redResponse = iTaRedPacketService.initializeRedPacket(taRedPacket);
-        if (ResponseBean.CODE_SUCCESS != redResponse.getCode()) {
-            return redResponse;
+        // 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.setEndDate(DateUtils.dayToLocalDateime(taDrainage.getEndDate()));
+                    iTaRedPacketService.initializeRedPacket(taRedPacket);
+
+                    taDrainage.setActivityType(taH5Template.getActivityType());
+                    taDrainage.setActivityId(activityId);
+                }
+            }
         }
-        taDrainage.setActivityId(activityId);
         updateById(taDrainage);
 
         // 4.添加第三方appid和secretis

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

 
     @ColumnWidth(15)
     @ExcelProperty(value = "消费方式", index = 2)
-    private String a;
+    private String consumeType;
 
 
     @ColumnWidth(15)
     @ExcelProperty(value = "活动名称", index = 3)
-    private String b;
+    private String activityName;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "消费下单时间", index = 4)
-    private String c;
+    private String createDate;
 
 
     @ColumnWidth(15)
     @ExcelProperty(value = "接收人手机号码", index = 5)
-    private String d;
+    private String phone;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "消费状态", index = 5)
-    private String e;
+    private String consumeStatus;
 }

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

+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 avatarurl;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "昵称", index = 1)
+    private String nickname;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 2)
+    private String name;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 3)
+    private String phone;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 4)
+    private String createDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享人昵称", index = 5)
+    private String sharePersonNickName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享人手机号", index = 6)
+    private String sharePersonPhone;
+}

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

             "/api/notify",//微信支付所有回调放过
             "/api/refund/",//微信退款所有回调放过
             "/api/fadd/",//所有的法大大回调放过
-            "/api/third"
+            "/api/third",
+            "/api/third/redirect/"
     };
 
     /*

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

         }
     }
 
+    /**
+     * 获取消费订单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime   消费开始时间
+     * @param endTime     消费结束时间
+     * @param orderId     订单编号
+     * @param status      消费状态，1：成功，0：失败
+     * @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) LocalDate startTime,
+                                                    @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                                    String orderId,
+                                                    Integer status,
+                                                    String consumeType,
+                                                    String phone,
+                                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, status, consumeType, phone, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("listConsumeOrderByCondition -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 导出消费订单列表
+     *
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @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) LocalDate startTime,
+                                              @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
+                                              String orderId,
+                                              Integer status,
+                                              String consumeType,
+                                              String phone,
+                                              HttpServletRequest request,
+                                              HttpServletResponse response) throws Exception {
+        try {
+            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, 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));
+        }
+    }
+
 
 }

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

 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.LocalDate;
 import java.util.HashMap;
 import java.util.Map;
 
      * @param id 实体ID
      */
     @RequestMapping(value = "/admin/redPacket/{id}", method = RequestMethod.GET)
-    public ResponseBean taRedPacketGet(@PathVariable Integer id) {
+    public ResponseBean taRedPacketGet(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRedPacket record = iTaRedPacketService.getById(id);
             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) LocalDate startTime,
+                                                   @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate 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) LocalDate startTime,
+                                             @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate 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/entity/TaMpPerson.java

 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;
     /**
      * 人员ID
      */
+    @TableId(value = "mp_person_id", type = IdType.UUID)
     private String mpPersonId;
 
     /**

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

 
 /**
  * <p>
- * 组织订单表 
+ * 组织订单表
  * </p>
  *
  * @author fxf

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

      */
     @TableField(exist = false)
     private TaRedPacketClient taRedPacketClient;
+
+    /**
+     * 模板表配置的活动ID
+     */
+    @TableField(exist = false)
+    private String templeActivityId;
 }

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

 package com.huiju.estateagents.redpack.entity;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
     /**
      * 活动ID
      */
+    @TableId(value = "activity_id", type = IdType.UUID)
     private String activityId;
 
     /**

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

 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+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;
     /**
      * 活动ID
      */
+    @TableId(value = "activity_id", type = IdType.UUID)
     private String activityId;
 
     /**

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

 
 import java.io.Serializable;
 
+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;
     /**
      * 活动ID
      */
+    @TableId(value = "activity_id", type = IdType.UUID)
     private String activityId;
 
     /**

src/main/java/com/huiju/estateagents/redpack/mapper/TaH5TemplateMapper.java

 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.redpack.entity.TaH5Template;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
  * @since 2020-06-03
  */
 @Mapper
+@Component
 public interface TaH5TemplateMapper extends BaseMapper<TaH5Template> {
 
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java

 import java.time.LocalDate;
 import java.util.List;
 
+import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
 import org.apache.ibatis.annotations.Mapper;
                                            @Param("tradeNo") String tradeNo,
                                            @Param("status") Integer status,
                                            @Param("orgId") Integer orgId);
+
+    /**
+     * 查询消费订单列表
+     *
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @return
+     */
+    IPage<TaOrgOrder> listConsumeOrderByCondition(IPage<TaOrgOrder> page,
+                                                  @Param("startTime") LocalDate startTime,
+                                                  @Param("endTime") LocalDate endTime,
+                                                  @Param("orderId") String orderId,
+                                                  @Param("status") Integer status,
+                                                  @Param("consumeType") String consumeType,
+                                                  @Param("phone") String phone,
+                                                  @Param("orgId") Integer orgId);
+
+    /**
+     * 导出消费订单列表
+     *
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @return
+     */
+    List<AccountConsumeRecordExport> exportConsumeOrderByCondition(@Param("startTime") LocalDate startTime,
+                                                                   @Param("endTime") LocalDate endTime,
+                                                                   @Param("orderId") String orderId,
+                                                                   @Param("status") Integer status,
+                                                                   @Param("consumeType") String consumeType,
+                                                                   @Param("phone") String phone,
+                                                                   @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaRedPacketMapper.java

 package com.huiju.estateagents.redpack.mapper;
 
-import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
+import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
                           @Param("qrCode") String qrCode,
                           @Param("startDate") LocalDateTime startDate,
                           @Param("endDate") LocalDateTime endDate,
+                          @Param("templeActivityId") String templeActivityId,
                           @Param("orgId") Integer orgId);
 
     /**
      * @param activityId
      * @return
      */
-    Integer initRedPacketHelp(@Param("activityId") String activityId);
+    Integer initRedPacketHelp(@Param("activityId") String activityId,
+                              @Param("templeActivityId") String templeActivityId);
 
     /**
      * 初始化红包客户端消息配置
      * @param activityId
      * @return
      */
-    Integer initRedPacketClient(@Param("activityId") String activityId);
+    Integer initRedPacketClient(@Param("activityId") String activityId,
+                                @Param("templeActivityId") String templeActivityId);
 
     /**
      * 初始化红包金额配置
      * @param activityId
      * @return
      */
-    Integer initRedPacketMoney(@Param("activityId") String activityId);
+    Integer initRedPacketMoney(@Param("activityId") String activityId,
+                               @Param("templeActivityId") String templeActivityId);
 
     /**
      * 初始化红包图片信息
      * @param activityId
      * @return
      */
-    Integer initRedPacketImages(@Param("activityId") String activityId);
+    Integer initRedPacketImages(@Param("activityId") String activityId,
+                                @Param("templeActivityId") String templeActivityId);
+
+    /**
+     * 查询客户访问记录
+     *
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     * @return
+     */
+    IPage<TaCustomerFrom> listVisitRecordByCondition(IPage<TaCustomerFrom> page,
+                                                     @Param("startTime") LocalDate startTime,
+                                                     @Param("endTime") LocalDate endTime,
+                                                     @Param("drainageId") String drainageId,
+                                                     @Param("phone") String phone,
+                                                     @Param("sharePersonPhone") String sharePersonPhone,
+                                                     @Param("orgId") Integer orgId);
+
+
+    /**
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     * @return
+     */
+    List<RedPacketVisitRecordtExport> exportVisitRecordByCondition(@Param("startTime") LocalDate startTime,
+                                                                   @Param("endTime") LocalDate endTime,
+                                                                   @Param("drainageId") String drainageId,
+                                                                   @Param("phone") String phone,
+                                                                   @Param("sharePersonPhone") String sharePersonPhone,
+                                                                   @Param("orgId") Integer orgId);
+
 }

src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java

      * @param orgId
      * @return
      */
-    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone,String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId);
+    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId);
+
+    /**
+     * 获取消费订单列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @return
+     */
+    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status,
+                                             String consumeType, String phone, Integer orgId);
+
+    /**
+     * 导出消费订单列表
+     *
+     * @param startTime
+     * @param endTime
+     * @param orderId
+     * @param status
+     * @param consumeType
+     * @param phone
+     * @param orgId
+     * @param response
+     * @throws Exception
+     */
+    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId, HttpServletResponse response) throws Exception;
 }

src/main/java/com/huiju/estateagents/redpack/service/ITaRedPacketService.java

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
 
 /**
  * <p>
      * @param record
      * @return
      */
+    @Transactional
     ResponseBean initializeRedPacket(TaRedPacket record);
 
 
      */
     TaRedPacket getRedPacketImages(TaRedPacket record);
 
+
+    /**
+     * 查询客户访问记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     * @return
+     */
+    ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId);
+
+    /**
+     * 导出客户访问记录
+     *
+     * @param startTime
+     * @param endTime
+     * @param drainageId
+     * @param phone
+     * @param sharePersonPhone
+     * @param orgId
+     */
+    void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception;
+
+
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

 import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WxConfig;
 import com.huiju.estateagents.entity.TaWxPayConfig;
+import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
 import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
             return responseBean;
         }
 
-        // 3.创建账户腿狂申请表信息
+        // 3.创建账户退款申请表信息
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setOrgId(orgId);
         taOrgRefundApplication.setUserId(userId);
     }
 
     @Override
-    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize,String phone,String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId) {
+    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg,phone,activityId,orderId, wxOrderId, tradeNo, status, orgId));
+        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg, phone, activityId, orderId, wxOrderId, tradeNo, status, orgId));
         return responseBean;
     }
 
+    @Override
+    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, status, consumeType, phone, orgId));
+        return responseBean;
+    }
+
+    @Override
+    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId, HttpServletResponse response) throws Exception {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, orgId);
+        String fileName = URLEncoder.encode("消费订单", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), AccountConsumeRecordExport.class).sheet("消费订单").doWrite(records);
+    }
+
     /**
      * 获取每个小程序独立的微信账户
      *

src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketServiceImpl.java

 package com.huiju.estateagents.redpack.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 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.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.StringUtils;
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
 import com.huiju.estateagents.redpack.entity.TaH5Images;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
-import com.huiju.estateagents.redpack.entity.TaRedPacketHelp;
-import com.huiju.estateagents.redpack.mapper.*;
+import com.huiju.estateagents.redpack.mapper.TaH5ImagesMapper;
+import com.huiju.estateagents.redpack.mapper.TaRedPacketMapper;
 import com.huiju.estateagents.redpack.service.ITaRedPacketService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
     @Autowired
     private TaH5ImagesMapper taH5ImagesMapper;
 
-    @Autowired
-    private TaRedPacketHelpMapper taRedPacketHelpMapper;
-
-    @Autowired
-    private TaRedPacketClientMapper taRedPacketClientMapper;
-
-    @Autowired
-    private TaRedPacketMoneyMapper taRedPacketMoneyMapper;
-
     @Override
+    @Transactional
     public ResponseBean initializeRedPacket(TaRedPacket record) {
         ResponseBean responseBean = new ResponseBean();
 
         // 初始化数据
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getOrgId());
-        taRedPacketMapper.initRedPacketHelp(record.getActivityId());
-        taRedPacketMapper.initRedPacketClient(record.getActivityId());
-        taRedPacketMapper.initRedPacketMoney(record.getActivityId());
-        taRedPacketMapper.initRedPacketImages(record.getActivityId());
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(),record.getTempleActivityId(), record.getOrgId());
+        taRedPacketMapper.initRedPacketHelp(record.getActivityId(),record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketClient(record.getActivityId(),record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketMoney(record.getActivityId(),record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketImages(record.getActivityId(),record.getTempleActivityId());
         responseBean.addSuccess("success");
         return responseBean;
     }
         return record;
     }
 
+    @Override
+    public ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaCustomerFrom> pg = new Page<>(pageNum,pageSize);
+        responseBean.addSuccess(taRedPacketMapper.listVisitRecordByCondition(pg,startTime,endTime,drainageId,phone,sharePersonPhone,orgId));
+        return responseBean;
+    }
+
+    @Override
+    public void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId,String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        List<RedPacketVisitRecordtExport> records = taRedPacketMapper.exportVisitRecordByCondition(startTime,endTime,drainageId,phone,sharePersonPhone,orgId);
+        String fileName = URLEncoder.encode("客户数据", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), RedPacketVisitRecordtExport.class).sheet("客户数据").doWrite(records);
+    }
+
     /**
      * 保存/更新红包图片信息
      *

src/main/java/com/huiju/estateagents/sample/entity/TaH5Sample.java

      */
     @TableField(exist = false)
     private Integer demandNum;
+
+    /**
+     *  模板ID
+     */
+    private String h5TemplateId;
 }

src/main/java/com/huiju/estateagents/third/controller/WxRedpackController.java

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.redpack.entity.TaMpPerson;
 import com.huiju.estateagents.third.entity.TaMpInfo;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaMpInfoService;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
  * @author Edward
  */
 @AllArgsConstructor
-@Controller
+@RestController
 @RequestMapping("/api")
 public class WxRedpackController {
 
      * @return
      */
     @GetMapping("/third/redirect/{mpAppid}/greet")
-    public ResponseBean greetUser(@PathVariable String mpAppid, @RequestParam String code, @RequestParam String personId, HttpServletRequest request) {
+    public ResponseBean greetUser(@PathVariable String mpAppid, @RequestParam String code, @RequestParam String personId,@RequestParam(required = false) String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
-        TaMpPerson taMpPerson = new TaMpPerson();
+        Map<String,Object> map = new HashMap<>();
         try {
             //换取openid
             WxMpOAuth2AccessToken accessToken = wxService.oauth2getAccessToken(code);
-            WxMpUser user = wxService.oauth2getUserInfo(accessToken, null);
-
             //获取H5项目相关信息
-            String xAppid = request.getHeader("x-appid");
-             //获取小程序appid
-            String miniAppid = request.getHeader("appid");
+            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
+
+            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
+            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
+            if (null == taThirdPartyMiniappConfig){
+                return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
+            }
             //插入公众号人员信息并插入表
-            taMpPerson = iTaThirdPartyMiniappConfigService.newMpPerson(user, mpAppid, xAppid, miniAppid, personId);
+            map = iTaThirdPartyMiniappConfigService.newMpPerson(accessToken, mpAppid, taThirdPartyMiniappConfig.getTargetId(), sponsorPersonId, personId);
         } catch (WxErrorException e) {
-            e.printStackTrace();
+//            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
-        return ResponseBean.success(taMpPerson);
+        return ResponseBean.success(map);
     }
 
     private WxMpService getWxMpService() {
         //从数据库读取公众号信息
         QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        queryWrapper.eq("org_id", 0);
         List<TaMpInfo> mplist = iTaMpInfoService.list(queryWrapper);
 
         WxMpService service = new WxMpServiceImpl();
     /**
      * 我要参加 活动接口
      * @param mpAppid
-     * @param mpPersonId
+     * @param personId
      * @param request
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/participate")
-    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, HttpServletRequest request) {
+    public ResponseBean participateActivity(@PathVariable String mpAppid, @RequestParam String personId,@RequestParam String appid, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
         //获取H5项目相关信息
-        String xAppid = request.getHeader("x-appid");
         QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
 
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
+        taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
         if (null == taThirdPartyMiniappConfig){
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
         }
         try {
-            ResponseBean res = iTaThirdPartyMiniappConfigService.participateActivity(mpAppid,mpPersonId,taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            ResponseBean res = iTaThirdPartyMiniappConfigService.participateActivity(mpAppid,personId,taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
             return res;
         }catch (Exception e){
             e.printStackTrace();
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/help")
-    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, @RequestParam String parentMpPersonId ,HttpServletRequest request) {
+    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, @RequestParam String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
         }
         //获取H5项目相关信息
-        String xAppid = request.getHeader("x-appid");
         QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
 
-        taThirdPartyMiniappConfigQueryWrapper.eq("appid", xAppid);
+        taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
         if (null == taThirdPartyMiniappConfig){
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
         }
         try {
-            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, mpPersonId, parentMpPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, mpPersonId, sponsorPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
             return res;
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/third/service/ITaThirdPartyMiniappConfigService.java

 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.redpack.entity.TaMpPerson;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
+
+import java.util.Map;
 
 /**
  * <p>
 
 	/**
 	 * 创建公众号人员并关联上小程序人员
-	 * @param user
-	 * @param xAppid
-	 * @param miniAppid
+	 * @param accessToken
+	 * @param drainageId
+	 * @param sponsorPersonId
 	 * @param personId
 	 */
-	TaMpPerson newMpPerson(WxMpUser user, String mpAppid, String xAppid, String miniAppid, String personId);
+	Map<String,Object> newMpPerson(WxMpOAuth2AccessToken accessToken, String mpAppid, String drainageId, String sponsorPersonId, String personId);
 
 	/**
 	 * 参加活动生成参与记录等
 	 * @param mpAppid
-	 * @param mpPersonId
+	 * @param personId
 	 * @param targetId
 	 * @param orgId
 	 */
-	ResponseBean participateActivity(String mpAppid, String mpPersonId, String targetId, Integer orgId);
+	ResponseBean participateActivity(String mpAppid, String personId, String targetId, Integer orgId);
 
 	/**
 	 * 助力活动接口
 	 * @param mpAppid
 	 * @param mpPersonId
-	 * @param parentMpPersonId
+	 * @param sponsorPersonId
 	 * @param targetId
 	 * @param orgId
 	 * @return
 	 */
-	ResponseBean helpActivity(String mpAppid, String mpPersonId, String parentMpPersonId, String targetId, Integer orgId);
+	ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String targetId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.CommonUtils;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.mapper.TaThirdPartyMiniappConfigMapper;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.net.InetAddress;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
 	/**
 	 * 创建公众号人员并关联上小程序人员
 	 *
-	 * @param user
-	 * @param xAppid
-	 * @param miniAppid
+	 * @param accessToken
+	 * @param drainageId
+	 * @param sponsorPersonId
 	 * @param personId
 	 */
 	@Override
-	public TaMpPerson newMpPerson(WxMpUser user,String mpAppid, String xAppid, String miniAppid, String personId) {
+	public Map<String,Object> newMpPerson(WxMpOAuth2AccessToken accessToken, String mpAppid, String drainageId, String sponsorPersonId, String personId) {
+		Map<String,Object> map = new HashMap<>();
 		//查询这个人员是否存在
-		TaMpPerson mpPerson = taMpPersonMapper.selectOne(new QueryWrapper<TaMpPerson>().eq("mp_openid", user.getOpenId()));
+		TaMpPerson mpPerson = taMpPersonMapper.selectOne(new QueryWrapper<TaMpPerson>().eq("mp_openid", accessToken.getOpenId()));
 		//不存在就新建
 		if (null == mpPerson){
 			//新增入公众号人员表
 			TaMpPerson taMpPerson = new TaMpPerson();
 			taMpPerson.setAppid(mpAppid);
-			taMpPerson.setCity(user.getCity());
-			taMpPerson.setCountry(user.getCountry());
 			taMpPerson.setCreateDate(LocalDateTime.now());
-			taMpPerson.setHeadimgurl(user.getHeadImgUrl());
-			taMpPerson.setMpOpenid(user.getOpenId());
-			taMpPerson.setMpPersonId(personId);
-			taMpPerson.setNickname(user.getNickname());
-			taMpPerson.setProvince(user.getProvince());
-			taMpPerson.setSex(user.getSex());
+			taMpPerson.setMpOpenid(accessToken.getOpenId());
 			taMpPerson.setStatus(CommConstant.STATUS_NORMAL);
 			taMpPersonMapper.insert(taMpPerson);
 			mpPerson = taMpPerson;
 			taMpMiniappMapper.insert(taMpMiniapp);
 		}
 
-		return mpPerson;
+		//我的小程序信息
+		TaPerson minePerson = taPersonMapper.selectById(personId);
+		map.put("minePerson",minePerson);
+
+		//我要助力的人的小程序信息
+		if (StringUtils.isNotEmpty(sponsorPersonId)){
+			TaPerson parentPerson = taPersonMapper.selectById(sponsorPersonId);
+			map.put("parentPerson",parentPerson);
+		}
+
+		//第一步根据drainggeid查询出红包表对应的记录
+		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
+		//第二步查询出这个H5对应的活动
+		TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
+		//活动信息
+		map.put("taRedPacket",taRedPacket);
+
+		//是否我的红包助力报名信息
+		QueryWrapper<TaRedPacketPerson> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("activity_id",taRedPacket.getActivityId());
+		queryWrapper.eq("org_id",taRedPacket.getOrgId());
+		queryWrapper.eq("mp_person_id",taMpMiniapp.getMpPersonId());
+		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
+		TaRedPacketPerson mineRedPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
+		map.put("mineRedPacketPerson",mineRedPacketPerson);
+		//token
+		Map<Object, Object> tokenMap = new HashMap<>();
+		tokenMap.put("openId", accessToken.getOpenId());
+		tokenMap.put("orgId", taRedPacket.getOrgId());
+		tokenMap.put("personId", taMpMiniapp.getMiniappPersonId());//小程序的personid
+		map.put("token", JWTUtils.newTokenByMap(tokenMap));
+
+		return map;
 	}
 
 	/**
 	 * 参加活动生成参与记录等
 	 *
 	 * @param mpAppid 公众号appid
-	 * @param mpPersonId 公众号人员id
+	 * @param personId 小程序人员id
 	 * @param drainageId H5活动id
 	 * @param orgId 小程序id
 	 */
 	@Override
-	public ResponseBean participateActivity(String mpAppid, String mpPersonId, String drainageId, Integer orgId) {
+	public ResponseBean participateActivity(String mpAppid, String personId, String drainageId, Integer orgId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
 		}
 
 		//参与活动
-		TaRedPacketPerson taRedPacketPerson = saveRedPacketPerson(mpPersonId,taRedPacket,orgId);
+		TaRedPacketPerson taRedPacketPerson = saveRedPacketPerson(personId,taRedPacket,orgId);
 
 		return ResponseBean.success(taRedPacketPerson);
 	}
 
 	/**
 	 * 参与活动方法--悲观锁
-	 * @param mpPersonId
+	 * @param personId
 	 * @param taRedPacket
 	 * @param orgId
 	 */
-	private synchronized TaRedPacketPerson saveRedPacketPerson(String mpPersonId, TaRedPacket taRedPacket, Integer orgId) {
+	private synchronized TaRedPacketPerson saveRedPacketPerson(String personId, TaRedPacket taRedPacket, Integer orgId) {
 		//查看这个人绑定的小程序用户
-		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
+		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", personId));
 
 		//查看此人是否参加过活动如果参加过直接返回
 		QueryWrapper<TaRedPacketPerson> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("activity_id",taRedPacket.getActivityId());
 		queryWrapper.eq("org_id",orgId);
-		queryWrapper.eq("mp_person_id",mpPersonId);
+		queryWrapper.eq("mp_person_id",taMpMiniapp.getMpPersonId());
 		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
 		TaRedPacketPerson redPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
 		if (null != redPacketPerson){
 		taRedPacketPerson.setCreateDate(LocalDateTime.now());
 		taRedPacketPerson.setIsSignedUp(true);
 		taRedPacketPerson.setMiniappPersonId(taMpMiniapp.getMiniappPersonId());
-		taRedPacketPerson.setMpPersonId(mpPersonId);
+		taRedPacketPerson.setMpPersonId(taMpMiniapp.getMpPersonId());
 		taRedPacketPerson.setOrgId(orgId);
 		taRedPacketPersonMapper.insert(taRedPacketPerson);
 		return taRedPacketPerson;
 	 *
 	 * @param mpAppid 公众号appid
 	 * @param mpPersonId 公众号personId
-	 * @param parentMpPersonId 公众号被助力者的peisonId
+	 * @param sponsorPersonId 公众号发起人id
 	 * @param drainageId H5活动id
 	 * @param orgId 小程序id
 	 * @return
 	 */
 	@Override
-	public ResponseBean helpActivity(String mpAppid, String mpPersonId, String parentMpPersonId, String drainageId, Integer orgId) {
+	public ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String drainageId, Integer orgId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
 		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
 
 		//查询被助力者的绑定的小程序用户
-		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", parentMpPersonId));
+		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", sponsorPersonId));
 
 		//根据活动id查询这个活动的助力规则
 		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

             <if test = " payStartTime != null ">
                 AND t.pay_date &gt;= #{payStartTime}
             </if>
-            <if test = " payStartTime != null and">
-                AND t.pay_date &lt;= #{payStartTime}
+            <if test = " payEndTime != null ">
+                AND t.pay_date &lt;= #{payEndTime}
             </if>
             <if test = " tradingStatus != null">
                 AND t.trading_status = #{tradingStatus}
             <if test = " payStartTime != null ">
                 AND t.pay_date &gt;= #{payStartTime}
             </if>
-            <if test = " payStartTime != null and">
-                AND t.pay_date &lt;= #{payStartTime}
+            <if test = " payEndTime != null ">
+                AND t.pay_date &lt;= #{payEndTime}
             </if>
             <if test = " tradingStatus != null">
                 AND t.trading_status = #{tradingStatus}
 
     <select id="exportRefundOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport">
         SELECT
-
-        FROM            t.order_id,
-        t.amount,
-        t.create_date,
-        ( CASE t3.audit_status WHEN 'agree' THEN '已退款' WHEN 'unagree' THEN '已驳回' ELSE '已申请' END ) tradingStatus,
-        t3.audit_result
+            t.order_id,
+            t.amount,
+            t.create_date,
+            ( CASE t3.audit_status WHEN 'agree' THEN '已退款' WHEN 'unagree' THEN '已驳回' ELSE '已申请' END ) tradingStatus,
+            t3.audit_result
+        FROM
             ta_org_order t
         INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id AND t2.item_type = 'refund'
         LEFT JOIN ta_org_refund_application t3 ON t.order_id = t3.order_id
         ORDER BY
             t.create_date DESC
     </select>
+
+    <select id = "listConsumeOrderByCondition" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        SELECT
+            t.*,
+            t3.phone
+            <if test="consumeType == 'redPacket'">
+                ,t4.activity_name
+            </if>
+        FROM
+            ta_org_order t
+            INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
+                <if test="consumeType != null and consumeType != ''">
+                    AND t2.item_type = #{consumeType}
+                </if>
+            LEFT JOIN ta_person t3 on t2.receiver_id = t3.person_id
+            <if test="consumeType == 'redPacket'">
+                LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
+            </if>
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` >- 1
+            <if test = " orderId != null and orderId != ''">
+                AND t.order_id like concat( '%',#{orderId},'%')
+            </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
+            <if test = " startTime != null ">
+                AND t.create_date &gt;= #{startTime}
+            </if>
+            <if test = " entartTime != null and">
+                AND t.create_date &lt;= #{entartTime}
+            </if>
+            <if test = " status != null">
+                AND t2.status = #{status}
+            </if>
+            <if test = "phone != null and phone != ''">
+                AND t3.phone = #{phone}
+            </if>
+        ORDER BY
+            t.create_date DESC
+
+    </select>
+
+    <select id="exportConsumeOrderByCondition" resultType="com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport">
+        SELECT
+            t.order_id,
+            t.amount,
+            ( CASE t2.item_type WHEN 'redPacket' THEN '红包' ELSE '' END ) consumeType,
+            <if test="consumeType == 'redPacket'">
+                t4.activity_name,
+            </if>
+            t.create_date,
+            t3.phone,
+            ( CASE t2.STATUS WHEN 1 THEN '成功' WHEN 0 THEN '失败' ELSE '' END ) consumeStatus
+        FROM
+            ta_org_order t
+            INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
+                <if test="consumeType != null and consumeType != ''">
+                    AND t2.item_type = #{consumeType}
+                </if>
+            LEFT JOIN ta_person t3 ON t2.receiver_id = t3.person_id
+            <if test="consumeType == 'redPacket'">
+                LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
+            </if>
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` >- 1
+            <if test = " orderId != null and orderId != ''">
+                AND t.order_id like concat( '%',#{orderId},'%')
+            </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
+            <if test = " startTime != null ">
+                AND t.create_date &gt;= #{startTime}
+            </if>
+            <if test = " entartTime != null and">
+                AND t.create_date &lt;= #{entartTime}
+            </if>
+            <if test = " status != null">
+                AND t2.status = #{status}
+            </if>
+            <if test = "phone != null and phone != ''">
+                AND t3.phone = #{phone}
+            </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/redpack/TaRedPacketMapper.xml

         `building_name`,
         `poster_show_pos`,
         `join_fields`,
-        `org_id`,
-        `create_date`,
-        `status`
+        `org_id`
         ) SELECT
         #{activityId},
         #{name},
         `building_name`,
         `poster_show_pos`,
         `join_fields`,
-        #{orgId},
-        `create_date`,
-        `status`
+        #{orgId}
         FROM
             ta_red_packet t2
         WHERE
-            activity_id =1
+            activity_id = #{templeActivityId}
     </insert>
 
     <insert id="initRedPacketHelp">
         FROM
             ta_red_packet_help t2
         WHERE
-            activity_id =1
+            activity_id =#{templeActivityId}
     </insert>
 
     <insert id="initRedPacketClient">
            `activity_id`,
            `mch_name`,
             `blessing`,
-            'activity_name`,
+            `activity_name`,
             `remark`
          ) SELECT
             #{activityId},
         FROM
             ta_red_packet_client t2
         WHERE
-            activity_id = 1
+            activity_id = #{templeActivityId}
     </insert>
 
     <insert id="initRedPacketMoney">
         FROM
             ta_red_packet_money t2 
         WHERE
-            activity_id =1
+            activity_id =#{templeActivityId}
     </insert>
 
     <insert id="initRedPacketImages">
-        INSERT INTO ta_h5_sample ( `activity_type`, `activity_id`, `image_type`, `image_url`, `sort_no` ) SELECT
+        INSERT INTO ta_h5_images ( `activity_type`, `activity_id`, `image_type`, `image_url`, `sort_no` ) SELECT
             `activity_type`,
             #{activityId},
             `image_type`,
             `image_url`,
             `sort_no`
         FROM
-            ta_h5_sample t2
+            ta_h5_images t2
         WHERE
-            t2.activity_id = 1
+            t2.activity_id = #{templeActivityId}
     </insert>
 
+    <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
+        SELECT
+            t.*,
+            t2.nickname,
+            t2.NAME,
+            t2.avatarurl,
+            t2.phone,
+            t3.nickname sharePersonNickname,
+            t3.phone sharePersonPhone
+        FROM
+            ta_customer_from t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN ta_person t3 ON t.share_person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.target_type IN ( 'h5', 'dynamic' )
+            AND t.target_id = #{drainageId}
+            <if test = "startTime != null">
+                AND t.create_date &gt;= #{startTime}
+            </if>
+
+             <if test = "endTime != null">
+                 AND t.create_date &lt;= #{endTime}
+            </if>
+
+            <if test="sharePersonPhone != null and sharePersonPhone != ''">
+                AND t3.phone = #{sharePersonPhone}
+            </if>
+            <if test="phone != null and phone != ''">
+                AND t2.phone = #{phone}
+            </if>
+         ORDER BY
+            t.create_date desc
+    </select>
+
+    <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
+        SELECT
+        t.create_date
+        t2.nickname,
+        t2.NAME,
+        t2.avatarurl,
+        t2.phone,
+        t3.nickname sharePersonNickname,
+        t3.phone sharePersonPhone
+        FROM
+        ta_customer_from t
+        LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+        LEFT JOIN ta_person t3 ON t.share_person_id = t2.person_id
+        WHERE
+        t.org_id = #{orgId}
+        AND t.target_type IN ( 'h5', 'dynamic' )
+        AND t.target_id = #{drainageId}
+        <if test = "startTime != null">
+            AND t.create_date &gt;= #{startTime}
+        </if>
+
+        <if test = "endTime != null">
+            AND t.create_date &lt;= #{endTime}
+        </if>
+
+        <if test="sharePersonPhone != null and sharePersonPhone != ''">
+            AND t3.phone = #{sharePersonPhone}
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t2.phone = #{phone}
+        </if>
+        ORDER BY
+        t.create_date desc
+    </select>
+
 </mapper>