diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index fb43b6aa8..0ec9fbd51 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -56,6 +56,8 @@ public class Constants { public static final String OPERATORID_JIANG_SU = "MA1X78KH5"; + public static final String OPERATORID_XI_XIAO = "MAC13L2Q9"; + // public static final String APP_ID = "wxbb3e0d474569481d"; // 举视充电网 wxbb3e0d474569481d // // public static final String APP_SECRET = "bbac689f4654b209de4d6944808ec80b"; // 举视充电网 bbac689f4654b209de4d6944808ec80b 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 bcec26508..1cfe8bb0f 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 @@ -196,6 +196,10 @@ public class LianLianServiceImpl implements LianLianService { .parkingLockFlag(Integer.valueOf(pileStationInfo.getParkingLockFlag())) .build(); + if (StringUtils.equals(String.valueOf(pileStationInfo.getMerchantId()), "35")) { + // 如果是希晓运营商,则把equipmentOwnerID换成希晓 + info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); + } String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment()); info.setPayment(payment); if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) { @@ -978,6 +982,9 @@ public class LianLianServiceImpl implements LianLianService { .stopReason(0) // .chargeDetails() .build(); + if (StringUtils.equals(orderBasicInfo.getMerchantId(), "35")) { + orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); + } // 支付方式 if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 微信支付 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java index bfab43ecf..0b04a8441 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java @@ -3,7 +3,9 @@ package com.jsowell.thirdparty.ningxiajiaotou.service.impl; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; +import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.domain.ThirdPartyPlatformConfig; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; @@ -23,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -184,6 +183,11 @@ public class NXJTServiceImpl implements NXJTService { if (configInfo == null) { return null; } + // 如果开始时间、结束时间为空,则默认为一个月内 + if (StringUtils.isBlank(dto.getStartTime()) && StringUtils.isBlank(dto.getEndTime())) { + dto.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addMonths(new Date(), -1))); + dto.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date())); + } // 分页 PageUtils.startPage(pageNo, pageSize); // 根据车牌号查询消费情况