Răsfoiți Sursa

fix: 酒店卡片服务
1.查询客人卡的返回数据更新

luoyb 1 an în urmă
părinte
comite
3f988f1b0a

+ 1 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/SelfBusiness.java

@@ -237,7 +237,7 @@ public class SelfBusiness {
             if (ObjectUtil.isNotEmpty(userCardData)) {
                 selfCardVo.setRoomCode(userCardData.getRoomCode());
                 selfCardVo.setCheckInDate(DateUtil.formatDateTime(userCardData.getStartTime()));
-                selfCardVo.setCheckInDate(DateUtil.formatDateTime(userCardData.getEndTime()));
+                selfCardVo.setCheckOutDate(DateUtil.formatDateTime(userCardData.getEndTime()));
             }
         }
 

+ 1 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/CardApiController.java

@@ -150,7 +150,7 @@ public class CardApiController extends BaseController {
         bo.setTenantId(tenantId);
         R<Void> result = cardBusiness.recycleCard(bo);
         if(R.isSuccess(result)){
-            return ReturnResult.success();
+            return ReturnResult.success("卡片回收成功");
         } else {
             return ReturnResult.failure(ResultCodeEnum.DATA_IS_WRONG, result.getMsg());
         }