* bug 修改

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

@@ -1,59 +1,59 @@
-//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/TaOrgOrder.java

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

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

@@ -118,7 +118,7 @@
             SELECT
             t.*,
             t2.nickname,
-            t2.NAME,
+            t2.NAME as name,
             t2.avatarurl,
             t2.phone,
             ifnull( t3.nickname, t3.NAME ) sharePersonNickname,
@@ -153,7 +153,7 @@
         SELECT
         t.visit_time createDate,
         t2.nickname,
-        t2.NAME,
+        t2.NAME as name,
         t2.avatarurl,
         t2.phone,
         ifnull(t3.nickname,t3.name) sharePersonNickname,

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

@@ -6,7 +6,7 @@
         SELECT
             t.*,
             t2.phone,
-            t2.NAME,
+            t2.NAME as name,
             t2.nickname nickname,
             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
@@ -30,7 +30,7 @@
             t.votes,
             t.create_date,
             t2.phone,
-            t2.NAME,
+            t2.NAME as name,
             t2.nickname nickname,
             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