联调

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -220,4 +220,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private String confirmPassword;
+
+    /**
+     * 置业顾问的personid
+     */
+    @TableField(exist = false)
+    private String consultantPersonId;
 }

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

@@ -9,6 +9,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
@@ -67,6 +68,9 @@ public class TaRaiseRecordController extends BaseController {
     @Autowired
     public ITaUserService taUserService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
     /**
      * 条件查询房源认筹记录
      *
@@ -494,7 +498,16 @@ public class TaRaiseRecordController extends BaseController {
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
             taRaise.setRaisePrice(taRaise.getRaisePrice());
             //置业顾问信息
-            taRaiseRecord.setConsultantInfo(taUserService.getById(taRaiseRecord.getUserId()));
+            TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
+            if (null != consultantInfo){
+                //职业顾问信息
+                TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
+                if (null != consultantPerson){
+                    consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
+                }
+            }
+           
+            taRaiseRecord.setConsultantInfo(consultantInfo);
             //房源与认筹单关系图
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
 

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

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

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

@@ -172,7 +172,7 @@ public class WxPayServiceImpl implements IWxPayService {
         data.put("total_fee", payPrice);
         data.put("refund_fee", payPrice);
         //退款原因
-        data.put("refund_desc", taOrder.getRefundReason());
+        data.put("refund_desc", "钱太少");//taOrder.getRefundReason()
         //回调地址
         data.put("notify_url", payRefund+taOrder.getTargetType());
         Map<String, String> resp = wxpay.refund(data);