Ver código fonte

兑换记录

傅行帆 5 anos atrás
pai
commit
f0252f901d

+ 13
- 0
src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java Ver arquivo

6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.entity.TaGoods;
9
 import com.huiju.estateagents.entity.TaPointsExchange;
10
 import com.huiju.estateagents.entity.TaPointsExchange;
11
+import com.huiju.estateagents.service.ITaGoodsService;
10
 import com.huiju.estateagents.service.ITaPointsExchangeService;
12
 import com.huiju.estateagents.service.ITaPointsExchangeService;
11
 import org.slf4j.Logger;
13
 import org.slf4j.Logger;
12
 import org.slf4j.LoggerFactory;
14
 import org.slf4j.LoggerFactory;
21
 
23
 
22
 import javax.servlet.http.HttpServletRequest;
24
 import javax.servlet.http.HttpServletRequest;
23
 import java.time.LocalDateTime;
25
 import java.time.LocalDateTime;
26
+import java.util.List;
24
 
27
 
25
 /**
28
 /**
26
  * <p>
29
  * <p>
39
     @Autowired
42
     @Autowired
40
     public ITaPointsExchangeService iTaPointsExchangeService;
43
     public ITaPointsExchangeService iTaPointsExchangeService;
41
 
44
 
45
+    @Autowired
46
+    private ITaGoodsService taGoodsService;
42
 
47
 
43
     /**
48
     /**
44
      * 分页查询列表
49
      * 分页查询列表
226
             queryWrapper.orderByDesc("create_date");
231
             queryWrapper.orderByDesc("create_date");
227
             
232
             
228
             IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
233
             IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
234
+            List<TaPointsExchange> records = result.getRecords();
235
+            records.forEach(e -> {
236
+                if (null == e.getStatus() || e.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
237
+                    TaGoods goods = taGoodsService.getById(e.getTargetId());
238
+                    e.setAddress(goods.getAddress());
239
+                }
240
+            });
241
+            result.setRecords(records);
229
             responseBean.addSuccess(result);
242
             responseBean.addSuccess(result);
230
         }catch (Exception e){
243
         }catch (Exception e){
231
             e.printStackTrace();
244
             e.printStackTrace();

+ 3
- 1
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Ver arquivo

99
 	        d.name as activity_name,
99
 	        d.name as activity_name,
100
 	        d.create_date
100
 	        d.create_date
101
         FROM
101
         FROM
102
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC ) t
102
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
103
             left JOIN ta_person p on t.person_id = p.person_id
103
             left JOIN ta_person p on t.person_id = p.person_id
104
             LEFT join ta_drainage d on t.target_id = d.drainage_id
104
             LEFT join ta_drainage d on t.target_id = d.drainage_id
105
         GROUP BY
105
         GROUP BY
117
                 LEFT JOIN ta_drainage d ON t.target_id = d.drainage_id
117
                 LEFT JOIN ta_drainage d ON t.target_id = d.drainage_id
118
             GROUP BY
118
             GROUP BY
119
                 t.target_id
119
                 t.target_id
120
+            ORDER BY
121
+	            t.visit_time DESC
120
     </select>
122
     </select>
121
 
123
 
122
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
124
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">