diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index b6a6391ab..498694cc2 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,105 +1,8 @@ -002212025041312150410757346298490945536 -002212025041317445210757429295138353152 -002212025041410180310757679237266497536 -002212025041411565310757704109745930240 -002212025041413072510757721862251257856 -002212025041418220110757801033505296384 -002212025041419515110757823639798099968 -002212025041420001910757825772947292160 -002212025041420575910757840284542877696 -002212025041520150610758191881112297472 -002212025041611575910758429163905503232 -002212025041619013410758535761355198464 -002212025041619062910758536998119165952 -002212025041619172510758539748385996800 -002212025041620004810758550667895713792 -002212025041621075710758567568757895168 -002212025041621175910758570090892308480 -002212025041712573710758806559119585280 -002212025041717573310758882038354264064 -002212025041718414110758893143944802304 -002212025041721441910758939106730258432 -002212025041812224510759160171191824384 -002212025041814081510759186722917548032 -002212025041818121910759248143944032256 -002212025041823523810759333785219346432 -002212025041823572410759334986757275648 -002212025041914081710759549118418038784 -002212025042015342510759933183334064128 -002212025042019355810759993972076584960 -002212025042022441110760041336018280448 -002212025042118182710760336848473595904 -002212025042121592310760392451754717184 -002212025042123300510760415274477674496 -002212025042207230310760534299764826112 -002212025042218184610760699316425961472 -002212025042218543910760708349442490368 -002212025042300272510760792092732190720 -002212025042319093110761074477949501440 -002212025042321150610761106080434515968 -002212025042407491910761265688776318976 -002212025042417491110761416647713734656 -002212025042418004610761419562750820352 -002212025042418412510761429791716925440 -002212025042420123410761452731035332608 -002212025042422145710761483531534721024 -002212025042516460310761763147590447104 -002212025042517365710761775957306400768 -002212025042520274110761818923475558400 -002212025042521293510761834503368761344 -002212025042616151710762117793557278720 -002212025042618495710762156717095305216 -002212025042620020410762174864663277568 -002212025042708271710762362405583499264 -002212025042718563710762520782873755648 -002212025042719095310762524121686519808 -002212025042818580010762883520437669888 -002212025042819212110762889393244237824 -002212025042819331410762892385591689216 -002212025042820240710762905188568690688 -002212025042820512810762912074038259712 -002212025042822463410762941038781968384 -002212025042823015310762944892784918528 -002212025043000322510763330063048912896 -002212025043016401710763573636749312000 -002212025043021203610763644178772721664 -002212025043021262610763645648706719744 -002212025050108405110763815370028658688 -002212025050111212610763855783701524480 -002212025050116040710763926922281246720 -002212025050220494010764361172060930048 -002212025050222075010764380842088398848 -002212025050319274910764702960379539456 -002212025050320103110764713707597242368 -002212025050400344610764780206941302784 -002212025050518180210765410176196923392 -002212025050519342910765429413468688384 -002212025050608512610765629975285661696 -002212025050609344210765640860414754816 -002212025050619432510765794049911992320 -002212025050621244010765819531462754304 -002212025050717174910766119795690815488 -002212025050817502810766490402066685952 -002212025050818044410766493992290381824 -002212025050818183910766497493199892480 -002212025050818354710766501807079079936 -002212025050819595510766522980739997696 -002212025050821013510766538498336124928 -002212025050908064210766705879003471872 -002212025050909440910766730403475406848 -002212025050922050710766916875428311040 -002212025050922210410766920890148765696 -002212025051113055910767505970952978432 -002212025051115454710767546186413686784 -002212025051208392210767801263913447424 -002212025051211444210767847903200526336 -002212025051212161510767855844341567488 -002212025051213245110767873109914746880 -002212025051213561110767880994466603008 -002212025051218241210767948442564870144 -002212025051222204710768007978928295936 -002212025051222215210768008254254899200 -002212025051222502910768015456493305856 -002212025051309170710768173152784076800 -002212025051319042310768320944752025600 -002212025051320532410768348378625253376 +002212025060720331010777402983251783680 +002212025060721472610777421673882566656 +002212025060722130110777428110714519552 +002212025060809010010777591179259432960 +002212025060810011610777606348080578560 +002212025060810202610777611170066636800 +002212025060812480710777648338462162944 +002212025060815192710777686420418621440 \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 0c4c78955..1b7c25cdb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2275,18 +2275,22 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // } public static void main(String[] args) { - BigDecimal orderElectricityAmount = new BigDecimal("100"); - BigDecimal orderServiceAmount = new BigDecimal("50");; + String dictValue = DictUtils.getDictValue("platform_service_flag", "status"); - BigDecimal remainElectricityAmount = orderElectricityAmount; - BigDecimal remainServiceAmount = orderServiceAmount; + System.out.println(dictValue); - for (int i = 0; i < 5; i++) { - remainElectricityAmount = remainElectricityAmount.subtract(BigDecimal.valueOf(20)); - remainServiceAmount = remainServiceAmount.subtract(BigDecimal.valueOf(10)); - } - System.out.println("需要分账的电费金额:" + orderElectricityAmount + ", 剩余电费金额" + remainElectricityAmount); - System.out.println("需要分账的服务费金额:" + orderServiceAmount + ", 剩余服务费金额" + remainServiceAmount); + // BigDecimal orderElectricityAmount = new BigDecimal("100"); + // BigDecimal orderServiceAmount = new BigDecimal("50");; + // + // BigDecimal remainElectricityAmount = orderElectricityAmount; + // BigDecimal remainServiceAmount = orderServiceAmount; + // + // for (int i = 0; i < 5; i++) { + // remainElectricityAmount = remainElectricityAmount.subtract(BigDecimal.valueOf(20)); + // remainServiceAmount = remainServiceAmount.subtract(BigDecimal.valueOf(10)); + // } + // System.out.println("需要分账的电费金额:" + orderElectricityAmount + ", 剩余电费金额" + remainElectricityAmount); + // System.out.println("需要分账的服务费金额:" + orderServiceAmount + ", 剩余服务费金额" + remainServiceAmount); } /** diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZheJiangPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZheJiangPlatformServiceImpl.java index 223ab2135..3eac10ed3 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZheJiangPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZheJiangPlatformServiceImpl.java @@ -227,8 +227,8 @@ public class ZheJiangPlatformServiceImpl implements ThirdPartyPlatformService { stationInfo.setOperatorID(Constants.OPERATORID_JIANG_SU); // 组织机构代码 stationInfo.setEquipmentOwnerID(Constants.OPERATORID_JIANG_SU); stationInfo.setStationName(pileStationInfo.getStationName()); - stationInfo.setIsAloneApply(Integer.valueOf(pileStationInfo.getAloneApply())); - stationInfo.setIsPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking())); + stationInfo.setIsAloneApply(Integer.parseInt(pileStationInfo.getAloneApply())); + stationInfo.setIsPublicParkingLot(Integer.parseInt(pileStationInfo.getPublicParking())); stationInfo.setCountryCode(pileStationInfo.getCountryCode()); // 根据逗号分组 @@ -246,28 +246,28 @@ public class ZheJiangPlatformServiceImpl implements ThirdPartyPlatformService { stationInfo.setAddress(pileStationInfo.getAddress()); stationInfo.setServiceTel(pileStationInfo.getStationTel()); - stationInfo.setStationType(Integer.valueOf(pileStationInfo.getStationType())); - stationInfo.setParkNums(Integer.valueOf(pileStationInfo.getParkNums())); + stationInfo.setStationType(Integer.parseInt(pileStationInfo.getStationType())); + stationInfo.setParkNums(Integer.parseInt(pileStationInfo.getParkNums())); stationInfo.setStationLng(new BigDecimal(pileStationInfo.getStationLng())); stationInfo.setStationLat(new BigDecimal(pileStationInfo.getStationLat())); - stationInfo.setConstruction(Integer.valueOf(pileStationInfo.getConstruction())); - stationInfo.setOpenAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay())); + stationInfo.setConstruction(Integer.parseInt(pileStationInfo.getConstruction())); + stationInfo.setOpenAllDay(Integer.parseInt(pileStationInfo.getOpenAllDay())); // stationInfo.setMinElectricityPrice(pileStationInfo); // 最低充电电费率 // stationInfo.setElectricityFee(); // 电费 xx元/度 // stationInfo.setServiceFee(); // 服务费 xx元/度 - stationInfo.setParkFree(Integer.valueOf(pileStationInfo.getParkFree())); + stationInfo.setParkFree(Integer.parseInt(pileStationInfo.getParkFree())); stationInfo.setPayment(pileStationInfo.getPayment()); - stationInfo.setSupportOrder(Integer.valueOf(pileStationInfo.getSupportOrder())); + stationInfo.setSupportOrder(Integer.parseInt(pileStationInfo.getSupportOrder())); // stationInfo.setParkFeeType(pileStationInfo); // 停车收费类型 - stationInfo.setToiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag())); - stationInfo.setStoreFlag(Integer.valueOf(pileStationInfo.getStoreFlag())); - stationInfo.setRestaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag())); - stationInfo.setLoungeFlag(Integer.valueOf(pileStationInfo.getLoungeFlag())); - stationInfo.setCanopyFlag(Integer.valueOf(pileStationInfo.getCanopyFlag())); - stationInfo.setPrinterFlag(Integer.valueOf(pileStationInfo.getPrinterFlag())); - stationInfo.setBarrierFlag(Integer.valueOf(pileStationInfo.getBarrierFlag())); - stationInfo.setParkingLockFlag(Integer.valueOf(pileStationInfo.getParkingLockFlag())); - // 根据桩号查询正在使用的计费模板 + stationInfo.setToiletFlag(Integer.parseInt(pileStationInfo.getToiletFlag())); + stationInfo.setStoreFlag(Integer.parseInt(pileStationInfo.getStoreFlag())); + stationInfo.setRestaurantFlag(Integer.parseInt(pileStationInfo.getRestaurantFlag())); + stationInfo.setLoungeFlag(Integer.parseInt(pileStationInfo.getLoungeFlag())); + stationInfo.setCanopyFlag(Integer.parseInt(pileStationInfo.getCanopyFlag())); + stationInfo.setPrinterFlag(Integer.parseInt(pileStationInfo.getPrinterFlag())); + stationInfo.setBarrierFlag(Integer.parseInt(pileStationInfo.getBarrierFlag())); + stationInfo.setParkingLockFlag(Integer.parseInt(pileStationInfo.getParkingLockFlag())); + // 根据站点id查询正在使用的计费模板 List billingPriceVOList = pileBillingTemplateService.queryBillingPrice(String.valueOf(pileStationInfo.getId())); if (CollectionUtils.isEmpty(billingPriceVOList)) { @@ -339,32 +339,32 @@ public class ZheJiangPlatformServiceImpl implements ThirdPartyPlatformService { .stationID(stationId) .operatorID(operatorId) .stationName(pileStationInfo.getStationName()) - .isAloneApply(Integer.valueOf(pileStationInfo.getAloneApply())) - .isPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking())) + .isAloneApply(Integer.parseInt(pileStationInfo.getAloneApply())) + .isPublicParkingLot(Integer.parseInt(pileStationInfo.getPublicParking())) .countryCode(pileStationInfo.getCountryCode()) .address(pileStationInfo.getAddress()) .serviceTel(pileStationInfo.getStationTel()) - .stationType(Integer.valueOf(pileStationInfo.getStationType())) - .stationStatus(Integer.valueOf(pileStationInfo.getStationStatus())) - .parkNums(Integer.valueOf(pileStationInfo.getParkNums())) + .stationType(Integer.parseInt(pileStationInfo.getStationType())) + .stationStatus(Integer.parseInt(pileStationInfo.getStationStatus())) + .parkNums(Integer.parseInt(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())) - .supportOrder(Integer.valueOf(pileStationInfo.getSupportOrder())) + .construction(Integer.parseInt(pileStationInfo.getConstruction())) + .openAllDay(Integer.parseInt(pileStationInfo.getOpenAllDay())) + // .minElectricityPrice(new BigDecimal(Constants.ZERO)) + // .electricityFee(Constants.ZERO) + // .serviceFee(Constants.ZERO) + .parkFree(Integer.parseInt(pileStationInfo.getParkFree())) + .supportOrder(Integer.parseInt(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())) + .toiletFlag(Integer.parseInt(pileStationInfo.getToiletFlag())) + .storeFlag(Integer.parseInt(pileStationInfo.getStoreFlag())) + .restaurantFlag(Integer.parseInt(pileStationInfo.getRestaurantFlag())) + .loungeFlag(Integer.parseInt(pileStationInfo.getLoungeFlag())) + .canopyFlag(Integer.parseInt(pileStationInfo.getCanopyFlag())) + .printerFlag(Integer.parseInt(pileStationInfo.getPrinterFlag())) + .barrierFlag(Integer.parseInt(pileStationInfo.getBarrierFlag())) + .parkingLockFlag(Integer.parseInt(pileStationInfo.getParkingLockFlag())) .build(); String areaCode = pileStationInfo.getAreaCode(); // 330000,330200,330213 // 根据逗号分组 @@ -413,6 +413,29 @@ public class ZheJiangPlatformServiceImpl implements ThirdPartyPlatformService { info.setAreaCodeCountryside(areaCodeCountryside); } + // 根据站点id查询正在使用的计费模板 + List billingPriceVOList = pileBillingTemplateService.queryBillingPrice(String.valueOf(pileStationInfo.getId())); + + if (CollectionUtils.isEmpty(billingPriceVOList)) { + return null; + } + SupStationInfo.PolicyInfo policyInfo = null; + // 获取计费模板 + List policyInfoList = new ArrayList<>(); + for (BillingPriceVO billingPriceVO : billingPriceVOList) { + // 将时段开始时间、电费、服务费信息进行封装 + policyInfo = new SupStationInfo.PolicyInfo(); + String startTime = billingPriceVO.getStartTime() + ":00"; // 00:00:00 格式 + // 需要将中间的冒号去掉，改为 000000 格式 + String replace = StringUtils.replace(startTime, ":", ""); + policyInfo.setStartTime(replace); + policyInfo.setElecFee(new BigDecimal(billingPriceVO.getElectricityPrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); + policyInfo.setServiceFee(new BigDecimal(billingPriceVO.getServicePrice()).setScale(4, BigDecimal.ROUND_HALF_UP)); + + policyInfoList.add(policyInfo); + } + info.setPolicyInfos(policyInfoList); + // 调用联联平台接口 String url = urlAddress + "supervise_notification_station_info";