傅行帆 5 년 전
부모
커밋
9e59e6d9a8

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java 파일 보기

278
                     //我的认筹
278
                     //我的认筹
279
                     if (e.getHouseId().equals(r.getHouseId())) {
279
                     if (e.getHouseId().equals(r.getHouseId())) {
280
                         e.setMineRaise("mine");
280
                         e.setMineRaise("mine");
281
-                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
281
+                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
282
                             e.setMineLocked("mine");
282
                             e.setMineLocked("mine");
283
                         }
283
                         }
284
                     }
284
                     }

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java 파일 보기

535
             //获取认筹单信息
535
             //获取认筹单信息
536
             TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
536
             TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
537
 
537
 
538
+            String personId = getPersonId(request);
538
             //认筹表数据
539
             //认筹表数据
539
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
540
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
540
             taRaise.setRaisePrice(taRaise.getRaisePrice());
541
             taRaise.setRaisePrice(taRaise.getRaisePrice());
559
             houseList.forEach(e -> {
560
             houseList.forEach(e -> {
560
                 taRaiseHouseList.forEach(r -> {
561
                 taRaiseHouseList.forEach(r -> {
561
                     //我的认筹
562
                     //我的认筹
562
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus())) {
563
+                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
563
                         e.setMineLocked("mine");
564
                         e.setMineLocked("mine");
564
                     }
565
                     }
565
                 });
566
                 });

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java 파일 보기

488
         //更改支付状态并插入订单id
488
         //更改支付状态并插入订单id
489
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
489
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
490
         taRaiseRecord.setOrderId(taOrder.getOrderId());
490
         taRaiseRecord.setOrderId(taOrder.getOrderId());
491
+        taRaiseRecord.setPayType(CommConstant.PAY_TYPE_ONLINE);
491
         taRaiseRecordMapper.updateById(taRaiseRecord);
492
         taRaiseRecordMapper.updateById(taRaiseRecord);
492
     }
493
     }
493
 }
494
 }

+ 1
- 1
src/main/resources/application-prod-blue.yml 파일 보기

68
     # 验证码长度
68
     # 验证码长度
69
     size: 4
69
     size: 4
70
     # 短信签名
70
     # 短信签名
71
-    sign: AI智慧案场
71
+    sign: 橙蕉
72
 
72
 
73
   visitor:
73
   visitor:
74
     code: "0501"
74
     code: "0501"

+ 1
- 1
src/main/resources/application-prod-green.yml 파일 보기

68
     # 验证码长度
68
     # 验证码长度
69
     size: 4
69
     size: 4
70
     # 短信签名
70
     # 短信签名
71
-    sign: AI智慧案场
71
+    sign: 橙蕉
72
 
72
 
73
   visitor:
73
   visitor:
74
     code: "0501"
74
     code: "0501"