feats

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

@@ -236,13 +236,13 @@ public class TaRaiseController extends BaseController {
         return responseBean;
     }
 
-
     @GetMapping("/wx/taRaise")
     public ResponseBean getRaiseProfile(@RequestParam(required = false) Integer salesBatchId,
                                         @RequestParam(required = false) Integer raiseId,
+                                        @RequestParam(required = false) Integer raiseRecordId,
                                         @RequestParam(required = false) String personId,
                                         HttpServletRequest request) {
-        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, salesBatchId, personId);
+        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, raiseRecordId, salesBatchId, personId);
         return ResponseBean.success(taRaise);
     }
 

src/main/java/com/huiju/estateagents/service/ITaRaiseService.java

@@ -51,9 +51,10 @@ public interface ITaRaiseService extends IService<TaRaise> {
     /**
      *
      * @param raiseId
+     * @param raiseRecordId
      * @param salesBatchId
      * @param personId
      * @return
      */
-    TaRaise getRaiseProfile(Integer raiseId, Integer salesBatchId, String personId);
+    TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId, String personId);
 }

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

@@ -101,29 +101,39 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
     }
 
     @Override
-    public TaRaise getRaiseProfile(Integer raiseId, Integer salesBatchId, String personId) {
-        if (raiseId == null && salesBatchId == null) return null;
+    public TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId, String personId) {
+        if (raiseId == null && salesBatchId == null && raiseRecordId == null) return null;
 
-        TaRaise taRaise;
-        if (raiseId != null) {
-            taRaise = this.getById(raiseId);
-        } else {
+        TaRaise taRaise = null;
+        TaRaiseRecord  taRaiseRecord = null;
+
+        // 通过认筹记录ID 或者 批次ID 查询
+        if (raiseId != null || salesBatchId != null) {
             QueryWrapper<TaRaise> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("sales_batch_id", salesBatchId);
+            queryWrapper.eq(raiseId != null,"raise_id", raiseId);
+            queryWrapper.eq(salesBatchId != null,"sales_batch_id", salesBatchId);
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.last(" limit 1");
             taRaise = this.getOne(queryWrapper);
         }
 
-        if (taRaise == null) return null;
-
-        if (!StringUtils.isEmpty(personId)) {
+        // 通过认筹单记录ID 或者人员ID
+        boolean mayPerson = taRaise != null && !StringUtils.isEmpty(personId);
+        if (raiseRecordId != null || mayPerson) {
             QueryWrapper<TaRaiseRecord> wrapper = new QueryWrapper<>();
-            wrapper.eq("raise_id", taRaise.getRaiseId());
-            wrapper.eq("person_id", personId);
+            wrapper.eq(raiseRecordId != null,"raise_record_id", raiseRecordId);
+            wrapper.eq(mayPerson, "raise_id", taRaise.getRaiseId());
+            wrapper.eq(mayPerson,"person_id", personId);
             wrapper.eq("status", CommConstant.STATUS_NORMAL);
             wrapper.last("limit 1");
-            TaRaiseRecord  taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
+            taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
+
+            if (taRaise == null) {
+                taRaise = this.getById(taRaiseRecord.getRaiseId());
+            }
+        }
+
+        if (taRaise != null && taRaiseRecord != null) {
             taRaise.setRecord(taRaiseRecord);
         }