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

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

     private Integer qrCodeId;
 
     private Integer channelId;
+
+    /**
+     * 分享人昵称
+     */
+    @TableField(exist = false)
+    private String sharePersonNickname;
+
+    /**
+     * 分享人手机号
+     */
+    @TableField(exist = false)
+    private String sharePersonPhone;
+
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private String phone;
 }

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

-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.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("处理过期订单 定时任务结束");
+//    }
+//
+//}

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

     @TableField(exist = false)
     private String avatarurl;
 
+    /**
+     * 被助力次数
+     */
+    @TableField(exist = false)
+    private Integer helpNum;
+
 
 }

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

         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
 
         //发送红包已达上限
-        if (taRedPacketMoney.getPacketSendedNum() + 1 > taRedPacketMoney.getLimitPacketNum()) {
+        if (taRedPacketMoney.getLimitPacketNum() != -1 && taRedPacketMoney.getPacketSendedNum() + 1 > taRedPacketMoney.getLimitPacketNum()) {
             return;
         }
         //获取红包的随机数
             return;
         }
         //账户余额不足
-        if (taOrgAccount.getRealBalance() < redPackageMoney) {
+        if (taOrgAccount.getAvailableBalance() < redPackageMoney) {
             return;
         }
 
         //先扣钱
         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
         taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - wxPaySendRedpackResult.getTotalAmount());
+        taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() - wxPaySendRedpackResult.getTotalAmount());
         taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + wxPaySendRedpackResult.getTotalAmount());
         taOrgAccountMapper.updateById(taOrgAccount);
         TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());

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

             t2.activity_id = #{templeActivityId}
     </insert>
 
-    <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
-        SELECT
+    <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+            SELECT
             t.*,
             t2.nickname,
-            t2.name,
+            t2.NAME,
             t2.avatarurl,
             t2.phone,
-            ifnull(t3.nickname,t3.name) sharePersonNickname,
+            ifnull( t3.nickname, t3.NAME ) sharePersonNickname,
             t3.phone sharePersonPhone
         FROM
-            ta_customer_from t
-            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
-            LEFT JOIN ta_person t3 ON t.share_person_id = t3.person_id
+            ta_person_visit_record t
+        LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+        LEFT JOIN ta_person t3 ON t.share_person_id = t3.person_id
         WHERE
-            t.org_id = #{orgId}
-            AND t.target_type IN ( 'h5', 'dynamic' )
+            t.org_id =  #{orgId}
+            and t.event_type = 'h5'
             AND t.target_id = #{drainageId}
-            <if test = "startTime != null">
-                AND t.create_date &gt;= #{startTime}
-            </if>
-
-             <if test = "endTime != null">
-                 AND t.create_date &lt;= #{endTime}
-            </if>
-
             <if test="sharePersonPhone != null and sharePersonPhone != ''">
                 AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
             </if>
             <if test="phone != null and phone != ''">
                 AND t2.phone like CONCAT('%',#{phone}, '%')
             </if>
-        GROUP BY
-           t.person_id
-         ORDER BY
-            t.create_date desc
+            <if test = "startTime != null">
+                AND t.visit_time &gt;= #{startTime}
+            </if>
+
+            <if test = "endTime != null">
+                AND t.visit_time &lt;= #{endTime}
+            </if>
+            ORDER BY
+              t.visit_time DESC
     </select>
 
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
+
         SELECT
-        t.create_date,
+        t.visit_time createDate,
         t2.nickname,
         t2.NAME,
         t2.avatarurl,
         ifnull(t3.nickname,t3.name) sharePersonNickname,
         t3.phone sharePersonPhone
         FROM
-        ta_customer_from t
+        ta_person_visit_record t
         LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
         LEFT JOIN ta_person t3 ON t.share_person_id = t3.person_id
         WHERE
-        t.org_id = #{orgId}
-        AND t.target_type IN ( 'h5', 'dynamic' )
+        t.org_id =  #{orgId}
+        and t.event_type = 'h5'
         AND t.target_id = #{drainageId}
+        <if test="sharePersonPhone != null and sharePersonPhone != ''">
+            AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t2.phone like CONCAT('%',#{phone}, '%')
+        </if>
         <if test = "startTime != null">
-            AND t.create_date &gt;= #{startTime}
+            AND t.visit_time &gt;= #{startTime}
         </if>
 
         <if test = "endTime != null">
-            AND t.create_date &lt;= #{endTime}
-        </if>
-
-        <if test="sharePersonPhone != null and sharePersonPhone != ''">
-            AND t3.phone = #{sharePersonPhone}
-        </if>
-        <if test="phone != null and phone != ''">
-            AND t2.phone = #{phone}
+            AND t.visit_time &lt;= #{endTime}
         </if>
-        GROUP BY
-        t.person_id
         ORDER BY
-        t.create_date desc
+        t.visit_time DESC
     </select>
 
 </mapper>

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

             t2.phone,
             t2.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}
                 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">
             t2.phone,
             t2.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>