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

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

@@ -569,6 +569,11 @@ public class CommConstant {
      */
     public static final String LIVE = "live";
 
+    /**
+     * 红包类型标识
+     */
+    public static final String RED_PACKET = "RedPacket";
+
     /**
      * 系统参数  通知消息次时间间隔
      */
@@ -717,13 +722,11 @@ public class CommConstant {
 
     /**
      * 已经取消支付
-     *
      */
     public static final String PAY_STATUS_CANCEL = "cancel";
 
     /**
      * 支付超时
-     *
      */
     public static final String PAY_STATUS_TIMEOUT = "timeout";
 
@@ -826,7 +829,7 @@ 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 = "签章成功";
 
     /**
      * 审核通过

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.common;
 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;
 
@@ -23,6 +24,17 @@ public class CommonUtils {
         }
     }
 
+
+    /**
+     * 获取uuid
+     *
+     * @return
+     */
+    public static String getUUIDS() {
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        return uuid;
+    }
+
     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位随机数

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

@@ -12,7 +12,6 @@ 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.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
@@ -28,7 +27,6 @@ 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;
 
 
@@ -42,7 +40,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/api")
-public class TaDrainageController extends BaseController {
+public class    TaDrainageController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaDrainageController.class);
 
@@ -52,18 +50,9 @@ public class TaDrainageController extends BaseController {
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
-    @Autowired
-    private ITaDrainageRecordService iTaDrainageRecordService;
-
     @Autowired
     public IExtendContentService iExtendContentService;
 
-    @Autowired
-    private TaMiniappMapper taMiniappMapper;
-
-    @Autowired
-    private IMiniAppService miniAppService;
-
     /**
      * 分页查询列表
      *
@@ -143,36 +132,7 @@ public class TaDrainageController extends BaseController {
     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");
-            }
+            responseBean = iTaDrainageService.saveDrainage(taDrainage,getOrgId(request),getUserId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taDrainageAdd -=- {}", e.toString());
@@ -181,16 +141,6 @@ public class TaDrainageController extends BaseController {
         return responseBean;
     }
 
-    /**
-     * 获取uuid
-     *
-     * @return
-     */
-    private String getUUIDS() {
-        String uuid = UUID.randomUUID().toString().replace("-", "");
-        return uuid;
-    }
-
     /**
      * 根据id删除对象
      *

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,26 @@
 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.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.TaRedPacket;
+import com.huiju.estateagents.redpack.service.ITaRedPacketService;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
+import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 引流项目  服务实现类
@@ -21,8 +35,76 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
     @Autowired
     private TaDrainageMapper taDrainageMapper;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
+    @Autowired
+    private ITaRedPacketService iTaRedPacketService;
+
+    @Autowired
+    private ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
+
     @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.初始化活动(红包)相关数据
+        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;
+        }
+        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/redpack/controller/TaOrgAccountController.java

@@ -1,18 +1,5 @@
 package com.huiju.estateagents.redpack.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-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;
@@ -24,6 +11,13 @@ import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 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;
 
 /**
  * <p>
@@ -33,6 +27,7 @@ import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
  * @author fxf
  * @since 2020-06-03
  */
+@Slf4j
 @RestController
 @RequestMapping("/api")
 public class TaOrgAccountController extends BaseController {
@@ -244,4 +239,25 @@ public class TaOrgAccountController extends BaseController {
         }
         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/TaRedPacketController.java

@@ -14,14 +14,14 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 红包助力活动  前端控制器
-    * </p>
+ * 红包助力活动  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRedPacketController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRedPacketController.class);
@@ -32,25 +32,26 @@ public class TaRedPacketController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRedPacket",method= RequestMethod.GET)
-    public ResponseBean taRedPacketList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @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);
+            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){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketList -=- {}",e.toString());
+            logger.error("taRedPacketList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +59,21 @@ public class TaRedPacketController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taRedPacket 实体对象
      * @return
      */
-    @RequestMapping(value="/taRedPacket",method= RequestMethod.POST)
-    public ResponseBean taRedPacketAdd(@RequestBody TaRedPacket taRedPacket){
+    @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(taRedPacket);
-            }else {
+            if (iTaRedPacketService.save(taRedPacket)) {
+                responseBean.addSuccess("success");
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taRedPacketAdd -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("taRedPacketAdd -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +81,22 @@ public class TaRedPacketController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taRedPacket/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taRedPacketDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taRedPacket/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRedPacketDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaRedPacketService.removeById(id)){
+            if (iTaRedPacketService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketDelete -=- {}",e.toString());
+            logger.error("taRedPacketDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +104,17 @@ public class TaRedPacketController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
      * @param taRedPacket 实体对象
      * @return
      */
-    @RequestMapping(value="/taRedPacket/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRedPacketUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRedPacket taRedPacket){
+    @RequestMapping(value = "/admin/redPacket/update", method = RequestMethod.PUT)
+    public ResponseBean taRedPacketUpdate(@RequestBody TaRedPacket taRedPacket) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRedPacketService.updateById(taRedPacket)){
-                responseBean.addSuccess(taRedPacket);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taRedPacketUpdate -=- {}",e.toString());
+            responseBean = iTaRedPacketService.updateRedPacket(taRedPacket);
+        } catch (Exception e) {
+            logger.error("taRedPacketUpdate -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +122,22 @@ public class TaRedPacketController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taRedPacket/{id}",method= RequestMethod.GET)
-    public ResponseBean taRedPacketGet(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/redPacket/{id}", method = RequestMethod.GET)
+    public ResponseBean taRedPacketGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaRedPacketService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taRedPacketDelete -=- {}",e.toString());
+            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;

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

@@ -14,14 +14,14 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 红包助力设置  前端控制器
-    * </p>
+ * 红包助力设置  前端控制器
+ * </p>
  *
  * @author fxf
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRedPacketHelpController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRedPacketHelpController.class);
@@ -32,25 +32,26 @@ public class TaRedPacketHelpController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @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){
+    @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);
+            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){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketHelpList -=- {}",e.toString());
+            logger.error("taRedPacketHelpList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +59,22 @@ public class TaRedPacketHelpController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taRedPacketHelp 实体对象
      * @return
      */
-    @RequestMapping(value="/taRedPacketHelp",method= RequestMethod.POST)
-    public ResponseBean taRedPacketHelpAdd(@RequestBody TaRedPacketHelp taRedPacketHelp){
+    @RequestMapping(value = "/admin/redPacket/help/save", method = RequestMethod.POST)
+    public ResponseBean taRedPacketHelpAdd(@RequestBody TaRedPacketHelp taRedPacketHelp) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRedPacketHelpService.save(taRedPacketHelp)){
+            if (iTaRedPacketHelpService.save(taRedPacketHelp)) {
                 responseBean.addSuccess(taRedPacketHelp);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketHelpAdd -=- {}",e.toString());
+            logger.error("taRedPacketHelpAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +82,22 @@ public class TaRedPacketHelpController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taRedPacketHelp/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taRedPacketHelpDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taRedPacketHelp/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRedPacketHelpDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaRedPacketHelpService.removeById(id)){
+            if (iTaRedPacketHelpService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketHelpDelete -=- {}",e.toString());
+            logger.error("taRedPacketHelpDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +105,20 @@ public class TaRedPacketHelpController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id              实体ID
      * @param taRedPacketHelp 实体对象
      * @return
      */
-    @RequestMapping(value="/taRedPacketHelp/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/redPacket/help/{id}", method = RequestMethod.PUT)
     public ResponseBean taRedPacketHelpUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRedPacketHelp taRedPacketHelp){
+                                              @RequestBody TaRedPacketHelp taRedPacketHelp) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRedPacketHelpService.updateById(taRedPacketHelp)){
-                responseBean.addSuccess(taRedPacketHelp);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
+            responseBean = iTaRedPacketHelpService.updateRedPackHelp(taRedPacketHelp);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketHelpUpdate -=- {}",e.toString());
+            logger.error("taRedPacketHelpUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +126,17 @@ public class TaRedPacketHelpController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taRedPacketHelp/{id}",method= RequestMethod.GET)
-    public ResponseBean taRedPacketHelpGet(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/redPacket/help/{id}", method = RequestMethod.GET)
+    public ResponseBean taRedPacketHelpGet(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaRedPacketHelpService.getById(id));
-        }catch (Exception e){
+            responseBean = iTaRedPacketHelpService.getRedPacketHelpById(id);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRedPacketHelpDelete -=- {}",e.toString());
+            logger.error("taRedPacketHelpDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRedPacketMoneyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRedPacketMoneyController.class);
@@ -106,16 +106,12 @@ public class TaRedPacketMoneyController extends BaseController {
      * @param taRedPacketMoney 实体对象
      * @return
      */
-    @RequestMapping(value="/taRedPacketMoney/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/redPacket/money/{id}",method= RequestMethod.PUT)
     public ResponseBean taRedPacketMoneyUpdate(@PathVariable Integer id,
                                         @RequestBody TaRedPacketMoney taRedPacketMoney){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRedPacketMoneyService.updateById(taRedPacketMoney)){
-                responseBean.addSuccess(taRedPacketMoney);
-            }else {
-                responseBean.addError("fail");
-            }
+            responseBean = iTaRedPacketMoneyService.updateRedPacketMoney(taRedPacketMoney);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taRedPacketMoneyUpdate -=- {}",e.toString());
@@ -128,11 +124,11 @@ public class TaRedPacketMoneyController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taRedPacketMoney/{id}",method= RequestMethod.GET)
-    public ResponseBean taRedPacketMoneyGet(@PathVariable Integer id){
+    @RequestMapping(value="/admin/redPacket/money/{id}",method= RequestMethod.GET)
+    public ResponseBean taRedPacketMoneyGet(@PathVariable String id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaRedPacketMoneyService.getById(id));
+            responseBean = iTaRedPacketMoneyService.getRedPacketMoneyById(id);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taRedPacketMoneyDelete -=- {}",e.toString());

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

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-06-03
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRedPacketPersonController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRedPacketPersonController.class);
@@ -36,7 +36,7 @@ public class TaRedPacketPersonController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRedPacketPerson",method= RequestMethod.GET)
+    @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();

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

@@ -1,14 +1,18 @@
 package com.huiju.estateagents.redpack.entity;
 
-import java.time.LocalDateTime;
-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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
- * 红包助力活动 
+ * 红包助力活动
  * </p>
  *
  * @author fxf
@@ -24,6 +28,7 @@ public class TaRedPacket implements Serializable {
     /**
      * 活动ID
      */
+    @TableId(value = "activity_id", type = IdType.UUID)
     private String activityId;
 
     /**
@@ -96,5 +101,51 @@ public class TaRedPacket implements Serializable {
      */
     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;
 }

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

@@ -1,13 +1,16 @@
 package com.huiju.estateagents.redpack.entity;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 红包助力设置 
+ * 红包助力设置
  * </p>
  *
  * @author fxf
@@ -71,4 +74,22 @@ public class TaRedPacketHelp implements Serializable {
     private String limitForEachPersonIllegalTip;
 
 
+    /**
+     * 活动开始时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime startDate;
+
+    /**
+     * 活动结束时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime endDate;
+
+    /**
+     * 活动结束提示
+     */
+    @TableField(exist = false)
+    private String activityEndTip;
+
 }

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

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.redpack.entity;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -60,5 +62,9 @@ public class TaRedPacketMoney implements Serializable {
      */
     private String insufficientBalanceTip;
 
-
+    /**
+     * 红包客户端消息通知
+     */
+    @TableField(exist = false)
+    private TaRedPacketClient taRedPacketClient;
 }

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

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

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

@@ -3,8 +3,11 @@ package com.huiju.estateagents.redpack.mapper;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 红包助力活动  Mapper 接口
@@ -17,4 +20,48 @@ import org.springframework.stereotype.Component;
 @Component
 public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
 
+    /**
+     * 初始化红包基础配置信息
+     *
+     * @param activityId
+     * @return
+     */
+    Integer initRedPacket(@Param("activityId") String activityId,
+                          @Param("name") String name,
+                          @Param("qrCode") String qrCode,
+                          @Param("startDate") LocalDateTime startDate,
+                          @Param("endDate") LocalDateTime endDate,
+                          @Param("orgId") Integer orgId);
+
+    /**
+     * 初始化红包助力配置信息
+     *
+     * @param activityId
+     * @return
+     */
+    Integer initRedPacketHelp(@Param("activityId") String activityId);
+
+    /**
+     * 初始化红包客户端消息配置
+     *
+     * @param activityId
+     * @return
+     */
+    Integer initRedPacketClient(@Param("activityId") String activityId);
+
+    /**
+     * 初始化红包金额配置
+     *
+     * @param activityId
+     * @return
+     */
+    Integer initRedPacketMoney(@Param("activityId") String activityId);
+
+    /**
+     * 初始化红包图片信息
+     *
+     * @param activityId
+     * @return
+     */
+    Integer initRedPacketImages(@Param("activityId") String activityId);
 }

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

@@ -1,13 +1,13 @@
 package com.huiju.estateagents.redpack.service;
 
-import java.time.LocalDate;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  * 组织订单表  服务类
@@ -43,4 +43,12 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @return
      */
     IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 微信支付
+     * @param taOrgOrder
+     * @param remoteAddr
+     * @return
+     */
+    ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String remoteAddr) throws Exception;
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.redpack.service;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacketHelp;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaRedPacketHelpService extends IService<TaRedPacketHelp> {
 
+    /**
+     * 更行红包助力配置
+     *
+     * @param taRedPacketHelp
+     * @return
+     */
+    ResponseBean updateRedPackHelp(TaRedPacketHelp taRedPacketHelp);
+
+    /**
+     *
+     * @param activityId
+     * @return
+     */
+    ResponseBean getRedPacketHelpById(String activityId);
+
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.redpack.service;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaRedPacketMoney;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaRedPacketMoneyService extends IService<TaRedPacketMoney> {
 
+    ResponseBean getRedPacketMoneyById(String activityId);
+
+    ResponseBean updateRedPacketMoney(TaRedPacketMoney taRedPacketMoney);
+
 }

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

@@ -1,7 +1,8 @@
 package com.huiju.estateagents.redpack.service;
 
-import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaRedPacket;
 
 /**
  * <p>
@@ -13,4 +14,29 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaRedPacketService extends IService<TaRedPacket> {
 
+    /**
+     * 初始化红包信息
+     *
+     * @param record
+     * @return
+     */
+    ResponseBean initializeRedPacket(TaRedPacket record);
+
+
+    /**
+     * 更新红包信息
+     *
+     * @param taRedPacket
+     * @return
+     */
+    ResponseBean updateRedPacket(TaRedPacket taRedPacket);
+
+    /**
+     * 根据ID查询红包图片信息
+     *
+     * @param record
+     * @return
+     */
+    TaRedPacket getRedPacketImages(TaRedPacket record);
+
 }

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

@@ -1,15 +1,5 @@
 package com.huiju.estateagents.redpack.service.impl;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,21 +8,31 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.CommonUtils;
-import com.huiju.estateagents.redpack.entity.TaOrgAccount;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountCertificate;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
-import com.huiju.estateagents.redpack.entity.TaOrgOrder;
-import com.huiju.estateagents.redpack.entity.TaOrgOrderDetail;
-import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountCertificateMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgOrderDetailMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgRefundApplicationMapper;
+import com.huiju.estateagents.common.wxpay.WXPay;
+import com.huiju.estateagents.common.wxpay.WXPayConstants;
+import com.huiju.estateagents.common.wxpay.WxConfig;
+import com.huiju.estateagents.entity.TaWxPayConfig;
+import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
+import com.huiju.estateagents.redpack.entity.*;
+import com.huiju.estateagents.redpack.mapper.*;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,9 +42,13 @@ import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
  * @author fxf
  * @since 2020-06-03
  */
+@Slf4j
 @Service
 public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOrder> implements ITaOrgOrderService {
 
+    @Value("${pay-notify}")
+    private String payNotify;
+
     @Autowired
     private TaOrgAccountMapper taOrgAccountMapper;
 
@@ -69,6 +73,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TaWxPayConfigMapper taWxPayConfigMapper;
+
     @Override
     public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate) {
         IPage<TaOrgOrder> result = null;
@@ -84,6 +91,87 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         }
     }
 
+    /**
+     * 微信支付
+     *
+     * @param taOrgOrder
+     * @param clientIp
+     * @return
+     */
+    @Override
+    public ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String clientIp) throws Exception {
+        taOrgOrder = taOrgOrderMapper.selectById(taOrgOrder.getOrderId());
+        //构建微信配置
+        WxConfig config = getWxConfig(0);
+        WXPay wxpay = new WXPay(config);
+
+        //获取支付的钱数并且判断是自动锁房还是手动锁房,自动锁房需要锁定房源，手动锁房跳过
+        String payPrice = String.valueOf(taOrgOrder.getAmount());
+
+        //生成商户订单
+//        String tradeNo = CommonUtils.generateTradeNo("CJ");
+//        taOrgOrder.setTradeNo(tradeNo);
+
+        //下单
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("body", "微信支付");
+        //商品号唯一
+        data.put("out_trade_no", taOrgOrder.getTradeNo());
+        data.put("device_info", "");
+        data.put("fee_type", "CNY");
+        //金额 后台计算
+        data.put("total_fee", payPrice);
+        //终端IP
+        data.put("spbill_create_ip", clientIp);
+        //回调地址
+        data.put("notify_url", payNotify+CommConstant.ITEM_TYPE_RECHARGE);
+        // 此处指定为APP支付
+        data.put("trade_type", "NATIVE");
+        Map<String, String> resp = wxpay.unifiedOrder(data);
+        log.info("下单成功：{}", resp);
+        if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)){
+            throw new Exception(resp.get("err_code_des"));
+        }
+
+        return ResponseBean.success(resp.get("code_url"));
+    }
+
+    /**
+     * 获取每个小程序独立的微信账户
+     * @param orgId
+     * @return
+     */
+    private WxConfig getWxConfig(Integer orgId) throws Exception {
+        //根据orgId获取支付配置
+        QueryWrapper<TaWxPayConfig> taWxPayConfigQueryWrapper = new QueryWrapper<>();
+        taWxPayConfigQueryWrapper.eq("org_id",orgId);
+        TaWxPayConfig taWxPayConfig = taWxPayConfigMapper.selectOne(taWxPayConfigQueryWrapper);
+        if (null == taWxPayConfig){
+            throw new Exception("请先完善支付信息");
+        }
+        log.info("正在配置orgId为{}的微信支付参数，商户号为{}",orgId,taWxPayConfig.getMchId());
+        //把库里的值赋值给微信
+        URL urlConet = new URL(taWxPayConfig.getApiPath());
+        HttpURLConnection con = (HttpURLConnection)urlConet.openConnection();
+        con.setRequestMethod("GET");
+        con.setConnectTimeout(4 * 1000);
+        InputStream inStream = con .getInputStream();
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[2048];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+        inStream.close();
+
+        WxConfig config = new WxConfig();
+        config.setAppid(taWxPayConfig.getAppid());
+        config.setMachId(taWxPayConfig.getMchId());
+        config.setCertData(outStream.toByteArray());
+        config.setKey(taWxPayConfig.getMchKey());
+        return config;
+    }
+
     @Override
     @Transactional(rollbackFor = {RuntimeException.class})
     public ResponseBean refundOrder(String id, TaOrgRefundApplication refundApplication, Integer userId) {

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

@@ -1,11 +1,22 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.huiju.estateagents.redpack.entity.TaRedPacketHelp;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketHelpMapper;
 import com.huiju.estateagents.redpack.service.ITaRedPacketHelpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
 /**
  * <p>
  * 红包助力设置  服务实现类
@@ -17,4 +28,65 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMapper, TaRedPacketHelp> implements ITaRedPacketHelpService {
 
+    private Logger logger = LoggerFactory.getLogger(TaRedPacketServiceImpl.class);
+
+    @Autowired
+    private TaRedPacketHelpMapper taRedPacketHelpMapper;
+
+    @Autowired
+    private ITaRedPacketService iTaRedPacketService;
+
+    @Override
+    public ResponseBean updateRedPackHelp(TaRedPacketHelp taRedPacketHelp) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询红包(活动)开始时间
+        TaRedPacket taRedPacket = iTaRedPacketService.getById(taRedPacketHelp.getActivityId());
+        if (taRedPacket == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 校验活动是否开始
+        if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() > LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()
+                && (taRedPacketHelp.getHelpSuccesPersons() != null || taRedPacketHelp.getLimitNumPerDay() != null
+                || taRedPacketHelp.getLimitNumPerPerson() != null || taRedPacketHelp.getLimitNumForEachPerson() != null)) {
+            responseBean.addError("活动已开始，不可修改");
+            return responseBean;
+        }
+
+        // 更行助力配置表
+        Boolean updateResult = updateById(taRedPacketHelp);
+        if (!updateResult) {
+            responseBean.addError("fail");
+        }
+
+        // 更新红包(活动)基础信息
+        if (taRedPacket.getStartDate() != null || taRedPacket.getEndDate() != null || !StringUtils.isEmpty(taRedPacket.getActivityEndTip())) {
+            TaRedPacket record = new TaRedPacket();
+            record.setActivityId(taRedPacket.getActivityId());
+            record.setStartDate(taRedPacketHelp.getStartDate());
+            record.setEndDate(taRedPacketHelp.getEndDate());
+            record.setActivityEndTip(taRedPacketHelp.getActivityEndTip());
+            iTaRedPacketService.updateById(record);
+        }
+
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getRedPacketHelpById(String activityId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaRedPacketHelp taRedPacketHelp = getById(activityId);
+
+        // 获取红包基础信息
+        TaRedPacket taRedPacket = iTaRedPacketService.getById(activityId);
+        if (taRedPacket != null) {
+            taRedPacketHelp.setStartDate(taRedPacket.getStartDate());
+            taRedPacketHelp.setEndDate(taRedPacket.getEndDate());
+            taRedPacketHelp.setActivityEndTip(taRedPacket.getActivityEndTip());
+        }
+        responseBean.addSuccess(taRedPacket);
+        return responseBean;
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.redpack.entity.TaRedPacketClient;
 import com.huiju.estateagents.redpack.entity.TaRedPacketMoney;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketMoneyMapper;
+import com.huiju.estateagents.redpack.service.ITaRedPacketClientService;
 import com.huiju.estateagents.redpack.service.ITaRedPacketMoneyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,36 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMapper, TaRedPacketMoney> implements ITaRedPacketMoneyService {
 
+    @Autowired
+    private ITaRedPacketClientService iTaRedPacketClientService;
+
+    @Override
+    public ResponseBean getRedPacketMoneyById(String activityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 获取红包金额设置
+        TaRedPacketMoney taRedPacketMoney = getById(activityId);
+        if (taRedPacketMoney == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 获取红包客户端消息配置
+        TaRedPacketClient taRedPacketClient = iTaRedPacketClientService.getById(activityId);
+        taRedPacketMoney.setTaRedPacketClient(taRedPacketClient);
+        responseBean.addSuccess(taRedPacketMoney);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean updateRedPacketMoney(TaRedPacketMoney taRedPacketMoney) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 更新红包金额设置
+        updateById(taRedPacketMoney);
+        // 更新红包客户端消息配置
+        iTaRedPacketClientService.updateById(taRedPacketMoney.getTaRedPacketClient());
+        responseBean.addSuccess("success");
+        return responseBean;
+    }
 }

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

@@ -1,11 +1,27 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.redpack.entity.TaH5Images;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
-import com.huiju.estateagents.redpack.mapper.TaRedPacketMapper;
+import com.huiju.estateagents.redpack.entity.TaRedPacketHelp;
+import com.huiju.estateagents.redpack.mapper.*;
 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 java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 红包助力活动  服务实现类
@@ -17,4 +33,126 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRedPacket> implements ITaRedPacketService {
 
+    private Logger logger = LoggerFactory.getLogger(TaRedPacketServiceImpl.class);
+
+    @Autowired
+    private TaRedPacketMapper taRedPacketMapper;
+
+    @Autowired
+    private TaH5ImagesMapper taH5ImagesMapper;
+
+    @Autowired
+    private TaRedPacketHelpMapper taRedPacketHelpMapper;
+
+    @Autowired
+    private TaRedPacketClientMapper taRedPacketClientMapper;
+
+    @Autowired
+    private TaRedPacketMoneyMapper taRedPacketMoneyMapper;
+
+    @Override
+    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());
+        responseBean.addSuccess("success");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean updateRedPacket(TaRedPacket taRedPacket) {
+        ResponseBean responseBean = new ResponseBean();
+        Boolean updateResult = updateById(taRedPacket);
+        if (!updateResult) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+        saveRedPacketImages(taRedPacket, 2);
+        responseBean.addSuccess("success");
+        return responseBean;
+    }
+
+    @Override
+    public TaRedPacket getRedPacketImages(TaRedPacket record) {
+
+        // 查询红包配置图片信息
+        QueryWrapper<TaH5Images> h5ImagesQueryWrapper = new QueryWrapper<>();
+        h5ImagesQueryWrapper.eq("activity_id", record.getActivityId());
+        List<TaH5Images> h5ImagesList = taH5ImagesMapper.selectList(h5ImagesQueryWrapper);
+        h5ImagesList.stream().forEach(r -> {
+            switch (r.getActivityType()) {
+                case "rp_share_post_img":
+                    record.setSharePosterImg(r.getImageUrl());
+                    break;
+                case "rp_activity_rules_img":
+                    record.setActivityRulesImg(r.getImageUrl());
+                    break;
+                case "rp_help_background_img":
+                    record.setHelpBackgroundImg(r.getImageUrl());
+                    break;
+                case "rp_index_background_img":
+                    record.setIndexBackgroundImg(r.getImageUrl());
+                    break;
+                case "rp_ranking_background_img":
+                    record.setRankingBackgroundImg(r.getImageUrl());
+                    break;
+                default:
+                    break;
+            }
+        });
+        return record;
+    }
+
+    /**
+     * 保存/更新红包图片信息
+     *
+     * @param taRedPacket
+     * @param type        1 新增,2 更新
+     */
+    public void saveRedPacketImages(TaRedPacket taRedPacket, Integer type) {
+        // 组装红包图片数据
+        Map<String, String> redPacketImsMap = new HashMap<>();
+        redPacketImsMap.put("rp_share_post_img", taRedPacket.getSharePosterImg());
+        redPacketImsMap.put("rp_activity_rules_img", taRedPacket.getActivityRulesImg());
+        redPacketImsMap.put("rp_help_background_img", taRedPacket.getHelpBackgroundImg());
+        redPacketImsMap.put("rp_index_background_img", taRedPacket.getIndexBackgroundImg());
+        redPacketImsMap.put("rp_ranking_background_img", taRedPacket.getRankingBackgroundImg());
+
+        // 新增
+        if (1 == type) {
+            redPacketImsMap.entrySet().stream().forEach(r -> {
+                if (StringUtils.isEmpty(r.getValue())) {
+                    return;
+                }
+                TaH5Images taH5Images = new TaH5Images();
+                taH5Images.setActivityId(taRedPacket.getActivityId());
+                taH5Images.setActivityType(CommConstant.RED_PACKET);
+                taH5Images.setImageType(CommConstant.RED_PACKET + "." + r.getKey());
+                taH5Images.setImageUrl(r.getValue());
+                taH5Images.setCreateDate(LocalDateTime.now());
+                taH5ImagesMapper.insert(taH5Images);
+            });
+        }
+
+        // 更新
+        if (2 == type) {
+            redPacketImsMap.entrySet().stream().forEach(r -> {
+                if (StringUtils.isEmpty(r.getValue())) {
+                    return;
+                }
+                TaH5Images taH5Images = new TaH5Images();
+                taH5Images.setImageUrl(r.getValue());
+
+                UpdateWrapper<TaH5Images> h5ImagesUpdateWrapper = new UpdateWrapper<>();
+                h5ImagesUpdateWrapper.eq("activity_id", taRedPacket.getActivityId());
+                h5ImagesUpdateWrapper.eq("image_type", CommConstant.RED_PACKET + "." + r.getKey());
+                taH5ImagesMapper.update(taH5Images, h5ImagesUpdateWrapper);
+            });
+        }
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -9,6 +9,12 @@ import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.redpack.entity.TaOrgAccount;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
 import com.huiju.estateagents.service.IWxPayService;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +23,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.xml.ws.soap.Addressing;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -65,6 +70,15 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private TaContractMapper taContractMapper;
 
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
+    @Autowired
+    private TaOrgAccountDetailedListMapper taOrgAccountDetailedListMapper;
+
+    @Autowired
+    private TaOrgAccountMapper taOrgAccountMapper;
+
     /**
      * 微信支付-统一下单
      *
@@ -145,10 +159,44 @@ public class WxPayServiceImpl implements IWxPayService {
         //house类型的支付成功的回调,处理业务逻辑 修改订单状态等
         if (type.equals(CommConstant.ORDER_TARGET_TYPE_HOUSE)) {
             wxHouseNotify(resultMap);
+        }else if (type.equals(CommConstant.ITEM_TYPE_RECHARGE)){
+            //账户充值
+            accountRecharge(resultMap);
         }
 
     }
 
+    /**
+     * 账户充值
+     * @param resultMap
+     */
+    private void accountRecharge(Map<String, String> resultMap) {
+        log.info("修改订单为{},的支付状态",resultMap.get("out_trade_no"));
+        String tradeNo = resultMap.get("out_trade_no");
+        String transactionId = resultMap.get("transaction_id");
+        TaOrgOrder taOrgOrder = taOrgOrderMapper.selectOne(new QueryWrapper<TaOrgOrder>().eq("trade_no", tradeNo));
+        taOrgOrder.setPayDate(LocalDateTime.now());
+        taOrgOrder.setTradingStatus(CommConstant.SUCCESS);
+        taOrgOrder.setWxOrderId(transactionId);
+        taOrgOrderMapper.updateById(taOrgOrder);
+        //获取账户信息表
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", taOrgOrder.getOrgId()).eq("status", CommConstant.STATUS_NORMAL));
+        //添加账户流水
+        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
+        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountDetailedList.setAmount(taOrgOrder.getAmount());
+        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
+        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
+        taOrgAccountDetailedList.setOrgId(taOrgOrder.getOrgId());
+        taOrgAccountDetailedList.setSignType(1);
+        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
+        //添加账户金额
+        taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() + taOrgOrder.getAmount());
+        taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + taOrgOrder.getAmount());
+        taOrgAccountMapper.updateById(taOrgAccount);
+    }
+
     /**
      * 微信退款
      * @param taOrder

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

@@ -10,6 +10,7 @@ import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.CommonUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
@@ -357,12 +358,13 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		//获取收红包人的openid
 		TaMpPerson parentMpPerson = taMpPersonMapper.selectById(parentMpMiniapp.getMpPersonId());
 		//发送红包
+		String tradeNo = CommonUtils.generateTradeNo("HB");
 		WxPayService wxPayService = getWxPayService();
 		WxPaySendRedpackRequest build = WxPaySendRedpackRequest.newBuilder()
 //				.consumeMchId(wxPayService.getConfig().getMchId())
 				.actName(taRedPacketClient.getActivityName())//活动名称
 				.clientIp(String.valueOf(InetAddress.getLoopbackAddress()))//Ip地址
-				.mchBillNo("HB123456")//商户订单号
+				.mchBillNo(tradeNo)//商户订单号
 //				.msgAppid(mpAppid)
 				.remark(taRedPacketClient.getRemark())//备注
 				.reOpenid(parentMpPerson.getMpOpenid())//接受红包的用户openid
@@ -379,7 +381,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 			String resultCode = wxPaySendRedpackResult.getResultCode();
 			if (resultCode.equals("SUCCESS")){
 				//插入订单表并扣钱反更新
-				saveRedpacketOrder("HB123456",wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid);
+				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid);
 			}else {
 				return;
 			}
@@ -392,6 +394,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		//先扣钱
 		TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
 		taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - wxPaySendRedpackResult.getTotalAmount());
+		taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + wxPaySendRedpackResult.getTotalAmount());
 		taOrgAccountMapper.updateById(taOrgAccount);
 		TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());
 		taRedPacketMoney.setBalance(taRedPacketMoney.getBalance()-wxPaySendRedpackResult.getTotalAmount());

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

@@ -2,4 +2,120 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaRedPacketMapper">
 
+    <insert id="initRedPacket">
+        INSERT INTO ta_red_packet (
+        `activity_id`,
+        `name`,
+        `start_date`,
+        `end_date`,
+        `activity_end_tip`,
+        `qrcode`,
+        `top_limit_persons`,
+        `building_show_pos`,
+        `building_id`,
+        `building_name`,
+        `poster_show_pos`,
+        `join_fields`,
+        `org_id`,
+        `create_date`,
+        `status`
+        ) SELECT
+        #{activityId},
+        #{name},
+        #{startDate},
+        #{endDate},
+        `activity_end_tip`,
+        #{qrCode},
+        `top_limit_persons`,
+        `building_show_pos`,
+        `building_id`,
+        `building_name`,
+        `poster_show_pos`,
+        `join_fields`,
+        #{orgId},
+        `create_date`,
+        `status`
+        FROM
+            ta_red_packet t2
+        WHERE
+            activity_id =1
+    </insert>
+
+    <insert id="initRedPacketHelp">
+        INSERT INTO ta_red_packet_help (
+        `activity_id`,
+        `help_succes_persons`,
+        `limit_num_per_day`,
+        `limit_num_per_person`,
+        `limit_num_for_each_person`,
+        `success_tip`,
+        `warnning_tip`,
+        `limit_per_day_illegal_tip`,
+        `limit_per_person_illegal_tip`,
+        `limit_for_each_person_illegal_tip`
+        ) SELECT
+        #{activityId},
+        `help_succes_persons`,
+        `limit_num_per_day`,
+        `limit_num_per_person`,
+        `limit_num_for_each_person`,
+        `success_tip`,
+        `warnning_tip`,
+        `limit_per_day_illegal_tip`,
+        `limit_per_person_illegal_tip`,
+        `limit_for_each_person_illegal_tip`
+        FROM
+            ta_red_packet_help t2
+        WHERE
+            activity_id =1
+    </insert>
+
+    <insert id="initRedPacketClient">
+        INSERT INTO ta_red_packet_client (
+           `activity_id`,
+           `mch_name`,
+            `blessing`,
+            'activity_name`,
+            `remark`
+         ) SELECT
+            #{activityId},
+            `mch_name`,
+            `blessing`,
+            `activity_name`,
+            `remark`
+        FROM
+            ta_red_packet_client t2
+        WHERE
+            activity_id = 1
+    </insert>
+
+    <insert id="initRedPacketMoney">
+        INSERT INTO ta_red_packet_money ( `activity_id`, `budget`, `balance`, `min_packet`, `max_packet`, `limit_packet_num`, `packet_sended_num`, `insufficient_balance_tip` ) SELECT
+            #{activityId},
+            `budget`,
+            `balance`,
+            `min_packet`,
+            `max_packet`,
+            `limit_packet_num`,
+            `packet_sended_num`,
+            `insufficient_balance_tip` 
+        FROM
+            ta_red_packet_money t2 
+        WHERE
+            activity_id =1
+    </insert>
+
+    <insert id="initRedPacketImages">
+        INSERT INTO ta_h5_sample ( `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
+        WHERE
+            t2.activity_id = 1
+    </insert>
+
 </mapper>