|
|
@@ -1163,7 +1163,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
JsonObject addUserJson = JsonParser.parseString(addUser(new DateTime(proInfo2.getExpireTime()),
|
|
|
appDevice.getDeviceSerial(),
|
|
|
appOrderProInfo.getUserName(),
|
|
|
- familyMembers.getId(), new DateTime(proInfo1.getExpireTime()))).getAsJsonObject();
|
|
|
+ familyMembers.getId(), new DateTime(proInfo1.getExpireTime()), appOrderProInfo.getFrameTimeStr())).getAsJsonObject();
|
|
|
JsonObject addFaceJson = JsonParser.parseString(addFace(appDevice.getDeviceSerial(), familyMembers.getId(),
|
|
|
familyMembers.getRealNameImg())).getAsJsonObject();
|
|
|
if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0) {
|
|
|
@@ -1173,7 +1173,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
JsonObject addUserJson = JsonParser.parseString(addUser(new Date(),
|
|
|
appDevice.getDeviceSerial(),
|
|
|
appOrderProInfo.getUserName(),
|
|
|
- familyMembers.getId(), new DateTime(appOrderProInfo.getExpireTime()))).getAsJsonObject();
|
|
|
+ familyMembers.getId(), new DateTime(appOrderProInfo.getExpireTime()), appOrderProInfo.getFrameTimeStr())).getAsJsonObject();
|
|
|
JsonObject addFaceJson = JsonParser.parseString(addFace(appDevice.getDeviceSerial(), familyMembers.getId(),
|
|
|
familyMembers.getRealNameImg())).getAsJsonObject();
|
|
|
if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0) {
|
|
|
@@ -1260,7 +1260,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
String addUser = addUser(new DateTime(proInfo2.getExpireTime()),
|
|
|
appDevice.getDeviceSerial(),
|
|
|
appOrderProInfo.getUserName(),
|
|
|
- familyMembers.getId(), new DateTime(proInfo1.getExpireTime()));
|
|
|
+ familyMembers.getId(), new DateTime(proInfo1.getExpireTime()), null);
|
|
|
String addFace = addFace(appDevice.getDeviceSerial(), familyMembers.getId(),
|
|
|
familyMembers.getRealNameImg());
|
|
|
JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();
|
|
|
@@ -1271,7 +1271,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
String addUser = addUser(appSitePriceRulesMapper.selectById(appOrderProInfo.getProductId()).getDateOfSale(),
|
|
|
appDevice.getDeviceSerial(),
|
|
|
appOrderProInfo.getUserName(),
|
|
|
- familyMembers.getId(), null);
|
|
|
+ familyMembers.getId(), null,null);
|
|
|
String addFace = addFace(appDevice.getDeviceSerial(), familyMembers.getId(),
|
|
|
familyMembers.getRealNameImg());
|
|
|
JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();
|