diff --git a/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzOrderMapper.java b/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzOrderMapper.java index 3267afc..ef8ba83 100644 --- a/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzOrderMapper.java +++ b/yunze-common/src/main/java/com/yunze/common/mapper/yunze/YzOrderMapper.java @@ -216,5 +216,11 @@ public interface YzOrderMapper { * @return */ public int updaudit(Map map); + /** + * 查询卡号是否首次充值 + * @param map + * @return + */ + public Integer findFirstOrder(Map map); } diff --git a/yunze-common/src/main/java/com/yunze/common/utils/yunze/GetShowStatIdArr.java b/yunze-common/src/main/java/com/yunze/common/utils/yunze/GetShowStatIdArr.java index 52301bf..009a4fe 100644 --- a/yunze-common/src/main/java/com/yunze/common/utils/yunze/GetShowStatIdArr.java +++ b/yunze-common/src/main/java/com/yunze/common/utils/yunze/GetShowStatIdArr.java @@ -2,6 +2,9 @@ package com.yunze.common.utils.yunze; import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.Map; + @Component public class GetShowStatIdArr { @@ -33,4 +36,42 @@ public class GetShowStatIdArr { return status_ShowId; } + public Map GetShowStatIdMap (String status_id){ + Map Rmap = new HashMap<>(); + //卡状态对应的卡状态描述 + String status_ShowId = "8"; + String status_ShowMesage = "未知"; + if(status_id.equals("13") || status_id.equals("14") || status_id.equals("22") || status_id.equals("19")){ + status_ShowId = "1"; + status_ShowMesage = "库存"; + }else if(status_id.equals("17") ){ + status_ShowId = "2"; + status_ShowMesage = "可测试"; + }else if(status_id.equals("9") || status_id.equals("7") || status_id.equals("15")){ + status_ShowId = "3"; + status_ShowMesage = "待激活"; + }else if(status_id.equals("1")){ + status_ShowId = "4"; + status_ShowMesage = "已激活"; + }else if(status_id.equals("3") || status_id.equals("2") || status_id.equals("10") || status_id.equals("11") || + status_id.equals("20")|| status_id.equals("30")|| status_id.equals("31") || status_id.equals("32") || + status_id.equals("21")|| status_id.equals("27")|| status_id.equals("33") || status_id.equals("12")){ + status_ShowId = "5"; + status_ShowMesage = "已停机"; + }else if(status_id.equals("4")){ + status_ShowId = "6"; + status_ShowMesage = "预销户"; + }else if(status_id.equals("16")|| status_id.equals("23")|| status_id.equals("24") || status_id.equals("5") || + status_id.equals("6") || status_id.equals("28")|| status_id.equals("26") || status_id.equals("18")|| + status_id.equals("25")){ + status_ShowId = "7"; + status_ShowMesage = "已销户"; + }else if(status_id.equals("8") || status_id.equals("29")){ + status_ShowId = "8"; + status_ShowMesage = "未知"; + } + Rmap.put("status_ShowId",status_ShowId); + Rmap.put("status_ShowMesage",status_ShowMesage); + return Rmap; + } } diff --git a/yunze-common/src/main/resources/mapper/quartz/yunze/YzOrderMapper.xml b/yunze-common/src/main/resources/mapper/quartz/yunze/YzOrderMapper.xml index 739fc28..7657dd2 100644 --- a/yunze-common/src/main/resources/mapper/quartz/yunze/YzOrderMapper.xml +++ b/yunze-common/src/main/resources/mapper/quartz/yunze/YzOrderMapper.xml @@ -987,7 +987,18 @@ - + + diff --git a/yunze-iotapi/src/main/java/com/yunze/iotapi/service/impl/OpenApiServiceImpl.java b/yunze-iotapi/src/main/java/com/yunze/iotapi/service/impl/OpenApiServiceImpl.java index 16f8f67..0666829 100644 --- a/yunze-iotapi/src/main/java/com/yunze/iotapi/service/impl/OpenApiServiceImpl.java +++ b/yunze-iotapi/src/main/java/com/yunze/iotapi/service/impl/OpenApiServiceImpl.java @@ -2,13 +2,13 @@ package com.yunze.iotapi.service.impl; import com.alibaba.fastjson.JSON; -import com.yunze.apiCommon.mapper.mysql.YzCardRouteMapper; +import com.yunze.apiCommon.mapper.YzCardRouteMapper; import com.yunze.apiCommon.utils.AesEncryptUtil; import com.yunze.apiCommon.utils.ApiUtil_NoStatic; import com.yunze.apiCommon.utils.Arith; -import com.yunze.common.mapper.mysql.YzAgentPacketMapper; -import com.yunze.common.mapper.mysql.YzOrderMapper; -import com.yunze.common.mapper.mysql.YzUserMapper; +import com.yunze.common.mapper.yunze.YzAgentPacketMapper; +import com.yunze.common.mapper.yunze.YzOrderMapper; +import com.yunze.common.mapper.yunze.YzUserMapper; import com.yunze.common.utils.yunze.GetShowStatIdArr; import com.yunze.common.utils.yunze.PlOrder; import com.yunze.iotapi.service.IOpenApi;