短信

src/main/java/com/izouma/zhumj/config/Constants.java

@@ -13,9 +13,9 @@ public interface Constants {
 
     String DEFAULT_AVATAR = "https://zhumj.oss-cn-hangzhou.aliyuncs.com/image/user.jpg";
 
-    String SMS_SIGN_NAME = "筑梦居公寓";
+    String SMS_SIGN_NAME = "怡辰公寓";
 
-    String SMS_TEMPLATE_CODE_GENERIC = "SMS_185300198";
+    String SMS_TEMPLATE_CODE_GENERIC = "SMS_232174924";
 
     String ATTACH_USER_ID       = "userId";
     String ATTACH_STORE_ID      = "storeId";

src/main/java/com/izouma/zhumj/repo/RoomInfoRepo.java

@@ -19,6 +19,8 @@ public interface RoomInfoRepo extends JpaRepository<RoomInfo, Long>, JpaSpecific
 
     RoomInfo findFirstByStoreIdAndBuildingIdAndFloorIdAndRoomTypeIdAndRoomCode(Long storeId, Long buildingId, Long floorId, Long roomTypeId, String roomCode);
 
+    RoomInfo findFirstByStoreIdAndBuildingIdAndFloorIdAndRoomTypeIdAndRoomCodeAndEnabled(Long storeId, Long buildingId, Long floorId, Long roomTypeId, String roomCode, Boolean enabled);
+
     List<RoomInfo> findAllByStoreId(Long storeId);
 
     List<RoomInfo> findAllByRoomTypeId(Long roomTypeId);

src/main/java/com/izouma/zhumj/service/StoreInfoService.java

@@ -244,9 +244,9 @@ public class StoreInfoService {
                     .build();
 
             RoomInfo baseRoomInfo = roomInfoRepo
-                    .findFirstByStoreIdAndBuildingIdAndFloorIdAndRoomTypeIdAndRoomCode(storeInfo
+                    .findFirstByStoreIdAndBuildingIdAndFloorIdAndRoomTypeIdAndRoomCodeAndEnabled(storeInfo
                             .getId(), roomBuildingInfo.getId(), roomFloorInfo.getId(), roomRoomTypeInfo
-                            .getId(), room.getRoomCode());
+                            .getId(), room.getRoomCode(), true);
             if (baseRoomInfo != null) {
                 roomInfo.setId(baseRoomInfo.getId());
                 ObjUtils.merge(baseRoomInfo, roomInfo);
@@ -461,7 +461,8 @@ public class StoreInfoService {
                         if (bedInfo.getCheckInStatus() == CheckInStatus.CHECK_IN) {
 
                             if (contractId != null) {
-                                CheckinInfo checkd = checkinInfoRepo.findFirstByBedIdAndCheckoutIsFalse(bedInfo.getId());
+                                CheckinInfo checkd = checkinInfoRepo
+                                        .findFirstByBedIdAndCheckoutIsFalse(bedInfo.getId());
                                 checkd.setOrderId(contractId);
                                 checkd.setSaleId(saleId);
                                 checkinInfoRepo.save(checkd);

src/main/java/com/izouma/zhumj/service/sms/AliSmsService.java

@@ -43,7 +43,7 @@ public class AliSmsService implements SmsService {
 
         String code = RandomStringUtils.randomNumeric(4);
         DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou",
-                "LTAI4Fm5YdHkr77zaYtRwyoN", "vsssz4ILKNJBg5q6aGSM83BSQOABLf");
+                "LTAI5tJZLJRsf8NYkS7q363g", "OfAfD2X4Bmk5b6tZ8bzEMUA9brB2U2");
         IAcsClient client = new DefaultAcsClient(profile);
 
         CommonRequest request = new CommonRequest();

src/main/resources/application.yaml

@@ -122,11 +122,11 @@ storage:
   provider: aliyun
   local_path: /var/www/upload/
 aliyun:
-  access-key-id: PXzJyah5rZfWHIIH
-  access-key-secret: e1MS6j0wypXJrw8CM0hObZu8qKbfah
-  oss-end-point: oss-cn-hangzhou.aliyuncs.com
-  oss-bucket-name: zhumj
-  oss-domain: https://zhumj.oss-cn-hangzhou.aliyuncs.com
+  access-key-id: LTAI5tJZLJRsf8NYkS7q363g
+  access-key-secret: OfAfD2X4Bmk5b6tZ8bzEMUA9brB2U2
+  oss-end-point: oss-cn-beijing.aliyuncs.com
+  oss-bucket-name: ycgy1
+  oss-domain: https://ycgy1.oss-cn-beijing.aliyuncs.com
 generic:
   server-address: http://192.168.50.34:8080
   mp-address: http://192.168.50.34:8082