|
@@ -87,6 +87,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
* 质检商户code
|
|
|
*/
|
|
|
public static final String QA_MERC_CODE = "10001";
|
|
|
+ /**
|
|
|
+ * 聚邻社质检
|
|
|
+ */
|
|
|
+ public static final String JLS_QA_MERC_CODE = "10112";
|
|
|
+ /**
|
|
|
+ * 聚邻社顶级商户
|
|
|
+ */
|
|
|
+ public static final String JLS_MERC_CODE = "10168";
|
|
|
private final CloudWalkApiService cloudWalkApiService;
|
|
|
private final AlgorithmService algorithmService;
|
|
|
private final CountApiService countApiService;
|
|
@@ -1048,13 +1056,23 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
*/
|
|
|
private Boolean removeMerRefDevicesToTopMerc(List<DeviceInfo> deviceInfos) {
|
|
|
MercDto.Vo mercCheck = R.feignCheckData(mercFeignService.obj(new MercDto.ListDTO().setMercCode(QA_MERC_CODE)));
|
|
|
+ MercDto.Vo mercJlsQaCheck = R.feignCheckData(mercFeignService.obj(new MercDto.ListDTO().setMercCode(JLS_QA_MERC_CODE)));
|
|
|
if (CollUtil.isNotEmpty(deviceInfos)) {
|
|
|
deviceInfos.forEach(deviceInfo -> {
|
|
|
- // 回收
|
|
|
- deviceInfo.setMercId(mercCheck.getId());
|
|
|
+ String mercCode = deviceInfo.getMercCode();
|
|
|
deviceInfo.setMercDeviceCode(StrUtil.EMPTY);
|
|
|
- deviceInfo.setMercName(mercCheck.getName());
|
|
|
- deviceInfo.setMercCode(QA_MERC_CODE);
|
|
|
+
|
|
|
+ if (mercCode.startsWith(JLS_MERC_CODE)) {
|
|
|
+ //聚邻社的机器,回收到,聚邻社的质检
|
|
|
+ deviceInfo.setMercId(mercJlsQaCheck.getId());
|
|
|
+ deviceInfo.setMercName(mercJlsQaCheck.getName());
|
|
|
+ deviceInfo.setMercCode(JLS_QA_MERC_CODE);
|
|
|
+ } else {
|
|
|
+ //兴元质检
|
|
|
+ deviceInfo.setMercId(mercCheck.getId());
|
|
|
+ deviceInfo.setMercName(mercCheck.getName());
|
|
|
+ deviceInfo.setMercCode(QA_MERC_CODE);
|
|
|
+ }
|
|
|
// 清理点位
|
|
|
deviceInfo.setPlaceId(-1L);
|
|
|
});
|
|
@@ -1976,6 +1994,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
if (BooleanUtil.isFalse(b)) {
|
|
|
throw new RuntimeException("NFC设备激活失败!");
|
|
|
}
|
|
|
+ deviceInfo.setActiveState(Integer.valueOf(DeviceActiveStateEnum.TRUE.getCode()));
|
|
|
+ deviceInfo.setActiveTime(LocalDateTime.now());
|
|
|
+ updateById(deviceInfo);
|
|
|
return R.ok(true);
|
|
|
}
|
|
|
}
|