|
@@ -961,10 +961,10 @@ public class OrderServiceImpl implements IOrderService {
|
|
if(appSiteMapper.selectById(appCoursesMapper.selectById(appOrderProInfo.getProductId()).getAddressSiteId()).getType() == 0){
|
|
if(appSiteMapper.selectById(appCoursesMapper.selectById(appOrderProInfo.getProductId()).getAddressSiteId()).getType() == 0){
|
|
for (AppDevice appDevice : appDeviceMapper.selectList(Wrappers.<AppDevice>lambdaQuery().eq(AppDevice::getOrgCode, appOrder.getOrgCode()))){
|
|
for (AppDevice appDevice : appDeviceMapper.selectList(Wrappers.<AppDevice>lambdaQuery().eq(AppDevice::getOrgCode, appOrder.getOrgCode()))){
|
|
if(null != appDevice){
|
|
if(null != appDevice){
|
|
- JsonObject addUserJson = JsonParser.parseString(addUser(new DateTime(appOrderProInfo.getExpireTime()),
|
|
|
|
|
|
+ JsonObject addUserJson = JsonParser.parseString(addUser(new Date(),
|
|
appDevice.getDeviceSerial(),
|
|
appDevice.getDeviceSerial(),
|
|
appOrderProInfo.getUserName(),
|
|
appOrderProInfo.getUserName(),
|
|
- appOrderProInfo.getId())).getAsJsonObject();
|
|
|
|
|
|
+ appOrderProInfo.getId(),new DateTime(appOrderProInfo.getExpireTime()))).getAsJsonObject();
|
|
JsonObject addFaceJson = JsonParser.parseString(addFace(appDevice.getDeviceSerial(), appOrderProInfo.getId(),
|
|
JsonObject addFaceJson = JsonParser.parseString(addFace(appDevice.getDeviceSerial(), appOrderProInfo.getId(),
|
|
familyMembersMapper.selectById(appOrderProInfo.getFamilyUserId()).getRealNameImg())).getAsJsonObject();
|
|
familyMembersMapper.selectById(appOrderProInfo.getFamilyUserId()).getRealNameImg())).getAsJsonObject();
|
|
if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0){
|
|
if (addUserJson.get("code").getAsInt() != 0 && addFaceJson.get("code").getAsInt() != 0){
|
|
@@ -999,7 +999,7 @@ public class OrderServiceImpl implements IOrderService {
|
|
String addUser = addUser(appSitePriceRulesMapper.selectById(appOrderProInfo.getProductId()).getDateOfSale(),
|
|
String addUser = addUser(appSitePriceRulesMapper.selectById(appOrderProInfo.getProductId()).getDateOfSale(),
|
|
appDevice.getDeviceSerial(),
|
|
appDevice.getDeviceSerial(),
|
|
appOrderProInfo.getUserName(),
|
|
appOrderProInfo.getUserName(),
|
|
- appOrderProInfo.getId());
|
|
|
|
|
|
+ appOrderProInfo.getId(),null);
|
|
String addFace = addFace(appDevice.getDeviceSerial(), appOrderProInfo.getId(),
|
|
String addFace = addFace(appDevice.getDeviceSerial(), appOrderProInfo.getId(),
|
|
familyMembersMapper.selectById(appOrderProInfo.getFamilyUserId()).getRealNameImg());
|
|
familyMembersMapper.selectById(appOrderProInfo.getFamilyUserId()).getRealNameImg());
|
|
JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();
|
|
JsonObject addUserJson = JsonParser.parseString(addUser).getAsJsonObject();
|