傅行帆 пре 5 година
родитељ
комит
f788f969d1

+ 6
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java Прегледај датотеку

220
      */
220
      */
221
     @TableField(exist = false)
221
     @TableField(exist = false)
222
     private String confirmPassword;
222
     private String confirmPassword;
223
+
224
+    /**
225
+     * 置业顾问的personid
226
+     */
227
+    @TableField(exist = false)
228
+    private String consultantPersonId;
223
 }
229
 }

+ 14
- 1
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java Прегледај датотеку

9
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
9
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
10
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
10
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
11
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
11
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
12
+import com.huiju.estateagents.center.taUser.entity.TaUser;
12
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
13
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
13
 import com.huiju.estateagents.common.CommConstant;
14
 import com.huiju.estateagents.common.CommConstant;
14
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
15
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
67
     @Autowired
68
     @Autowired
68
     public ITaUserService taUserService;
69
     public ITaUserService taUserService;
69
 
70
 
71
+    @Autowired
72
+    public ITaPersonService taPersonService;
73
+
70
     /**
74
     /**
71
      * 条件查询房源认筹记录
75
      * 条件查询房源认筹记录
72
      *
76
      *
494
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
498
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
495
             taRaise.setRaisePrice(taRaise.getRaisePrice());
499
             taRaise.setRaisePrice(taRaise.getRaisePrice());
496
             //置业顾问信息
500
             //置业顾问信息
497
-            taRaiseRecord.setConsultantInfo(taUserService.getById(taRaiseRecord.getUserId()));
501
+            TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
502
+            if (null != consultantInfo){
503
+                //职业顾问信息
504
+                TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
505
+                if (null != consultantPerson){
506
+                    consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
507
+                }
508
+            }
509
+           
510
+            taRaiseRecord.setConsultantInfo(consultantInfo);
498
             //房源与认筹单关系图
511
             //房源与认筹单关系图
499
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
512
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
500
 
513
 

+ 1
- 1
src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java Прегледај датотеку

54
     /**
54
     /**
55
      * 开启定时任务,每天1230执行
55
      * 开启定时任务,每天1230执行
56
      */
56
      */
57
-    @Scheduled(cron = "* 0/5 * * * ?")
57
+//    @Scheduled(cron = "* 0/5 * * * ?")
58
     private void configureTasks() {
58
     private void configureTasks() {
59
         String time = DateUtils.cutSecond(LocalDateTime.now());
59
         String time = DateUtils.cutSecond(LocalDateTime.now());
60
 
60
 

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java Прегледај датотеку

172
         data.put("total_fee", payPrice);
172
         data.put("total_fee", payPrice);
173
         data.put("refund_fee", payPrice);
173
         data.put("refund_fee", payPrice);
174
         //退款原因
174
         //退款原因
175
-        data.put("refund_desc", taOrder.getRefundReason());
175
+        data.put("refund_desc", "钱太少");//taOrder.getRefundReason()
176
         //回调地址
176
         //回调地址
177
         data.put("notify_url", payRefund+taOrder.getTargetType());
177
         data.put("notify_url", payRefund+taOrder.getTargetType());
178
         Map<String, String> resp = wxpay.refund(data);
178
         Map<String, String> resp = wxpay.refund(data);