Browse Source

fix(order): 修复设备用户信息录入时间参数问题

- 场地预约订单使用最早和最晚的过期时间,传入frameTimeStr指定每日时间段
- 单个订单使用开始销售日期,同时传入frameTimeStr
- 确保用户和人脸设备录入接口时间参数正确传递
- 添加代码注释说明时间参数使用逻辑
SheepHy 3 days ago
parent
commit
360b798daa

+ 4 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -1314,10 +1314,11 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
                         .last("limit 1"));
                 for (AppDevice appDevice : appDeviceMapper.selectList(Wrappers.<AppDevice>lambdaQuery().eq(AppDevice::getOrgCode, appOrder.getOrgCode()))) {
                     if(proInfo1 != null && proInfo2 != null){
+                        // 场地预约订单:使用最早和最晚的过期时间,并传入frameTimeStr指定每日时间段
                         String addUser = addUser(new DateTime(proInfo2.getExpireTime()),
                                 appDevice.getDeviceSerial(),
                                 appOrderProInfo.getUserName(),
-                                familyMembers.getId(), new DateTime(proInfo1.getExpireTime()), null);
+                                familyMembers.getId(), new DateTime(proInfo1.getExpireTime()), appOrderProInfo.getFrameTimeStr());
                         String addFace = addFace(appDevice.getDeviceSerial(), familyMembers.getId(),
                                 familyMembers.getRealNameImg());
                         JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();
@@ -1325,10 +1326,11 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
                         if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0)
                             throw new JeecgBootException("设备录入用户信息失败!请联系管理员");
                     }else {
+                        // 只有单个订单:使用开始销售日期,并传入frameTimeStr
                         String addUser = addUser(appSitePriceRulesMapper.selectById(appOrderProInfo.getProductId()).getDateOfSale(),
                                 appDevice.getDeviceSerial(),
                                 appOrderProInfo.getUserName(),
-                                familyMembers.getId(), null,null);
+                                familyMembers.getId(), null, appOrderProInfo.getFrameTimeStr());
                         String addFace = addFace(appDevice.getDeviceSerial(), familyMembers.getId(),
                                 familyMembers.getRealNameImg());
                         JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();