* bug 修复

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

@@ -99,4 +99,16 @@ public class TaDrainage implements Serializable {
     @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

@@ -6,13 +6,18 @@ 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;
@@ -51,6 +56,12 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
     @Autowired
     private ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private TaH5SampleMapper taH5SampleMapper;
+
+    @Autowired
+    private TaH5TemplateMapper taH5TemplateMapper;
+
     @Override
     public void updateDrainageToEnd() {
         taDrainageMapper.updateDrainageToEnd();
@@ -81,21 +92,33 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
         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();
-        logger.info("生成activityId为：" + activityId);
-        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/redpack/controller/TaRedPacketController.java

@@ -142,7 +142,7 @@ public class TaRedPacketController extends BaseController {
      * @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);

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

@@ -148,4 +148,10 @@ public class TaRedPacket implements Serializable {
      */
     @TableField(exist = false)
     private TaRedPacketClient taRedPacketClient;
+
+    /**
+     * 模板表配置的活动ID
+     */
+    @TableField(exist = false)
+    private String templeActivityId;
 }

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

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

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

@@ -36,6 +36,7 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
                           @Param("qrCode") String qrCode,
                           @Param("startDate") LocalDateTime startDate,
                           @Param("endDate") LocalDateTime endDate,
+                          @Param("templeActivityId") String templeActivityId,
                           @Param("orgId") Integer orgId);
 
     /**
@@ -44,7 +45,8 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
      * @param activityId
      * @return
      */
-    Integer initRedPacketHelp(@Param("activityId") String activityId);
+    Integer initRedPacketHelp(@Param("activityId") String activityId,
+                              @Param("templeActivityId") String templeActivityId);
 
     /**
      * 初始化红包客户端消息配置
@@ -52,7 +54,8 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
      * @param activityId
      * @return
      */
-    Integer initRedPacketClient(@Param("activityId") String activityId);
+    Integer initRedPacketClient(@Param("activityId") String activityId,
+                                @Param("templeActivityId") String templeActivityId);
 
     /**
      * 初始化红包金额配置
@@ -60,7 +63,8 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
      * @param activityId
      * @return
      */
-    Integer initRedPacketMoney(@Param("activityId") String activityId);
+    Integer initRedPacketMoney(@Param("activityId") String activityId,
+                               @Param("templeActivityId") String templeActivityId);
 
     /**
      * 初始化红包图片信息
@@ -68,7 +72,8 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
      * @param activityId
      * @return
      */
-    Integer initRedPacketImages(@Param("activityId") String activityId);
+    Integer initRedPacketImages(@Param("activityId") String activityId,
+                                @Param("templeActivityId") String templeActivityId);
 
     /**
      * 查询客户访问记录
@@ -92,7 +97,6 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
 
 
     /**
-     *
      * @param startTime
      * @param endTime
      * @param drainageId

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

@@ -5,19 +5,17 @@ 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.RedPacketRankingListExport;
 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;
@@ -51,26 +49,17 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
     @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;
     }

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

@@ -136,4 +136,9 @@ public class TaH5Sample implements Serializable {
      */
     @TableField(exist = false)
     private Integer demandNum;
+
+    /**
+     *  模板ID
+     */
+    private String h5TemplateId;
 }

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

@@ -34,7 +34,7 @@
         FROM
             ta_red_packet t2
         WHERE
-            activity_id = '1'
+            activity_id = #{templeActivityId}
     </insert>
 
     <insert id="initRedPacketHelp">
@@ -63,7 +63,7 @@
         FROM
             ta_red_packet_help t2
         WHERE
-            activity_id ='1'
+            activity_id =#{templeActivityId}
     </insert>
 
     <insert id="initRedPacketClient">
@@ -82,7 +82,7 @@
         FROM
             ta_red_packet_client t2
         WHERE
-            activity_id = '1'
+            activity_id = #{templeActivityId}
     </insert>
 
     <insert id="initRedPacketMoney">
@@ -98,7 +98,7 @@
         FROM
             ta_red_packet_money t2 
         WHERE
-            activity_id ='1'
+            activity_id =#{templeActivityId}
     </insert>
 
     <insert id="initRedPacketImages">
@@ -111,7 +111,7 @@
         FROM
             ta_h5_images t2
         WHERE
-            t2.activity_id = '1'
+            t2.activity_id = #{templeActivityId}
     </insert>
 
     <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaCustomerFrom">