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 e151bdabb..4da57eba3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1498,6 +1498,7 @@ public class OrderService { if (StringUtils.isNotBlank(dto.getStopReason())) { int i = Integer.parseInt(dto.getStopReason(), 16); String stopReasonMsg = YKCChargingStopReasonEnum.getMsgByCode(i); + record.setStopReasonCode(dto.getStopReason()); // 故障原因码 record.setReason(stopReasonMsg); } record.setTradeDate(DateUtils.parseDate(dto.getTradeTime())); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 810874825..94296f1b2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -1259,7 +1259,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { equipmentInfo.setNewNationalStandard(1); equipmentInfo.setVinFlag(1); equipmentInfo.setEquipmentName(pileSn); - equipmentInfo.setEquipmentApplication(1); + equipmentInfo.setEquipmentApplication(Constants.ONE); equipmentInfo.setEquipmentInvestment(new BigDecimal("0.0")); equipmentInfo.setProductSN(pileSn); equipmentInfo.setOpenDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileDetailInfoVO.getCreateTime())); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java index fabbfea19..d16846af0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java @@ -103,7 +103,7 @@ public class EquipmentInfo { * 9：其他 */ @JSONField(name = "EquipmentApplication") - private Integer equipmentApplication; + private String equipmentApplication; /** * 额定功率(单位：kW) Y diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HeNanPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HeNanPlatformServiceImpl.java index 5a40eca61..6d4e1590f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HeNanPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HeNanPlatformServiceImpl.java @@ -9,23 +9,31 @@ import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; +import com.jsowell.common.enums.ykc.StartModeEnum; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.AreaCodeInfo; +import com.jsowell.pile.domain.OrderBasicInfo; +import com.jsowell.pile.domain.OrderDetail; import com.jsowell.pile.dto.PushRealTimeInfoDTO; 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.ThirdPartySecretInfoVO; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; +import com.jsowell.pile.vo.web.PileMerchantInfoVO; import com.jsowell.thirdparty.lianlian.domain.*; import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO; +import com.jsowell.thirdparty.platform.domain.ChargeOrderInfo; +import com.jsowell.thirdparty.platform.domain.SupChargeDetails; import com.jsowell.thirdparty.platform.domain.SupStationInfo; import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory; import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService; @@ -421,6 +429,64 @@ public class HeNanPlatformServiceImpl implements ThirdPartyPlatformService { return resultMap; } + /** + * 推送订单 notification_charge_order_info + * @param orderCode + * @param secretInfoVO + * @return + */ + @Override + public String notificationChargeOrderInfo(String orderCode, ThirdPartySecretInfoVO secretInfoVO) { + // 根据订单号查询出信息 + OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); + if (orderBasicInfo == null) { + return null; + } + + String operatorId = Constants.OPERATORID_JIANG_SU; + String operatorSecret = secretInfoVO.getTheirOperatorSecret(); + String signSecret = secretInfoVO.getTheirSigSecret(); + String dataSecret = secretInfoVO.getTheirDataSecret(); + String dataSecretIv = secretInfoVO.getTheirDataSecretIv(); + String urlAddress = secretInfoVO.getTheirUrlPrefix(); + + // 推送地址 + String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_CHARGE_ORDER_INFO.getValue(); + + // 根据订单号查询订单详情 + OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); + if (orderDetail == null) { + return null; + } + // 拼装订单编号 + String startChargeSeq = Constants.OPERATORID_JIANG_SU + orderCode + DateUtils.dateTimeNow(DateUtils.YYMMDD); + com.jsowell.thirdparty.platform.common.ChargeOrderInfo chargeOrderInfo = com.jsowell.thirdparty.platform.common.ChargeOrderInfo.builder() + .startChargeSeq(startChargeSeq) + // .startChargeType() + .connectorId(orderBasicInfo.getPileConnectorCode()) + .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())) + .endTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime())) + .totalPower(orderDetail.getTotalUsedElectricity()) + .totalElecMoney(orderDetail.getTotalElectricityAmount()) + .totalSeviceMoney(orderDetail.getTotalServiceAmount()) + .elecMoney(orderDetail.getTotalElectricityAmount()) + .totalMoney(orderDetail.getTotalOrderAmount()) + .stopReason(2) + + .build(); + + // 获取令牌 + String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); + if (StringUtils.isBlank(token)) { + return null; + } + + // 调用平台接口 + String jsonString = JSON.toJSONString(chargeOrderInfo); + String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret); + return result; + } + /** * 查询河南省平台密钥信息 * @return diff --git a/jsowell-ui/src/views/financial/financeDetail-旧.vue b/jsowell-ui/src/views/financial/financeDetail-旧.vue new file mode 100644 index 000000000..e84273de2 --- /dev/null +++ b/jsowell-ui/src/views/financial/financeDetail-旧.vue @@ -0,0 +1,554 @@ + + + + diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue index e84273de2..7ed42bcb2 100644 --- a/jsowell-ui/src/views/financial/financeDetail.vue +++ b/jsowell-ui/src/views/financial/financeDetail.vue @@ -1,201 +1,150 @@ @@ -228,7 +198,7 @@ import { withdraw, selectAdapayMember, queryAdapayAccountBalance, - WithdrawalHistory + WithdrawalHistory, } from "@/api/adapayMember/adapayMember"; import { getOrderReportDetail } from "@/api/order/order"; import { getDay } from "@/utils/common"; @@ -286,7 +256,25 @@ export default { pageSize: 10, }, payoutInformation: [], - getTotal: 0 + getTotal: 0, + profitSharing: false, + temporary: [ + { + tradeDate: "2025-02-18", + billStatus: "提现申请中", + receivableAmount: "313.92", + withdrawAbleAmount: "1371.99", + feeAmount: "1.83", + aaa: "1059.92", + bbb: "1059.92", + withdrawCode: "0021110738083352290123776", + applicationTime: "2025-02-19 08:31:00", + }, + ], + sharingType: [ + { label: "直接分润", value: "1" }, + { label: "间接分润", value: "2" }, + ], }; }, methods: { @@ -375,8 +363,7 @@ export default { console.log("getMerchantOrderReport", response); if (response.data) { this.merchantOrderReport = response.data.merchantOrderReport; - if (response.data.pageResponse === null) - return (this.reportList = []); + if (response.data.pageResponse === null) return (this.reportList = []); this.reportList = response.data.pageResponse.list; this.reportTotal = response.data.pageResponse.total; } else { @@ -395,15 +382,14 @@ export default { console.log("点击提交按钮之前执行 params", params); withdraw(params).then((response) => { console.log("res 提现金额", response); - if (response.code !== 200) - return this.$modal.msgError(response.msg); + if (response.code !== 200) return this.$modal.msgError(response.msg); this.$modal.msgSuccess("操作成功"); // 重新查询当前 显示的可提现金额 this.getAdapayBalance(); }); this.dialogVisible = false; }) - .catch((_) => { }); + .catch((_) => {}); }, // 点击提交按钮 submit() { @@ -446,17 +432,28 @@ export default { }, already() { this.recordDialog = true; - this.getHistory() + this.getHistory(); }, //提现记录 getHistory() { - console.log('etWithdrawnParameters', this.getWithdrawnParameters); + console.log("etWithdrawnParameters", this.getWithdrawnParameters); WithdrawalHistory(this.getWithdrawnParameters).then((response) => { console.log("提现记录", response); this.payoutInformation = response.data.list; this.getTotal = response.data.total; }); - } + }, + // 分润流水弹框 + getProfitSharing(scope) { + console.log("点击分润流水", scope); + this.profitSharing = true; + }, + // 关闭分润流水弹框 + turnOffProfitSharing() { + this.profitSharing = false; + this.orderList = []; + this.queryParams = {}; + }, }, created() { this.defaultDate(); @@ -467,88 +464,69 @@ export default { diff --git a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue index fecccab5f..1a7fcd87e 100644 --- a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue +++ b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue @@ -26,6 +26,11 @@ + + +