diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 6ca159fc8..5a674f740 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -35,6 +35,7 @@ import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; import com.jsowell.pile.transaction.dto.MemberTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; +import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.vo.base.MemberWalletVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.uniapp.MemberVO; @@ -164,10 +165,10 @@ public class MemberService { MemberTransactionDTO memberTransactionDTO = new MemberTransactionDTO(); memberTransactionDTO.setMemberBasicInfo(memberBasicInfo); // 首次新建会员，同时新建会员钱包 - if (StringUtils.equals("35", firstLevelMerchantId)) { + if (MerchantUtils.isXiXiaoMerchant(firstLevelMerchantId)) { MemberWalletInfo memberWalletInfo = MemberWalletInfo.builder() .memberId(memberId) - .merchantId("35") + .merchantId(MerchantUtils.XIXIAO_MERCHANT_ID) .walletCode(memberBasicInfoService.generateWalletCode()) .build(); memberTransactionDTO.setMemberWalletInfo(memberWalletInfo); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index d4847a9aa..6d638fc61 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -39,6 +39,7 @@ import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; +import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.base.PileInfoVO; @@ -805,7 +806,7 @@ public class OrderService { .build() ); // 如果是希晓的会员，将余额支付添加进去 - if (StringUtils.equals("35", String.valueOf(memberBasicInfo.getMerchantId()))) { // 35-希晓 + if (MerchantUtils.isXiXiaoMerchant(String.valueOf(memberBasicInfo.getMerchantId()))) { // 35-希晓 // 余额支付 result.add( PayModeVO.builder() diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index ec244f800..93c18492f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -25,6 +25,7 @@ import com.jsowell.pile.mapper.MemberBasicInfoMapper; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.service.*; +import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; @@ -214,8 +215,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { MemberBasicInfo memberInfo = selectInfoByMemberId(memberId); if (memberInfo != null) { // 如果这个会员属于希晓，那么目标运营商就设置为希晓的id - if (StringUtils.equals("35", memberInfo.getMerchantId() + "")) { - dto.setTargetMerchantId("35"); + if (MerchantUtils.isXiXiaoMerchant(memberInfo.getMerchantId() + "")) { + dto.setTargetMerchantId(MerchantUtils.XIXIAO_MERCHANT_ID); } } } @@ -430,9 +431,9 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { return null; } - if (StringUtils.equals("35", vo.getMerchantId())) { + if (MerchantUtils.isXiXiaoMerchant(vo.getMerchantId())) { // 如果会员属于希晓，那么merchantId默认为希晓的运营商id - merchantId = "35"; + merchantId = MerchantUtils.XIXIAO_MERCHANT_ID; } try { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java index 15abacf96..f1f63b0c9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java @@ -1,9 +1,18 @@ package com.jsowell.pile.util; +import com.jsowell.common.util.StringUtils; + /** * 运营商工具类 */ public class MerchantUtils { - private String XIXIAO_MERCHANT_ID = "35"; + // 希晓运营商id + public static final String XIXIAO_MERCHANT_ID = "35"; + + // 是否是希晓运营商 + public static boolean isXiXiaoMerchant(String merchantId) { + return StringUtils.equals(XIXIAO_MERCHANT_ID, merchantId); + } + } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 8d782796b..4cb36422c 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -30,6 +30,7 @@ import com.jsowell.pile.domain.*; import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; +import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.lianlian.PushStationFeeVO; @@ -127,139 +128,8 @@ public class LianLianServiceImpl implements LianLianService { .OperatorTel1(merchantInfo.getMerchantTel()) // 对接平台客服电话1 .build(); // 调用联联平台接口 - - } - /** - * 根据站点id推送站点信息 notification_stationInfo - * - * @param dto - */ - // @Override - // public String pushStationInfo(PushStationInfoDTO dto) { - // // String OperatorID = "987654321"; - // // String SigSecret = "1234567890abcdef"; // 签名秘钥 - // // String DataSecret = "1234567890abcdef"; // 消息密钥 - // // String DataSecretIV = "1234567890abcdef"; // 消息密钥初始化向量 - // // String token = "c548f9276c1c4ea8b88b1f7b1eb7cf07"; //QueryToken类查询接口获取到的token - // - // // 通过id查询站点相关信息 - // PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(dto.getStationId()); - // // 通过站点id查询相关配置信息 - // ThirdPartyStationRelation relation = new ThirdPartyStationRelation(); - // relation.setStationId(dto.getStationId()); - // ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation); - // // ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(dto.getStationId()); - // if (relationInfo == null) { - // // 新增 - // relation.setThirdPartyType(dto.getThirdPartyType()); - // thirdPartyStationRelationService.insertThirdPartyStationRelation(relation); - // - // relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation); - // } - // String operatorId = relationInfo.getOperatorId(); - // String operatorSecret = relationInfo.getOperatorSecret(); - // String signSecret = relationInfo.getSignSecret(); - // String dataSecret = relationInfo.getDataSecret(); - // String dataSecretIv = relationInfo.getDataSecretIv(); - // String urlAddress = relationInfo.getUrlAddress(); - // - // // 组装联联平台所需要的数据格式 - // StationInfo info = StationInfo.builder() - // .stationID("LC" +dto.getStationId()) - // .operatorID(operatorId) - // // .equipmentOwnerID(Constants.OPERATORID_LIANLIAN) - // .stationName(pileStationInfo.getStationName()) - // .isAloneApply(Integer.valueOf(pileStationInfo.getAloneApply())) - // .isPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking())) - // .countryCode(pileStationInfo.getCountryCode()) - // // .areaCode(pileStationInfo.getAreaCode()) - // .address(pileStationInfo.getAddress()) - // .serviceTel(pileStationInfo.getStationTel()) - // .stationType(Integer.valueOf(pileStationInfo.getStationType())) - // .stationStatus(Integer.valueOf(pileStationInfo.getStationStatus())) - // .parkNums(Integer.valueOf(pileStationInfo.getParkNums())) - // .stationLng(new BigDecimal(pileStationInfo.getStationLng())) - // .stationLat(new BigDecimal(pileStationInfo.getStationLat())) - // .construction(Integer.valueOf(pileStationInfo.getConstruction())) - // .openAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay())) - // .minElectricityPrice(new BigDecimal(Constants.ZERO)) - // .electricityFee(Constants.ZERO) - // .serviceFee(Constants.ZERO) - // .parkFree(Integer.valueOf(pileStationInfo.getParkFree())) - // // .ParkFee("2") - // .supportOrder(Integer.valueOf(pileStationInfo.getSupportOrder())) - // .parkFeeType(0) - // .toiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag())) - // .storeFlag(Integer.valueOf(pileStationInfo.getStoreFlag())) - // .restaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag())) - // .loungeFlag(Integer.valueOf(pileStationInfo.getLoungeFlag())) - // .canopyFlag(Integer.valueOf(pileStationInfo.getCanopyFlag())) - // .printerFlag(Integer.valueOf(pileStationInfo.getPrinterFlag())) - // .barrierFlag(Integer.valueOf(pileStationInfo.getBarrierFlag())) - // .parkingLockFlag(Integer.valueOf(pileStationInfo.getParkingLockFlag())) - // - // .build(); - // String areaCode = pileStationInfo.getAreaCode(); // 330000,330200,330213 - // // 根据逗号分组 - // String[] split = StringUtils.split(areaCode, ","); - // // 只取最后一部分 330213 - // String subAreaCode = split[split.length - 1]; - // info.setAreaCode(subAreaCode); - // // 截取运营商组织机构代码(去除最后一位后的最后九位) - // MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId())); - // String organizationCode = merchantInfo.getOrganizationCode(); - // if (StringUtils.isNotBlank(organizationCode) && organizationCode.length() == 18) { - // String equipmentOwnerId = StringUtils.substring(organizationCode, organizationCode.length() - 10, organizationCode.length() - 1); - // info.setEquipmentOwnerID(equipmentOwnerId); - // } - // if (StringUtils.equals("36", String.valueOf(pileStationInfo.getMerchantId()))) { - // // 远大 - // info.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA); - // } - // if (StringUtils.equals("35", String.valueOf(pileStationInfo.getMerchantId()))) { - // // 如果是希晓运营商，则把equipmentOwnerID换成希晓 - // info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); - // } - // String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment()); - // info.setPayment(payment); - // if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) { - // info.setIsPublicParkingLot(1); - // info.setParkingLotNumber(pileStationInfo.getParkingNumber()); - // } - // // 户号 - // if (StringUtils.isNotBlank(pileStationInfo.getAccountNumber())) { - // info.setAccountNumber(pileStationInfo.getAccountNumber()); - // } - // // 容量 - // if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) { - // info.setCapacity(pileStationInfo.getCapacity().setScale(4, BigDecimal.ROUND_HALF_UP)); - // } - // List pileList = getPileList(pileStationInfo); - // if (CollectionUtils.isNotEmpty(pileList)) { - // info.setEquipmentInfos(pileList); // 充电设备信息列表 - // } - // - // // 调用联联平台接口 - // String url = urlAddress + "notification_stationInfo"; - // - // String jsonStr = JSON.toJSONString(info); - // JSONObject data = new JSONObject(); - // data.put("StationInfo", jsonStr); - // - // String jsonString = JSON.toJSONString(data); - // System.out.println("jsonString : " + jsonString); - // - // // 获取令牌 - // String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); - // String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret - // , dataSecretIv, operatorId, signSecret); - // - // // System.out.println(result); - // return result; - // } - public String pushStationInfoV2(PushStationInfoDTO dto) { // 通过id查询站点相关信息 @@ -336,7 +206,7 @@ public class LianLianServiceImpl implements LianLianService { // 远大 info.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA); } - if (StringUtils.equals("35", String.valueOf(pileStationInfo.getMerchantId()))) { + if (MerchantUtils.isXiXiaoMerchant(String.valueOf(pileStationInfo.getMerchantId()))) { // 如果是希晓运营商，则把equipmentOwnerID换成希晓 info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } @@ -1142,7 +1012,7 @@ public class LianLianServiceImpl implements LianLianService { .stopReason(0) // .chargeDetails() .build(); - if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) { + if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) { orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } // 支付方式 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java index 271770028..dd5bb4480 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java @@ -26,6 +26,7 @@ import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.pile.thirdparty.EquipmentInfo; +import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.lianlian.PushStationFeeVO; @@ -538,7 +539,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // 远大 info.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA); } - if (StringUtils.equals("35", String.valueOf(pileStationInfo.getMerchantId()))) { + if (MerchantUtils.isXiXiaoMerchant(String.valueOf(pileStationInfo.getMerchantId()))) { // 如果是希晓运营商，则把equipmentOwnerID换成希晓 info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } @@ -725,7 +726,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { .stopReason(0) // .chargeDetails() .build(); - if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) { + if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) { orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } // 支付方式 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java index 3ef320590..9fb02c474 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java @@ -27,6 +27,7 @@ import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.pile.thirdparty.EquipmentInfo; +import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; @@ -408,7 +409,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService { ChargeOrderInfo orderInfo = transformChargeOrderInfo(orderBasicInfo, orderDetail); orderInfo.setOperatorID(operatorId); String equipmentOwnerID; - if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) { + if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) { equipmentOwnerID = Constants.OPERATORID_XI_XIAO; } else { equipmentOwnerID = Constants.OPERATORID_LIANLIAN; @@ -533,7 +534,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService { ChargeOrderInfo orderInfo = transformChargeOrderInfo(orderBasicInfo, orderDetail); orderInfo.setOperatorID(operatorId); String equipmentOwnerID; - if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) { + if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) { equipmentOwnerID = Constants.OPERATORID_XI_XIAO; } else { equipmentOwnerID = Constants.OPERATORID_LIANLIAN;