傅行帆 5 years ago
parent
commit
9e59e6d9a8

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java View File

@@ -278,7 +278,7 @@ public class TaHousingResourcesController extends BaseController {
278 278
                     //我的认筹
279 279
                     if (e.getHouseId().equals(r.getHouseId())) {
280 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 282
                             e.setMineLocked("mine");
283 283
                         }
284 284
                     }

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java View File

@@ -535,6 +535,7 @@ public class TaRaiseRecordController extends BaseController {
535 535
             //获取认筹单信息
536 536
             TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
537 537
 
538
+            String personId = getPersonId(request);
538 539
             //认筹表数据
539 540
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
540 541
             taRaise.setRaisePrice(taRaise.getRaisePrice());
@@ -559,7 +560,7 @@ public class TaRaiseRecordController extends BaseController {
559 560
             houseList.forEach(e -> {
560 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 564
                         e.setMineLocked("mine");
564 565
                     }
565 566
                 });

+ 1
- 0
src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java View File

@@ -488,6 +488,7 @@ public class WxPayServiceImpl implements IWxPayService {
488 488
         //更改支付状态并插入订单id
489 489
         TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taOrder.getTargetId());
490 490
         taRaiseRecord.setOrderId(taOrder.getOrderId());
491
+        taRaiseRecord.setPayType(CommConstant.PAY_TYPE_ONLINE);
491 492
         taRaiseRecordMapper.updateById(taRaiseRecord);
492 493
     }
493 494
 }

+ 1
- 1
src/main/resources/application-prod-blue.yml View File

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

+ 1
- 1
src/main/resources/application-prod-green.yml View File

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