Browse Source

商户设备授权,根据设备类型更新所属算法

谭斌 2 năm trước cách đây
mục cha
commit
1bee4210df

+ 6 - 0
device-api-service/pom.xml

@@ -92,5 +92,11 @@
             <artifactId>xy-enum</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>xy-algorithm</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

+ 8 - 0
device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -10,6 +10,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,9 +37,11 @@ import com.xy.service.be.MercFeignService;
 import com.xy.sys.EnumDataClearSize;
 import com.xy.util.ExcelUtils;
 import com.xy.utils.*;
+import com.xy.utils.Enum.AlgorithmTypeEnum;
 import com.xy.utils.enums.DeviceActiveStateEnum;
 import com.xy.utils.enums.DeviceLockState;
 import com.xy.utils.enums.DeviceNetSateType;
+import com.xy.utils.enums.DeviceTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jodd.introspector.MapperFunction;
@@ -378,6 +381,11 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         //更新商户设备授权
         List<DeviceInfo> deviceInfos = this.listByIds(deviceIds);
         for (DeviceInfo deviceInfo : deviceInfos) {
+            Integer deviceType = deviceInfo.getDeviceType();
+            if (ObjectUtil.equals(deviceType, DeviceTypeEnum.TYPE5.getCode())) {
+                //支付宝设备算法
+                algorithmId = AlgorithmTypeEnum.ALIPAY.getId();
+            }
             int refMercId = deviceInfo.getMercId().intValue();
             String refMercCode = deviceInfo.getMercCode();
             //  只有解绑后,才能给顶级商户授权