Merge branch 'dev' into v3-5-30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.28</version>
+	<version>v3.5.29</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

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

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

@@ -99,7 +99,7 @@ public class TaOrgOrderController extends BaseController {
      */
     @RequestMapping(value = "/channel/taOrgOrder/rechargeOrderExport")
     public void rechargeOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
-                                                   @RequestParam(value = "isOffline", required = false) Integer isOffline,
+                                                   @RequestParam(value = "isOffline", required = false) Boolean isOffline,
                                                    @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
                                                    @RequestParam(value = "miniAppName", required = false) String miniAppName,
                                                    @RequestParam(value = "startDate", required = false) String startDate,
@@ -162,6 +162,7 @@ public class TaOrgOrderController extends BaseController {
                                    @RequestParam(value = "endDate", required = false) String endDate,
                                    @RequestParam(value = "orderType", required = false) String orderType,
                                    @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   @RequestParam(value = "auditStatus", required = false) String auditStatus,
                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -171,7 +172,7 @@ public class TaOrgOrderController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
 
         // 设置 sheet, 同一个sheet只需要设置一次
-        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName, orgId);
+        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName, orgId, auditStatus);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

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

@@ -2,10 +2,14 @@ package com.huiju.estateagents.redpack.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
@@ -18,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +49,6 @@ public class TaRedPacketController extends BaseController {
     @Autowired
     private ITaRedPacketPersonService iTaRedPacketPersonService;
 
-
     /**
      * 分页查询列表
      *
@@ -126,10 +128,10 @@ public class TaRedPacketController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/redPacket/update", method = RequestMethod.PUT)
-    public ResponseBean taRedPacketUpdate(@RequestBody TaRedPacket taRedPacket) {
+    public ResponseBean taRedPacketUpdate(@RequestBody TaRedPacket taRedPacket,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaRedPacketService.updateRedPacket(taRedPacket);
+            responseBean = iTaRedPacketService.updateRedPacket(taRedPacket,getOrgId(request));
         } catch (Exception e) {
             logger.error("taRedPacketUpdate -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -165,4 +165,11 @@ public class TaOrgOrder implements Serializable {
      * 实付金额
      */
     private Integer realAmount;
+
+    /**
+     * 用户姓名
+     */
+    @TableField(exist = false)
+    private String name;
+
 }

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

@@ -111,5 +111,11 @@ public class TaRedPacketPerson implements Serializable {
     @TableField(exist = false)
     private String avatarurl;
 
+    /**
+     * 被助力次数
+     */
+    @TableField(exist = false)
+    private Integer helpNum;
+
 
 }

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

@@ -71,9 +71,9 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      *
      * @return
      */
-    List<RechargeOrder> orderListByRechargeOrRefundExport(@Param("itemType") String itemType,
+    List<RechargeOrder> rechargeListByConditionExport(@Param("itemType") String itemType,
                                                           @Param("tradeNo") String tradeNo,
-                                                          @Param("isOffline") Integer isOffline,
+                                                          @Param("isOffline") Boolean isOffline,
                                                           @Param("tradingStatus") String tradingStatus,
                                                           @Param("startDate") String startDate,
                                                           @Param("endDate") String endDate,
@@ -104,7 +104,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                               @Param("startDate") String startDate,
                                               @Param("endDate") String endDate,
                                               @Param("miniAppName") String miniAppName,
-                                              @Param("orgId") Integer orgId);
+                                              @Param("orgId") Integer orgId,
+                                              @Param("auditStatus") String auditStatus);
 
     /**
      * 获取充值订单列表

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

@@ -59,7 +59,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      *
      * @return
      */
-    List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId);
+    List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Boolean isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId);
 
     /**
      * 消费订单列表导出
@@ -73,7 +73,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      *
      * @return
      */
-    List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId);
+    List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId, String auditStatus);
 
 
     /**

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

@@ -35,7 +35,7 @@ public interface ITaRedPacketService extends IService<TaRedPacket> {
      * @param taRedPacket
      * @return
      */
-    ResponseBean updateRedPacket(TaRedPacket taRedPacket);
+    ResponseBean updateRedPacket(TaRedPacket taRedPacket,Integer orgId);
 
     /**
      * 根据ID查询红包图片信息

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

@@ -40,7 +40,6 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -133,8 +132,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId) {
-        List<RechargeOrder> result = taOrgOrderMapper.orderListByRechargeOrRefundExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
+    public List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Boolean isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId) {
+        List<RechargeOrder> result = taOrgOrderMapper.rechargeListByConditionExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
         return result;
     }
 
@@ -145,8 +144,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId) {
-        List<RefundOrder> result = taOrgOrderMapper.orderListByRefundExport(itemType, tradeNo, startDate, endDate, miniAppName, orgId);
+    public List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId, String auditStatus) {
+        List<RefundOrder> result = taOrgOrderMapper.orderListByRefundExport(itemType, tradeNo, startDate, endDate, miniAppName, orgId, auditStatus);
         return result;
     }
 
@@ -159,6 +158,20 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return urlList;
     }
 
+    public Integer calculateAvailableAmount(Integer orgId){
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.getOrgAccountById(orgId);
+
+        //查询总充值金额
+        Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(orgId);
+
+        //查询退款冻结额
+        Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(orgId);
+
+        //账户余额=总充值金额-已消费金额-已退款额-退款冻结额
+        Integer balance = totalRechargeAmount - taOrgAccount.getPurchaseAmount() - taOrgAccount.getTotalRefund() - totalBlockAmount;
+
+        return balance;
+    }
     /**
      * 微信支付
      *
@@ -182,7 +195,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
         //下单
         Map<String, String> data = new HashMap<String, String>();
-        data.put("body", "wxzf");
+        data.put("body", "微信支付");
         //商品号唯一
         data.put("out_trade_no", taOrgOrder.getTradeNo());
         data.put("device_info", "WEB");
@@ -236,7 +249,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgOrder.setAmount(amount);
         taOrgOrder.setRealAmount(realAmount);
         taOrgOrder.setCreateDate(LocalDateTime.now());
-        taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(5));
+        taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(30));
         taOrgOrder.setRemark("线上充值");
         taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
@@ -593,23 +606,16 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         TaOrgRefundApplication updateRefundApplication = assembleRefundApplication(userId, CommConstant.ITEM_TYPE_REJECT, refundApplication);
         QueryWrapper<TaOrgRefundApplication> taOrgRefundApplicationQueryWrapper = new QueryWrapper<>();
         taOrgRefundApplicationQueryWrapper.eq("order_id", id);
-        int taOrgRefundApplicationUpdateResult = taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
+        taOrgRefundApplicationMapper.update(updateRefundApplication, taOrgRefundApplicationQueryWrapper);
 
         //更新账户冻结记录
-        int taOrgAccountBlockedUpdateResult = updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
+        updateOrgAccountBlock(refundApplication, selectRefundApplication.getBlockedId());
 
         //更新订单状态
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrderId(id);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_FAIL);
-        int taOrgOrderUpdateResult = taOrgOrderMapper.updateById(taOrgOrder);
-
-        if (taOrgAccountBlockedUpdateResult < 1 ||
-                taOrgRefundApplicationUpdateResult < 1 ||
-                taOrgOrderUpdateResult < 1) {
-            responseBean.addError("驳回失败");
-            return responseBean;
-        }
+        taOrgOrderMapper.updateById(taOrgOrder);
 
         return responseBean;
 

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

@@ -53,11 +53,35 @@ public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMappe
             return responseBean;
         }
 
+        // 查询h5 help数据
+        TaRedPacketHelp redPacketHelp = taRedPacketHelpMapper.selectById(taRedPacketHelp.getActivityId());
+        if (redPacketHelp == 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("活动已开始，不可修改");
+        if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
+
+            // 活动开始，配置人数和次数限制不可修改
+            if ((taRedPacketHelp.getHelpSuccesPersons() != redPacketHelp.getHelpSuccesPersons() ||
+                    taRedPacketHelp.getLimitNumPerDay() != redPacketHelp.getLimitNumPerDay()
+                    || taRedPacketHelp.getLimitNumPerPerson() != redPacketHelp.getLimitNumPerPerson() ||
+                    taRedPacketHelp.getLimitNumForEachPerson() != redPacketHelp.getLimitNumForEachPerson())) {
+                responseBean.addError("活动已开始，不可修改");
+                return responseBean;
+            }
+
+            // 活动开始，开始时间不可修改
+            if (taRedPacketHelp.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() > taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() ) {
+                responseBean.addError("活动已开始，开始时间不可修改");
+                return responseBean;
+            }
+        }
+
+        // 校验结束时间是否已经到达
+        if (taRedPacketHelp.getEndDate() != null && taRedPacket.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
+            responseBean.addError("活动已结束，结束时间不可修改");
             return responseBean;
         }
 
@@ -81,7 +105,7 @@ public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMappe
     }
 
     @Override
-    public ResponseBean getRedPacketHelpById(String activityId,Integer orgId) {
+    public ResponseBean getRedPacketHelpById(String activityId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         TaRedPacketHelp taRedPacketHelp = getById(activityId);
 

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

@@ -9,6 +9,8 @@ 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.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.TaCustomerFrom;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
@@ -55,20 +57,23 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
     @Autowired
     private TaMiniappMapper taMiniappMapper;
 
+    @Autowired
+    private TaDrainageMapper taDrainageMapper;
+
     @Override
     @Transactional
-    public ResponseBean initializeRedPacket(TaRedPacket record,Integer orgId) {
+    public ResponseBean initializeRedPacket(TaRedPacket record, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 获取小程序信息
-        QueryWrapper<TaMiniapp> miniappQueryWrapper =new QueryWrapper<>();
-        miniappQueryWrapper.eq("org_id",orgId);
+        QueryWrapper<TaMiniapp> miniappQueryWrapper = new QueryWrapper<>();
+        miniappQueryWrapper.eq("org_id", orgId);
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
 
         // 初始化数据
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(),record.getBuildingId(), record.getOrgId());
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(), record.getBuildingId(), record.getOrgId());
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
-        taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(), record.getTempleActivityId());
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());
         taRedPacketMapper.initRedPacketImages(record.getActivityId(), record.getTempleActivityId());
         responseBean.addSuccess("success");
@@ -76,7 +81,7 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
     }
 
     @Override
-    public ResponseBean updateRedPacket(TaRedPacket taRedPacket) {
+    public ResponseBean updateRedPacket(TaRedPacket taRedPacket,Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         Boolean updateResult = updateById(taRedPacket);
         if (!updateResult) {
@@ -84,6 +89,17 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
             return responseBean;
         }
         saveRedPacketImages(taRedPacket, 2);
+
+        // 更新H5活动数据
+        UpdateWrapper<TaDrainage> taDrainageUpdateWrapper = new UpdateWrapper<>();
+        taDrainageUpdateWrapper.eq("activity_id", taRedPacket.getActivityId());
+        taDrainageUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        taDrainageUpdateWrapper.eq("org_id", orgId);
+
+        TaDrainage taDrainage = new TaDrainage();
+        taDrainage.setBuildingId(taRedPacket.getBuildingId());
+
+        taDrainageMapper.update(taDrainage, taDrainageUpdateWrapper);
         responseBean.addSuccess("success");
         return responseBean;
     }

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

@@ -196,7 +196,7 @@ public class WxPayServiceImpl implements IWxPayService {
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
         //添加账户金额
         taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() + taOrgOrder.getAmount());
-        taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + taOrgOrder.getAmount());
+        taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() + taOrgOrder.getAmount());
         taOrgAccountMapper.updateById(taOrgAccount);
     }
 

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

@@ -535,7 +535,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
         }
         //获取红包的随机数
         int redPackageMoney = getRedPackageMoney(taRedPacketMoney.getMaxPacket(), taRedPacketMoney.getMinPacket());
-        redPackageMoney = taOrgAccount.getRealBalance() < redPackageMoney ? taOrgAccount.getRealBalance() : redPackageMoney;
+        redPackageMoney = taOrgAccount.getAvailableBalance() < redPackageMoney ? taOrgAccount.getAvailableBalance() : redPackageMoney;
 
         //金额不足直接返回
         if (taRedPacketMoney.getBalance()  < redPackageMoney) {

src/main/resources/mapper/TaBuildingMapper.xml

@@ -629,7 +629,6 @@
                     and  TO_DAYS(b.create_date) <= TO_DAYS(#{endDate})
                 </if>
             GROUP BY
-                b.person_id,
                 DATE_FORMAT( b.create_date, '%Y-%m-%d' )
         ) g ON t.date = g.create_date
         LEFT JOIN (
@@ -714,7 +713,6 @@
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
         </if>
         GROUP BY
-        b.person_id,
         DATE_FORMAT( b.create_date, '%Y-%m-%d' )
         ) g ON t.date = g.create_date
         LEFT JOIN (

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

@@ -85,9 +85,6 @@
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
-        <if test="orgId != null and orgId != ''">
-            and t.org_id = #{orgId}
-        </if>
         <if test="tradeNo != null and tradeNo != ''">
             and t.trade_no like concat('%', #{tradeNo}, '%')
         </if>
@@ -112,14 +109,14 @@
         GROUP BY t.order_id order by t.create_date desc
     </select>
 
-    <select id="orderListByRechargeOrRefundExport" resultType="com.huiju.estateagents.redpack.entity.RechargeOrder">
+    <select id="rechargeListByConditionExport" resultType="com.huiju.estateagents.redpack.entity.RechargeOrder">
         select
         t.trade_no as tradeNo,
         FORMAT(t.amount/100, 2) as amount,
         b.name as miniAppName,
         if(t.is_offline = 1, '运营手工充值', '业务线上充值') as isOffline,
         t.create_date as createDate,
-        if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','已超时')) as tradingStatus,
+        if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','失败')) as tradingStatus,
         if(t.is_offline = 0, t.pay_date, '') as payDate
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
@@ -129,7 +126,7 @@
         <if test="tradeNo != null and tradeNo != ''">
             and t.trade_no like concat('%', #{tradeNo}, '%')
         </if>
-        <if test="isOffline != null and isOffline != ''">
+        <if test="isOffline != null">
             and t.is_offline = #{isOffline}
         </if>
         <if test="tradingStatus != null ">
@@ -180,7 +177,7 @@
             and t.create_date &lt; #{endDate}
         </if>
         <if test="receivePhone != null and receivePhone != ''">
-            and c.receivePhone like concat('%', #{receivePhone}, '%')
+            and c.phone like concat('%', #{receivePhone}, '%')
         </if>
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
@@ -516,6 +513,9 @@
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            and d.audit_status = #{auditStatus}
+        </if>
         GROUP BY t.order_id order by t.create_date desc
     </select>
 

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

@@ -116,9 +116,9 @@
 
     <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
             SELECT
-            t.*,
+            max(t.visit_time) visit_time,
             t2.nickname,
-            t2.NAME,
+            t2.NAME as name,
             t2.avatarurl,
             t2.phone,
             ifnull( t3.nickname, t3.NAME ) sharePersonNickname,
@@ -131,6 +131,8 @@
             t.org_id =  #{orgId}
             and t.event_type = 'h5'
             AND t.target_id = #{drainageId}
+            AND (t.share_person_id != NULL  or t.share_person_id != '')
+            AND t.share_person_id != t.person_id
             <if test="sharePersonPhone != null and sharePersonPhone != ''">
                 AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
             </if>
@@ -144,8 +146,10 @@
             <if test = "endTime != null">
                 AND t.visit_time &lt;= #{endTime}
             </if>
-            ORDER BY
-              t.visit_time DESC
+        GROUP BY
+        t.person_id,t.share_person_id
+        ORDER BY
+        max(t.visit_time) DESC
     </select>
 
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
@@ -153,7 +157,7 @@
         SELECT
         t.visit_time createDate,
         t2.nickname,
-        t2.NAME,
+        t2.NAME as name,
         t2.avatarurl,
         t2.phone,
         ifnull(t3.nickname,t3.name) sharePersonNickname,
@@ -166,6 +170,8 @@
         t.org_id =  #{orgId}
         and t.event_type = 'h5'
         AND t.target_id = #{drainageId}
+        AND (t.share_person_id != NULL  or t.share_person_id != '')
+        AND t.share_person_id != t.person_id
         <if test="sharePersonPhone != null and sharePersonPhone != ''">
             AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
         </if>
@@ -179,8 +185,10 @@
         <if test = "endTime != null">
             AND t.visit_time &lt;= #{endTime}
         </if>
+        GROUP BY
+        t.person_id,t.share_person_id
         ORDER BY
-        t.visit_time DESC
+        max(t.visit_time) DESC
     </select>
 
 </mapper>

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

@@ -6,12 +6,13 @@
         SELECT
             t.*,
             t2.phone,
-            t2.NAME,
+            t2.NAME as name,
             t2.nickname nickname,
-            t2.avatarurl
+            t2.avatarurl,
+        (select count(*) from ta_red_packet_history th where th.target_miniapp_person = t.miniapp_person_id and th.activity_id = #{activityId} and th.org_id = #{orgId}) helpNum
         FROM
-            ta_red_packet_person t
-            LEFT JOIN ta_person t2 ON t.miniapp_person_id = t2.person_id
+          ta_red_packet_person t
+          LEFT JOIN ta_person t2 ON t.miniapp_person_id = t2.person_id
         WHERE
             t.activity_id = #{activityId}
             AND t.org_id = #{orgId}
@@ -20,7 +21,8 @@
                 AND t2.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
-            t.votes DESC,t.create_date DESC
+            helpNum DESC,
+            t.create_date DESC
     </select>
 
     <select id="exportRedPacketRankingList" resultType="com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport">
@@ -28,21 +30,23 @@
             t.votes,
             t.create_date,
             t2.phone,
-            t2.NAME,
+            t2.NAME as name,
             t2.nickname nickname,
-            t2.avatarurl
+            t2.avatarurl,
+            (select count(*) from ta_red_packet_history th where th.target_miniapp_person = t.miniapp_person_id and th.activity_id = #{activityId} and th.org_id = #{orgId}) votes
         FROM
             ta_red_packet_person t
-            LEFT JOIN ta_person t2 ON t.miniapp_person_id = t2.person_id
+        LEFT JOIN ta_person t2 ON t.miniapp_person_id = t2.person_id
         WHERE
-            t.activity_id = #{activityId}
-            AND t.org_id = #{orgId}
-            AND t.is_signed_up = TRUE
-            <if test = "phone != null and phone != ''">
-                AND t2.phone like concat('%',#{phone},'%')
-            </if>
+        t.activity_id = #{activityId}
+        AND t.org_id = #{orgId}
+        AND t.is_signed_up = TRUE
+        <if test = "phone != null and phone != ''">
+            AND t2.phone like concat('%',#{phone},'%')
+        </if>
         ORDER BY
-            t.votes DESC,t.create_date DESC
+        votes DESC,
+        t.create_date DESC
     </select>
 
 </mapper>