From 810c4381f4bbdc6d5ff42921be414dd030826af0 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 24 Apr 2023 16:25:17 +0800 Subject: [PATCH 01/34] update --- .../netty/handler/TransactionRecordsRequestHandler.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 877625112..b5c50dc7e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -9,7 +9,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.ykc.CardStatusEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum; -import com.jsowell.common.enums.ykc.StartModeEnum; import com.jsowell.common.enums.ykc.YKCChargingStopReasonEnum; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil; @@ -573,10 +572,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { } private void processOrder(TransactionRecordsData data) { - // String orderCode = data.getOrderCode(); String transactionCode = data.getTransactionCode(); - // 根据订单号查询订单信息 - // OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); // 根据交易流水号查询订单信息 OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); if (orderBasicInfo != null) { From c584ff91f44b32b54ca212a75f610d8b45b6de57 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 25 Apr 2023 11:20:43 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E8=81=94=E8=81=94=E5=B9=B3=E5=8F=B0=20?= =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E5=85=85=E7=94=B5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/lianlian/LianLianController.java | 22 +++ .../jsowell/pile/dto/QueryStartChargeDTO.java | 37 ++++ .../thirdparty/service/LianLianService.java | 7 + .../service/impl/LianLianServiceImpl.java | 82 ++++++++- .../thirdparty/vo/QueryChargingStatusVO.java | 168 ++++++++++++++++++ 5 files changed, 312 insertions(+), 4 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryChargingStatusVO.java diff --git a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java index a0c34254b..74b07e860 100644 --- a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java @@ -10,6 +10,7 @@ import com.jsowell.thirdparty.domain.StationStatsInfo; import com.jsowell.thirdparty.service.LianLianService; import com.jsowell.thirdparty.vo.EquipmentAuthVO; import com.jsowell.thirdparty.vo.LianLianPageResponse; +import com.jsowell.thirdparty.vo.QueryChargingStatusVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -114,4 +115,25 @@ public class LianLianController extends BaseController { logger.info("联联平台请求设备认证 result :{}", response); return response; } + + + /** + * 查询充电状态 + * @param startChargeSeq + * @return + */ + @GetMapping("/query_equip_charge_status/{startChargeSeq}") + public RestApiResponse query_equip_charge_status(@PathVariable("startChargeSeq") String startChargeSeq) { + logger.info("联联平台查询充电状态 params :{}", startChargeSeq); + RestApiResponse response; + try { + QueryChargingStatusVO vo = lianLianService.query_equip_charge_status(startChargeSeq); + response = new RestApiResponse<>(vo); + } catch (Exception e) { + logger.error("联联平台查询充电状态 error", e); + response = new RestApiResponse<>(e); + } + logger.info("联联平台查询充电状态 result :{}", response); + return response; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java new file mode 100644 index 000000000..9b0a236f1 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java @@ -0,0 +1,37 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +/** + * 请求启动充电DTO + * + * @author JS-ZZA + * @date 2023/4/24 14:04 + */ +@Data +public class QueryStartChargeDTO { + /** + * 充电订单号 + */ + private String StartChargeSeq; + + /** + * 充电设备接口编码 + */ + private String ConnectorID; + + /** + * 二维码 + */ + private String QRCode; + + /** + * 用户手机号 + */ + private String PhoneNum; + + /** + * 车牌号 + */ + private String PlateNum; +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java index b249c3670..a057a2e37 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java @@ -5,6 +5,7 @@ import com.jsowell.thirdparty.domain.StationStatsInfo; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.thirdparty.vo.EquipmentAuthVO; import com.jsowell.thirdparty.vo.LianLianPageResponse; +import com.jsowell.thirdparty.vo.QueryChargingStatusVO; import java.util.List; @@ -47,4 +48,10 @@ public interface LianLianService { * @return */ EquipmentAuthVO query_equip_auth(QueryEquipmentDTO dto); + + /** + * 查询充电状态 + * @param startChargeSeq + */ + QueryChargingStatusVO query_equip_charge_status(String startChargeSeq); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java index c16df19ce..05a40efc9 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java @@ -4,16 +4,16 @@ import cn.hutool.core.util.PageUtil; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; +import com.jsowell.common.core.redis.RedisCache; +import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.domain.OrderBasicInfo; -import com.jsowell.pile.domain.PileBasicInfo; -import com.jsowell.pile.domain.PileConnectorInfo; -import com.jsowell.pile.domain.PileStationInfo; +import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.QueryEquipmentDTO; +import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileBasicInfoService; @@ -39,6 +39,7 @@ import com.jsowell.thirdparty.domain.StationStatusInfo; import com.jsowell.thirdparty.service.LianLianService; import com.jsowell.thirdparty.vo.EquipmentAuthVO; import com.jsowell.thirdparty.vo.LianLianPageResponse; +import com.jsowell.thirdparty.vo.QueryChargingStatusVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -70,6 +71,8 @@ public class LianLianServiceImpl implements LianLianService { @Autowired private IOrderBasicInfoService orderBasicInfoService; + @Autowired + private RedisCache redisCache; @Override public void pushMerchantInfo(Long merchantId) { @@ -352,6 +355,77 @@ public class LianLianServiceImpl implements LianLianService { return vo; } + + /** + * 请求启动充电 + * @param dto + */ + public void query_start_charge(QueryStartChargeDTO dto) { + // 通过传过来的订单号和枪口号生成订单 + String startChargeSeq = dto.getStartChargeSeq(); + String pileConnectorCode = dto.getConnectorID(); + + + // 拼装对应的数据并返回 + + // TODO 推送启动充电结果(调用接口 notification_start_charge_result) + } + + + /** + * 查询充电状态 + * @param startChargeSeq + * @return + */ + public QueryChargingStatusVO query_equip_charge_status(String startChargeSeq) { + // 通过订单号查询订单信息 + OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(startChargeSeq); + OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(startChargeSeq); + // 通过订单号查询实时数据 + if (orderInfo == null || orderDetail == null) { + throw new BusinessException("", ""); + } + List realTimeData = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode()); + RealTimeMonitorData data = realTimeData.get(0); + String orderStatus = orderInfo.getOrderStatus(); + if (StringUtils.equals(orderStatus, OrderStatusEnum.IN_THE_CHARGING.getValue())) { + // 充电中 + orderStatus = "2"; + }if (StringUtils.equals(orderStatus, OrderStatusEnum.ORDER_COMPLETE.getValue())) { + // 充电完成 + orderStatus = "4"; + }else { + // 直接给 5-未知 + orderStatus = "5"; + } + // 拼装联联平台数据 + QueryChargingStatusVO vo = QueryChargingStatusVO.builder() + .StartChargeSeq(startChargeSeq) // 订单号 + .StartChargeSeqStat(Integer.parseInt(orderStatus)) // 订单状态 + .ConnectorID(orderInfo.getPileConnectorCode()) // 枪口编码 + .ConnectorStatus(Integer.parseInt(data.getConnectorStatus())) // 枪口状态 + .CurrentA(new BigDecimal(data.getOutputCurrent())) // 电流 + .VoltageA(new BigDecimal(data.getOutputVoltage())) // 电压 + .Soc(new BigDecimal(data.getSOC())) + .StartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime())) // 开始时间 + .EndTime(DateUtils.getTime()) // 本次采样时间 + .TotalPower(new BigDecimal(data.getChargingDegree())) // 累计充电量 + // .ElecMoney(new BigDecimal()) // 累计电费 + // .SeviceMoney(new BigDecimal()) // 累计服务费 + .TotalMoney(new BigDecimal(data.getChargingAmount())) // 已充金额 + + .build(); + + + return vo; + } + + + + public void query_stop_charge(QueryStartChargeDTO dto) { + + } + /** * 获取桩列表信息 * @param pileStationInfo diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryChargingStatusVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryChargingStatusVO.java new file mode 100644 index 000000000..3a1aef286 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryChargingStatusVO.java @@ -0,0 +1,168 @@ +package com.jsowell.thirdparty.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 查询充电状态VO + * + * @author JS-ZZA + * @date 2023/4/24 14:33 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class QueryChargingStatusVO { + + /** + * 充电订单号 + */ + private String StartChargeSeq; + + /** + * 充电订单状态 + */ + private int StartChargeSeqStat; + + /** + * 充电设备接口编码 + */ + private String ConnectorID; + + /** + * 充电设备接口状态 + */ + private int ConnectorStatus; + + /** + * 车辆识别码 + */ + private String Vin; + + /** + * A 相电流 + */ + private BigDecimal CurrentA; + + /** + * B 相电流 + */ + private BigDecimal CurrentB; + + /** + * C 相电流 + */ + private BigDecimal CurrentC; + + /** + * A 相电压 + */ + private BigDecimal VoltageA; + + /** + * B 相电压 + */ + private BigDecimal VoltageB; + + /** + * C 相电压 + */ + private BigDecimal VoltageC; + + /** + * 电池剩余电量 + */ + private BigDecimal Soc; + + /** + * 开始充电时间 + */ + private String StartTime; + + /** + * 本次采样时间 + */ + private String EndTime; + + /** + * 累计充电量 + */ + private BigDecimal TotalPower; + + /** + * 累计电费 + */ + private BigDecimal ElecMoney; + + /** + * 累计服务费 + */ + private BigDecimal SeviceMoney; + + /** + * 累计总金额 + */ + private BigDecimal TotalMoney; + + /** + * 是否可申请停车费减免 + */ + private int ParkingFeeDiscount; + + /** + * 时段数 N 范围：0～32 + */ + private int SumPeriod; + + /** + * 充电明细信息 + */ + private List ChargeDetails; + + /** + * 充电明细信息体 + */ + @Data + public static class ChargeDetail { + /** + * 开始时间 + */ + private String DetailStartTime; + + /** + * 结束时间 + */ + private String DetailEndTime; + + /** + * 时段电价 + */ + private BigDecimal ElecPrice; + + /** + * 时段服务费价格 + */ + private BigDecimal SevicePrice; + + /** + * 时段充电量 + */ + private BigDecimal DetailPower; + + /** + * 时段电费 + */ + private BigDecimal DetailElecMoney; + + /** + * 时段服务费 + */ + private BigDecimal DetailSeviceMoney; + } +} From ea34f518492b067dbd4c7ca4460ddadb218a6b34 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 25 Apr 2023 14:03:09 +0800 Subject: [PATCH 03/34] =?UTF-8?q?add=20=20=E8=81=94=E8=81=94=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E8=AF=B7=E6=B1=82=E5=81=9C=E6=AD=A2=E5=85=85=E7=94=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/lianlian/LianLianController.java | 24 +++++++++ .../jsowell/pile/dto/QueryStartChargeDTO.java | 6 +++ jsowell-thirdparty/pom.xml | 4 ++ .../thirdparty/service/LianLianService.java | 9 ++++ .../service/impl/LianLianServiceImpl.java | 51 ++++++++++++++++++- .../thirdparty/vo/QueryStopChargeVO.java | 38 ++++++++++++++ 6 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStopChargeVO.java diff --git a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java index 74b07e860..d4b48c8db 100644 --- a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java @@ -5,12 +5,14 @@ import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.QueryEquipmentDTO; +import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.thirdparty.domain.StationStatsInfo; import com.jsowell.thirdparty.service.LianLianService; import com.jsowell.thirdparty.vo.EquipmentAuthVO; import com.jsowell.thirdparty.vo.LianLianPageResponse; import com.jsowell.thirdparty.vo.QueryChargingStatusVO; +import com.jsowell.thirdparty.vo.QueryStopChargeVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -136,4 +138,26 @@ public class LianLianController extends BaseController { logger.info("联联平台查询充电状态 result :{}", response); return response; } + + /** + * 请求停止充电 + * @param dto + * @return + */ + @PostMapping("/query_stop_charge") + public RestApiResponse query_stop_charge(@RequestBody QueryStartChargeDTO dto) { + logger.info("联联平台请求停止充电 params :{}", JSONObject.toJSONString(dto)); + RestApiResponse response; + try { + QueryStopChargeVO queryStopChargeVO = lianLianService.query_stop_charge(dto); + response = new RestApiResponse<>(queryStopChargeVO); + } catch (Exception e) { + logger.error("联联平台请求停止充电 error", e); + response = new RestApiResponse<>(e); + } + logger.info("联联平台请求停止充电 result :{}", response); + return response; + } + + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java index 9b0a236f1..937582e29 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java @@ -1,5 +1,6 @@ package com.jsowell.pile.dto; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; /** @@ -13,25 +14,30 @@ public class QueryStartChargeDTO { /** * 充电订单号 */ + @JsonProperty(value = "StartChargeSeq") private String StartChargeSeq; /** * 充电设备接口编码 */ + @JsonProperty(value = "ConnectorID") private String ConnectorID; /** * 二维码 */ + @JsonProperty(value = "QRCode") private String QRCode; /** * 用户手机号 */ + @JsonProperty(value = "PhoneNum") private String PhoneNum; /** * 车牌号 */ + @JsonProperty(value = "PlateNum") private String PlateNum; } diff --git a/jsowell-thirdparty/pom.xml b/jsowell-thirdparty/pom.xml index ff891a05d..787b2de66 100644 --- a/jsowell-thirdparty/pom.xml +++ b/jsowell-thirdparty/pom.xml @@ -22,6 +22,10 @@ org.projectlombok lombok + + com.jsowell + jsowell-netty + diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java index a057a2e37..ac0ed895f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/LianLianService.java @@ -1,11 +1,13 @@ package com.jsowell.thirdparty.service; import com.jsowell.pile.dto.QueryEquipmentDTO; +import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.thirdparty.domain.StationStatsInfo; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.thirdparty.vo.EquipmentAuthVO; import com.jsowell.thirdparty.vo.LianLianPageResponse; import com.jsowell.thirdparty.vo.QueryChargingStatusVO; +import com.jsowell.thirdparty.vo.QueryStopChargeVO; import java.util.List; @@ -54,4 +56,11 @@ public interface LianLianService { * @param startChargeSeq */ QueryChargingStatusVO query_equip_charge_status(String startChargeSeq); + + /** + * 请求停止充电 + * @param dto + * @return + */ + QueryStopChargeVO query_stop_charge(QueryStartChargeDTO dto); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java index 05a40efc9..a24840e63 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java @@ -11,6 +11,8 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; +import com.jsowell.netty.command.ykc.StopChargingCommand; +import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.QueryEquipmentDTO; import com.jsowell.pile.dto.QueryStartChargeDTO; @@ -40,6 +42,7 @@ import com.jsowell.thirdparty.service.LianLianService; import com.jsowell.thirdparty.vo.EquipmentAuthVO; import com.jsowell.thirdparty.vo.LianLianPageResponse; import com.jsowell.thirdparty.vo.QueryChargingStatusVO; +import com.jsowell.thirdparty.vo.QueryStopChargeVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -72,7 +75,7 @@ public class LianLianServiceImpl implements LianLianService { private IOrderBasicInfoService orderBasicInfoService; @Autowired - private RedisCache redisCache; + private YKCPushCommandService ykcPushCommandService; @Override public void pushMerchantInfo(Long merchantId) { @@ -421,11 +424,55 @@ public class LianLianServiceImpl implements LianLianService { } + /** + * 请求停止充电 + * @param dto + * @return + */ + public QueryStopChargeVO query_stop_charge(QueryStartChargeDTO dto) { + QueryStopChargeVO vo = new QueryStopChargeVO(); - public void query_stop_charge(QueryStartChargeDTO dto) { + String orderCode = dto.getStartChargeSeq(); + + // 根据订单号查询订单信息 + OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); + if (orderInfo == null) { + throw new BusinessException("", ""); + } + // 若状态为充电中，则发送停机指令 + if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderInfo.getOrderStatus())) { + // 充电中 + StopChargingCommand command = StopChargingCommand.builder() + .pileSn(orderInfo.getPileSn()) + .connectorCode(orderInfo.getConnectorCode()) + .build(); + ykcPushCommandService.pushStopChargingCommand(command); + vo.setStartChargeSeq(orderCode); + vo.setStartChargeSeqStat(3); // 停止中 + } + return vo; + } + + // TODO 推送停止充电结果 notification_stop_charge_result + + // TODO 推送充电订单信息 notification_charge_order_info + + // TODO 推送订单对账结果信息 check_charge_orders + + /** + * TODO 请求打印充电小票 + */ + public void query_print_parking_ticket() { } + + // TODO 推送订单结算信息 notification_order_settlement_info + + // TODO 查询订单结算信息 query_order_settlement_info + + + /** * 获取桩列表信息 * @param pileStationInfo diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStopChargeVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStopChargeVO.java new file mode 100644 index 000000000..f403f10c8 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/vo/QueryStopChargeVO.java @@ -0,0 +1,38 @@ +package com.jsowell.thirdparty.vo; + +import lombok.Data; + +/** + * 请求停止充电 + * + * @author JS-ZZA + * @date 2023/4/25 11:21 + */ +@Data +public class QueryStopChargeVO { + + /** + * 充电订单号 + */ + private String StartChargeSeq; + + /** + * 充电订单状态 1、启动中 ；2、充电中；3、停止中；4、已结束；5、未知 + */ + private int StartChargeSeqStat; + + /** + * 成功状态 0:成功； 1:失败 + */ + private int SuccStat; + + /** + * 失败原因 + * 0:无； + * 1:此设备不存在； + * 2:此设备离线： + * 3:设备已停止充电； + * 4～99:自定义 + */ + private int FailReason; +} From c5b056b5a4901a6e921b9ca7d0e88d5b084a4921 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 25 Apr 2023 15:00:08 +0800 Subject: [PATCH 04/34] update --- .../jsowell/thirdparty/service/impl/LianLianServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java index a24840e63..c6f7b30af 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java @@ -365,7 +365,7 @@ public class LianLianServiceImpl implements LianLianService { */ public void query_start_charge(QueryStartChargeDTO dto) { // 通过传过来的订单号和枪口号生成订单 - String startChargeSeq = dto.getStartChargeSeq(); + String orderCode = dto.getStartChargeSeq(); String pileConnectorCode = dto.getConnectorID(); @@ -448,7 +448,7 @@ public class LianLianServiceImpl implements LianLianService { .build(); ykcPushCommandService.pushStopChargingCommand(command); vo.setStartChargeSeq(orderCode); - vo.setStartChargeSeqStat(3); // 停止中 + vo.setStartChargeSeqStat(3); // 3-停止中 } return vo; } From ea9974862eaea76d01ab14a61da7338f8b18c091 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 28 Apr 2023 10:16:19 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/common/CommonController.java | 8 +++++++- .../src/components/MapContainer/MapContainer.vue | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java index cf3052cf3..c5fdf6792 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java @@ -163,10 +163,16 @@ public class CommonController { } } + /** + * 上传到阿里云oss + * http://localhost:8080/common/uploadOSS + * @param file + * @return + * @throws Exception + */ @CrossOrigin @PostMapping("/uploadOSS") public AjaxResult uploadFileOSS(MultipartFile file) throws Exception { - System.out.println(file); try { String url = AliyunOssUploadUtils.uploadFile(file); AjaxResult ajax = AjaxResult.success(); diff --git a/jsowell-ui/src/components/MapContainer/MapContainer.vue b/jsowell-ui/src/components/MapContainer/MapContainer.vue index 82c0839c5..1b810f6f6 100644 --- a/jsowell-ui/src/components/MapContainer/MapContainer.vue +++ b/jsowell-ui/src/components/MapContainer/MapContainer.vue @@ -19,12 +19,13 @@
上传图片
- @@ -49,6 +50,7 @@ import AMapLoader from "@amap/amap-jsapi-loader"; import {getStation} from "@/api/pile/station.js"; import bus from "@/bus/bus"; +import {getToken} from "@/utils/auth"; window._AMapSecurityConfig = { securityJsCode: "829b6b73f84682c2eb982eaa47a745b8", @@ -75,9 +77,17 @@ export default { placeSearch: "", stationId: this.$route.params.id, avatar: "", + headers: { + Authorization: "Bearer " + getToken() + }, + imageUrl: null }; }, methods: { + handleSuccess(res, file) { + this.imageUrl = URL.createObjectURL(file.raw); + console.log("图片上传成功 url：", this.imageUrl); + }, handleRemove(file, fileList) { console.log(file, fileList); }, From d2fd5098b9805adf7485dba03f785e7348e21faa Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 28 Apr 2023 11:36:02 +0800 Subject: [PATCH 06/34] =?UTF-8?q?update=20=E5=9B=BE=E7=89=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/web/controller/common/CommonController.java | 1 + jsowell-admin/src/main/resources/application-dev.yml | 2 +- jsowell-admin/src/main/resources/application-prd.yml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java index c5fdf6792..9f60fbacd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java @@ -180,6 +180,7 @@ public class CommonController { ajax.put("fileName", FileUtils.getName(url)); ajax.put("newFileName", FileUtils.getName(url)); ajax.put("originalFilename", file.getOriginalFilename()); + log.info("图片上传成功 url:{}", url); return ajax; }catch (Exception e){ return AjaxResult.error(e.getMessage()); diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index e473ec0c4..7b9372a13 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -116,7 +116,7 @@ aliyunoss: # bucket下文件夹的路径 filehost: img # 访问域名 - url: ydc-oss-dev.oss-cn-shanghai.aliyuncs.com + url: https://ydc-oss-dev.oss-cn-shanghai.aliyuncs.com ########################微信支付参数####################################### diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 351fbc7a5..b1f4a584c 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -114,11 +114,11 @@ aliyunoss: # AccessKey 秘钥 accessKeySecret: tsxMyujk6KY9h0e4Bx0D7ld16PBUyW # bucket名称 - bucketName: ydc-oss-dev + bucketName: ydc-oss-prd # bucket下文件夹的路径 filehost: img # 访问域名 - url: ydc-oss-dev.oss-cn-shanghai.aliyuncs.com + url: https://ydc-oss-prd.oss-cn-shanghai.aliyuncs.com ########################微信支付参数####################################### #微信商户号 From b9f29d5179d49ab29ed9066c1d03b6db90ec3184 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 28 Apr 2023 14:35:35 +0800 Subject: [PATCH 07/34] =?UTF-8?q?update=20=E5=9B=BE=E7=89=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-dev.yml | 2 +- jsowell-admin/src/main/resources/application-prd.yml | 2 +- .../jsowell/pile/service/impl/PileStationInfoServiceImpl.java | 4 ++++ .../src/main/java/com/jsowell/pile/vo/web/PileStationVO.java | 2 ++ jsowell-ui/src/components/MapContainer/MapContainer.vue | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 7b9372a13..9e1bf715f 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -106,7 +106,7 @@ minio: aliyunoss: # 地域节点 - endpoint: oss-cn-shanghai.aliyuncs.com + endpoint: http://oss-cn-shanghai.aliyuncs.com # AccessKey accessKeyId: LTAI5tBgCN4xuxQF1HV9rf7t # AccessKey 秘钥 diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index b1f4a584c..01a297b48 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -108,7 +108,7 @@ minio: aliyunoss: # 地域节点 - endpoint: oss-cn-shanghai.aliyuncs.com + endpoint: http://oss-cn-shanghai.aliyuncs.com # AccessKey accessKeyId: LTAI5tBgCN4xuxQF1HV9rf7t # AccessKey 秘钥 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index d3d8227da..92850c7ac 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -129,6 +129,10 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { // vo.setOrganizationCode(pileStationInfo.getor); vo.setPublicFlag(pileStationInfo.getPublicFlag()); vo.setOpenFlag(pileStationInfo.getOpenFlag()); + if (StringUtils.isNotBlank(pileStationInfo.getPictures())) { + vo.setPictures(pileStationInfo.getPictures()); + vo.setPictureList(Lists.newArrayList(pileStationInfo.getPictures().split(","))); + } } return vo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java index 5459dfda1..7eb515ac7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java @@ -142,6 +142,8 @@ public class PileStationVO { */ private String pictures; + private List pictureList; + /** * 电费 */ diff --git a/jsowell-ui/src/components/MapContainer/MapContainer.vue b/jsowell-ui/src/components/MapContainer/MapContainer.vue index 1b810f6f6..2c8a8100e 100644 --- a/jsowell-ui/src/components/MapContainer/MapContainer.vue +++ b/jsowell-ui/src/components/MapContainer/MapContainer.vue @@ -87,6 +87,7 @@ export default { handleSuccess(res, file) { this.imageUrl = URL.createObjectURL(file.raw); console.log("图片上传成功 url：", this.imageUrl); + console.log("图片上传成功 res：", res); }, handleRemove(file, fileList) { console.log(file, fileList); From 61f310382475c98444e763320a58808de9e9b895 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 28 Apr 2023 15:04:45 +0800 Subject: [PATCH 08/34] =?UTF-8?q?update=20=E5=9B=BE=E7=89=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/MapContainer/MapContainer.vue | 34 ++------------- .../pile/station/components/SiteInfo.vue | 41 +++++++++++++++++-- 2 files changed, 41 insertions(+), 34 deletions(-) diff --git a/jsowell-ui/src/components/MapContainer/MapContainer.vue b/jsowell-ui/src/components/MapContainer/MapContainer.vue index 2c8a8100e..9c158b16e 100644 --- a/jsowell-ui/src/components/MapContainer/MapContainer.vue +++ b/jsowell-ui/src/components/MapContainer/MapContainer.vue @@ -17,20 +17,7 @@
-
上传图片
- - - - - - + @@ -77,26 +64,11 @@ export default { placeSearch: "", stationId: this.$route.params.id, avatar: "", - headers: { - Authorization: "Bearer " + getToken() - }, - imageUrl: null + }; }, methods: { - handleSuccess(res, file) { - this.imageUrl = URL.createObjectURL(file.raw); - console.log("图片上传成功 url：", this.imageUrl); - console.log("图片上传成功 res：", res); - }, - handleRemove(file, fileList) { - console.log(file, fileList); - }, - handlePictureCardPreview(file) { - this.dialogImageUrl = file.url; - console.log(this.dialogImageUrl) - this.dialogVisible = true; - }, + // 点击搜索按钮 send() { this.searchPlaceInput = this.inputObject.userInput; diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue index 9594b2e92..49589df48 100644 --- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue +++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue @@ -1,5 +1,19 @@ - + From 8a775b93c6ffa18d3108bf5a1edbb122b8cbc632 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 4 May 2023 15:20:33 +0800 Subject: [PATCH 17/34] =?UTF-8?q?update=20=E6=B8=85=E9=99=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderBasicInfoServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 c5998c20e..0b5b767ea 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 @@ -37,7 +37,13 @@ import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.WxpayCallbackRecord; import com.jsowell.pile.domain.WxpayRefundCallback; -import com.jsowell.pile.dto.*; +import com.jsowell.pile.dto.GenerateOrderDTO; +import com.jsowell.pile.dto.IndexQueryDTO; +import com.jsowell.pile.dto.QueryOrderDTO; +import com.jsowell.pile.dto.QueryPersonPileDTO; +import com.jsowell.pile.dto.QueryStartChargeDTO; +import com.jsowell.pile.dto.QueryStationInfoDTO; +import com.jsowell.pile.dto.RefundableWxPayOrderData; import com.jsowell.pile.mapper.OrderBasicInfoMapper; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IOrderAbnormalRecordService; @@ -84,6 +90,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; @@ -377,11 +384,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { public int updateOrderBasicInfo(OrderBasicInfo orderBasicInfo) { // 清缓存 this.cleanCacheByOrderCode(orderBasicInfo.getOrderCode(), orderBasicInfo.getTransactionCode()); - return orderBasicInfoMapper.updateOrderBasicInfo(orderBasicInfo); + int i = orderBasicInfoMapper.updateOrderBasicInfo(orderBasicInfo); + CompletableFuture.runAsync(() -> this.cleanCacheByOrderCode(orderBasicInfo.getOrderCode(), orderBasicInfo.getTransactionCode())); + return i; } @Override public void cleanCacheByOrderCode(String orderCode, String transactionCode) { + logger.debug("清除订单缓存 orderCode:{}, transactionCode:{}", orderCode, transactionCode); List keys = Lists.newArrayList(); if (StringUtils.isNotBlank(orderCode)) { keys.add(CacheConstants.GET_ORDER_INFO_BY_ORDER_CODE + orderCode); @@ -982,7 +992,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (StringUtils.isBlank(transactionCode)) { return resultList; } - logger.info("transactionCode:{}", transactionCode); + // logger.info("transactionCode:{}", transactionCode); String pileConnectorCode = transactionCode.substring(0, 16); String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode; // 拿到所有数据 From 6d5e2aabfdb676a8f66387ff3fad871de31eb0f9 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 4 May 2023 15:28:05 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=80=89=E6=8B=A9?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/order/order/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index 96ec64783..4b22d9bd4 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -6,6 +6,7 @@ v-model="queryParams.stationId" placeholder="请选择站点" clearable + filterable style="width: 140px" > Date: Thu, 4 May 2023 15:30:07 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=80=89=E6=8B=A9?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/pile/basic/index.vue | 2 +- jsowell-ui/src/views/pile/station/pileList.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jsowell-ui/src/views/pile/basic/index.vue b/jsowell-ui/src/views/pile/basic/index.vue index 9a4d8a6ac..724d46220 100644 --- a/jsowell-ui/src/views/pile/basic/index.vue +++ b/jsowell-ui/src/views/pile/basic/index.vue @@ -197,7 +197,7 @@ - + Date: Fri, 5 May 2023 11:21:31 +0800 Subject: [PATCH 20/34] =?UTF-8?q?update=20=E5=BF=AB=E9=80=9F=E5=BB=BA?= =?UTF-8?q?=E7=AB=99=EF=BC=8C=E5=8A=A0=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileStationInfoServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 92850c7ac..a346cc404 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -8,7 +8,10 @@ import com.jsowell.common.core.domain.entity.SysDept; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.redis.RedisCache; -import com.jsowell.common.util.*; +import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.DistanceUtils; +import com.jsowell.common.util.SecurityUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.ip.AddressUtils; import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.dto.FastCreateStationDTO; @@ -29,6 +32,8 @@ import com.jsowell.system.service.SysDeptService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.List; @@ -197,6 +202,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { * @return */ @Override + @Transactional(readOnly = false, propagation = Propagation.REQUIRED) public int fastCreateStation(FastCreateStationDTO dto) { MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(dto.getMerchantId()); if (merchantInfo == null) { @@ -233,8 +239,6 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { } pileStationInfo.setCreateBy(SecurityUtils.getUsername()); int i = pileStationInfoMapper.insertPileStationInfo(pileStationInfo); - - return i; } From c2e5784caa774f85beca897700f14f36219edb73 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 5 May 2023 16:46:43 +0800 Subject: [PATCH 21/34] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20new=E6=94=B6=E8=B4=B9=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 36 ++++++++++++++++++ .../pile/vo/web/OrderDetailInfoVO.java | 13 ++++++- .../src/views/order/order/orderDetail.vue | 38 +++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) 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 e0af62f28..7b239062d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -15,6 +15,7 @@ import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.InvoiceRecordEnum; import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.ykc.ActionTypeEnum; +import com.jsowell.common.enums.ykc.BillingTimeEnum; import com.jsowell.common.enums.ykc.OrderPayModeEnum; import com.jsowell.common.enums.ykc.OrderPayRecordEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum; @@ -796,6 +797,41 @@ public class OrderService { OrderDetailInfoVO.BillingDetails billingDetails = new OrderDetailInfoVO.BillingDetails(); BeanUtils.copyBeanProp(billingDetails, orderDetail); vo.setBillingDetails(billingDetails); + + // new 收费明细 + OrderDetailInfoVO.ChargeDetail sharp = new OrderDetailInfoVO.ChargeDetail(); + sharp.setPeriodType(BillingTimeEnum.SHARP.getLabel()); + sharp.setElectricityPrice(orderDetail.getSharpElectricityPrice()); + sharp.setServicePrice(orderDetail.getSharpServicePrice()); + sharp.setUsedElectricity(orderDetail.getSharpUsedElectricity()); + sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity())); + sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity())); + + OrderDetailInfoVO.ChargeDetail peak = new OrderDetailInfoVO.ChargeDetail(); + peak.setPeriodType(BillingTimeEnum.PEAK.getLabel()); + peak.setElectricityPrice(orderDetail.getPeakElectricityPrice()); + peak.setServicePrice(orderDetail.getPeakServicePrice()); + peak.setUsedElectricity(orderDetail.getPeakUsedElectricity()); + peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity())); + peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity())); + + OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail(); + flat.setPeriodType(BillingTimeEnum.PEAK.getLabel()); + flat.setElectricityPrice(orderDetail.getFlatElectricityPrice()); + flat.setServicePrice(orderDetail.getFlatServicePrice()); + flat.setUsedElectricity(orderDetail.getFlatUsedElectricity()); + flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity())); + flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity())); + + OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail(); + valley.setPeriodType(BillingTimeEnum.PEAK.getLabel()); + valley.setElectricityPrice(orderDetail.getValleyElectricityPrice()); + valley.setServicePrice(orderDetail.getValleyServicePrice()); + valley.setUsedElectricity(orderDetail.getValleyUsedElectricity()); + valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity())); + valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity())); + + vo.setChargeDetails(Lists.newArrayList(sharp, peak, flat, valley)); } // 用户信息 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java index 32fd2ec15..f131762ca 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java @@ -35,7 +35,18 @@ public class OrderDetailInfoVO { private RealTimeMonitorData lastMonitorData; - // billingDetails + // 收费明细 + private List chargeDetails; + + @Data + public static class ChargeDetail{ + private String periodType; // 时段类型 + private BigDecimal usedElectricity; // 用电量 + private BigDecimal electricityPrice; // 电费单价 + private BigDecimal servicePrice; // 服务费单价 + private BigDecimal electricityAmount; // 电费金额 + private BigDecimal serviceAmount; // 服务费金额 + } @Data public static class BillingDetails{ diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 25bb0cb28..0ed4cb331 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -117,6 +117,19 @@
+ +

收费明细new

+ + + + + + + + +
+ +

实时订单数据

@@ -225,12 +238,36 @@ export default { chargingAmount: null, chargingDegree: null, }, + tableData: [] }; }, created() { this.getOrderDetail(); }, methods: { + getSummaries(param) { + const { columns, data } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '总价'; + return; + } + const values = data.map(item => Number(item[column.property])); + if (column.property === 'usedElectricity' ||column.property ==='electricityAmount' || column.property==='serviceAmount' ) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index]; + } + }); + return sums; + }, clickManualSettlement() { this.dialogVisible = true; }, @@ -264,6 +301,7 @@ export default { console.log("this.pileIn", this.pileIn); this.orderRealTimeInfo = [data.orderRealTimeInfo]; this.orderDetail = [data.billingDetails]; + this.tableData = data.chargeDetails; this.lastMonitorData = data.lastMonitorData; }, }, From ef44523c0058a2844fa2e12003ae77cefe2c2148 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 5 May 2023 16:49:07 +0800 Subject: [PATCH 22/34] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20new=E6=94=B6=E8=B4=B9=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/order/order/orderDetail.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 0ed4cb331..9964e2e2c 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -250,7 +250,7 @@ export default { const sums = []; columns.forEach((column, index) => { if (index === 0) { - sums[index] = '总价'; + sums[index] = '合计'; return; } const values = data.map(item => Number(item[column.property])); @@ -263,7 +263,6 @@ export default { return prev; } }, 0); - sums[index]; } }); return sums; From f75e32d4f4d1b81fd1ecb0dd32f3acc7e74ae8df Mon Sep 17 00:00:00 2001 From: Lemon Date: Sat, 6 May 2023 09:20:46 +0800 Subject: [PATCH 23/34] update --- .../src/main/resources/mapper/pile/MemberBasicInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index f3f5fd8a6..170f53c5d 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -208,7 +208,7 @@ JOIN member_wallet_info t2 ON t1.member_id = t2.member_id where t1.del_flag = '0' and mobile_number like '%${mobileNumber}%' - and nick_name like '%${nickName}%' + and nick_name like '%${nickName}%' From 7b55dc7e763916be03ff200bc65ed3b30db10410 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 May 2023 15:28:16 +0800 Subject: [PATCH 24/34] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20new=E6=94=B6=E8=B4=B9=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/OrderService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 7b239062d..01728c6e1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -804,32 +804,32 @@ public class OrderService { sharp.setElectricityPrice(orderDetail.getSharpElectricityPrice()); sharp.setServicePrice(orderDetail.getSharpServicePrice()); sharp.setUsedElectricity(orderDetail.getSharpUsedElectricity()); - sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity())); - sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity())); + sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail peak = new OrderDetailInfoVO.ChargeDetail(); peak.setPeriodType(BillingTimeEnum.PEAK.getLabel()); peak.setElectricityPrice(orderDetail.getPeakElectricityPrice()); peak.setServicePrice(orderDetail.getPeakServicePrice()); peak.setUsedElectricity(orderDetail.getPeakUsedElectricity()); - peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity())); - peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity())); + peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail(); flat.setPeriodType(BillingTimeEnum.PEAK.getLabel()); flat.setElectricityPrice(orderDetail.getFlatElectricityPrice()); flat.setServicePrice(orderDetail.getFlatServicePrice()); flat.setUsedElectricity(orderDetail.getFlatUsedElectricity()); - flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity())); - flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity())); + flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail(); valley.setPeriodType(BillingTimeEnum.PEAK.getLabel()); valley.setElectricityPrice(orderDetail.getValleyElectricityPrice()); valley.setServicePrice(orderDetail.getValleyServicePrice()); valley.setUsedElectricity(orderDetail.getValleyUsedElectricity()); - valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity())); - valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity())); + valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); + valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); vo.setChargeDetails(Lists.newArrayList(sharp, peak, flat, valley)); } From 42dd503de3eea0d60a2f6ac9044f3b2d57a4a6d8 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 May 2023 15:42:20 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=9E=9A=E4=B8=BE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/common/enums/ykc/StartModeEnum.java | 2 +- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/StartModeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/StartModeEnum.java index f21a6d1e5..2dd128413 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/StartModeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/StartModeEnum.java @@ -6,7 +6,7 @@ package com.jsowell.common.enums.ykc; public enum StartModeEnum { WEB("0", "后管启动"), APP("1","用户app启动"), - CARD("2", "卡启动"), + AUTH_CARD("2", "鉴权卡启动"), OFFLINE_CARD("3", "离线卡启动"), LIAN_LIAN("4", "联联平台启动"), ; 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 0b5b767ea..f95f78efd 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 @@ -1358,7 +1358,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { .connectorCode(connectorCode) .pileConnectorCode(pileSn + connectorCode) .logicCard(pileAuthCardInfo.getLogicCard()) - .startMode(StartModeEnum.CARD.getValue()) + .startMode(StartModeEnum.AUTH_CARD.getValue()) .payStatus(Constants.ONE) .payAmount(totalAccountAmount) .payTime(new Date()) From 03db75f0bcfd4e0f47d39e49c2679b52ca118cf4 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 May 2023 15:44:31 +0800 Subject: [PATCH 26/34] update --- .../ConfirmStartChargingRequestHandler.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index dd40b9e45..72be931d8 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -16,10 +16,6 @@ import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileAuthCardService; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileBillingTemplateService; -import com.jsowell.pile.service.impl.MemberBasicInfoServiceImpl; -import com.jsowell.pile.transaction.service.TransactionService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -39,21 +35,9 @@ import java.util.Map; public class ConfirmStartChargingRequestHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REQUEST_START_CHARGING_CODE.getBytes()); - @Autowired - private MemberBasicInfoServiceImpl memberBasicInfoService; - @Autowired private IPileAuthCardService pileAuthCardService; - @Autowired - private TransactionService pileTransactionService; - - @Autowired - private IPileBasicInfoService pileBasicInfoService; - - @Autowired - private IPileBillingTemplateService pileBillingTemplateService; - @Autowired private IOrderBasicInfoService orderBasicInfoService; From 4e97caf9121334189760601e7323de1f4b302f5b Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 May 2023 16:02:25 +0800 Subject: [PATCH 27/34] =?UTF-8?q?update=20=E9=98=B2=E6=AD=A2=E4=BC=9A?= =?UTF-8?q?=E5=91=98id=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/MemberService.java | 13 ++++++++++++- .../controller/pile/MemberBasicInfoController.java | 13 ++++++------- .../resources/mapper/pile/MemberBasicInfoMapper.xml | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) 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 b5a906c94..cd8f5cde8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -121,7 +121,7 @@ public class MemberService { MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumberAndMerchantId(phoneNumber, merchantId); if (Objects.isNull(memberBasicInfo)) { // 不存在则新增数据 - String memberId = IdUtils.getMemberId(); + String memberId = generateNewMemberId(); memberBasicInfo = new MemberBasicInfo(); memberBasicInfo.setStatus(Constants.ONE); memberBasicInfo.setMemberId(memberId); @@ -149,6 +149,17 @@ public class MemberService { return memberToken; } + private String generateNewMemberId() { + while (true) { + String memberId = IdUtils.getMemberId(); + // 通过memberId查询是否已经存在 + MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId); + if (memberVO == null) { + return memberId; + } + } + } + /** * 微信一键登录 * @param dto diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index 7fd5c6d2f..bed8b952a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Locale; /** * 会员基础信息Controller @@ -91,12 +90,12 @@ public class MemberBasicInfoController extends BaseController { /** * 新增会员基础信息 */ - @PreAuthorize("@ss.hasPermi('member:info:add')") - @Log(title = "会员基础信息", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody MemberBasicInfo memberBasicInfo) { - return toAjax(memberBasicInfoService.insertMemberBasicInfo(memberBasicInfo)); - } + // @PreAuthorize("@ss.hasPermi('member:info:add')") + // @Log(title = "会员基础信息", businessType = BusinessType.INSERT) + // @PostMapping + // public AjaxResult add(@RequestBody MemberBasicInfo memberBasicInfo) { + // return toAjax(memberBasicInfoService.insertMemberBasicInfo(memberBasicInfo)); + // } /** * 修改会员基础信息 diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 170f53c5d..5f964495c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -190,7 +190,7 @@ t2.gift_balance as giftBalance FROM member_basic_info t1 - JOIN member_wallet_info t2 ON t1.member_id = t2.member_id + left JOIN member_wallet_info t2 ON t1.member_id = t2.member_id where t1.del_flag = '0' and t1.member_id = #{memberId,jdbcType=VARCHAR} From e2d7c984c4a85f1df8875701ebfe00a69e317558 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 May 2023 17:05:20 +0800 Subject: [PATCH 28/34] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E4=BC=9A?= =?UTF-8?q?=E5=91=98sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/MemberService.java | 4 ++-- .../src/main/resources/mapper/pile/MemberBasicInfoMapper.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) 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 cd8f5cde8..751e62ad1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -101,14 +101,14 @@ public class MemberService { // 校验短信验证码 两种情况不能通过校验，1-验证码错误；2-超时 验证码10分钟有效 checkVerificationCode(dto); String merchantId = ""; - return memberRegisterAndLogin(dto.getMobileNumber(), merchantId, null); + return memberRegisterAndLogin(dto.getMobileNumber(), dto.getMerchantId(), dto.getOpenId()); } /** * 公共登陆注册方法 * @param phoneNumber 手机号 * @param merchantId 商户id - * @return + * @return token返给前端 */ private String memberRegisterAndLogin(String phoneNumber, String merchantId, String openId) { if (StringUtils.isBlank(phoneNumber)) { diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 5f964495c..76cc6c6f2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -158,7 +158,6 @@ and merchant_id = #{merchantId,jdbcType=VARCHAR} order by create_time DESC, update_time DESC - limit 1