diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index ee9563bf3..e825da3d1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -15,6 +15,7 @@ import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.vo.uniapp.PayModeVO; +import com.jsowell.service.MemberService; import com.jsowell.service.OrderService; import com.jsowell.wxpay.response.WechatPayNotifyParameter; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +45,10 @@ public class PayController extends BaseController { @Autowired private IMemberBasicInfoService memberBasicInfoService; + + @Autowired + private MemberService memberService; + /** * 充值余额支付/微信余额充值 * 提供给小程序使用 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLEquipmentInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLEquipmentInfo.java new file mode 100644 index 000000000..16f3fb068 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLEquipmentInfo.java @@ -0,0 +1,16 @@ +package com.jsowell.thirdparty.zhongdianlian.domain; + +import lombok.Data; + +/** + * 设备基本信息 + * + * @author Lemon + * @Date 2023/9/5 15:16 + */ +@Data +public class ZDLEquipmentInfo { + private String equipmentId; + + private String EquipmentType; +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLStationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLStationInfo.java new file mode 100644 index 000000000..dd3126a3b --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLStationInfo.java @@ -0,0 +1,31 @@ +package com.jsowell.thirdparty.zhongdianlian.domain; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 站点基本信息 + * + * @author Lemon + * @Date 2023/9/5 14:10 + */ +@Data +public class ZDLStationInfo { + private String stationId; + private String operatorId; + private String equipmentOwnerId; + private String stationName; + private String countryCode; + private String areaCode; + private String address; + private String serviceTel; + private Integer stationType; + private Integer stationStatus; + private Integer parkNums; + private BigDecimal stationLng; + private BigDecimal stationLat; + private Integer construction; + private List equipmentInfos; +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/dto/ZDLGetTokenDTO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/dto/ZDLGetTokenDTO.java index 2927ad624..7cca7fde7 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/dto/ZDLGetTokenDTO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/dto/ZDLGetTokenDTO.java @@ -1,7 +1,42 @@ -package com.jsowell.thirdparty.zhongdianlian.dto;/** - * TODO +package com.jsowell.thirdparty.zhongdianlian.dto; + +import lombok.Data; + +/** + * 中电联获取token DTO * + * @author Lemon * @Date 2023/9/5 8:42 - * @author Lemon - */public class ZDLGetTokenDTO { + */ +@Data +public class ZDLGetTokenDTO { + /** + * 对接平台url地址 (不加api名称) + */ + private String urlAddress; + + /** + * 运营商ID + */ + private String operatorId; + + /** + * 运营商密钥 + */ + private String operatorSecret; + + /** + * 消息Data密钥初始化向量 + */ + private String dataSecretIv; + + /** + * 签名密钥 + */ + private String signSecret; + + /** + * 消息Data密钥 + */ + private String dataSecret; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java index 800ad6ca4..e3da64206 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java @@ -1,5 +1,7 @@ package com.jsowell.thirdparty.zhongdianlian.service; +import com.jsowell.thirdparty.zhongdianlian.dto.ZDLGetTokenDTO; + /** * 中电联 Service * @@ -8,4 +10,5 @@ package com.jsowell.thirdparty.zhongdianlian.service; */ public interface ZDLService { + public String ZDLGetToken(ZDLGetTokenDTO dto); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index a99ff8928..8141c89f1 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -1,6 +1,9 @@ package com.jsowell.thirdparty.zhongdianlian.service.impl; +import com.jsowell.thirdparty.lianlian.service.LianLianService; +import com.jsowell.thirdparty.zhongdianlian.dto.ZDLGetTokenDTO; import com.jsowell.thirdparty.zhongdianlian.service.ZDLService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -12,4 +15,22 @@ import org.springframework.stereotype.Service; @Service public class ZDLServiceImpl implements ZDLService { + @Autowired + private LianLianService lianLianService; + + /** + * 获取令牌 + * @param dto + * @return + */ + @Override + public String ZDLGetToken(ZDLGetTokenDTO dto) { + if (dto == null) { + return null; + } + return lianLianService.getToken(dto.getUrlAddress(), dto.getOperatorId(), + dto.getOperatorSecret(), dto.getDataSecretIv(), dto.getSignSecret(), dto.getDataSecret()); + } + + }