|
|
@@ -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();
|