diff --git a/pom.xml b/pom.xml index ea0ec8fc..9685086b 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ 1.6.9 2.14.4 3.5.2 + 1.18.30 @@ -225,6 +226,7 @@ org.projectlombok lombok + ${lombok.version} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java index a6f4d7af..63763cb3 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/RuoYiBtcApplication.java @@ -15,6 +15,6 @@ public class RuoYiBtcApplication public static void main(String[] args) { SpringApplication.run(RuoYiBtcApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); + System.out.println("(♥◠‿◠)ﾉﾞ 三方业务服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); } } diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java index 453866e0..345c8cdb 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java @@ -1,13 +1,14 @@ package com.ruoyi.btc.controller; +import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.btc.service.ISysPublicHalfService; import com.ruoyi.common.core.web.domain.AjaxResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; /** * 半流程API接口写这里 @@ -25,9 +26,30 @@ public class PublicHalfController{ * 通用半流程撞库 */ @PostMapping("check") - public AjaxResult upload(MultipartFile file) + public AjaxResult upload(@RequestBody ComPublicHalfDto comPublicHalfDto) { + sysPublicHalfService.check(comPublicHalfDto); + return null; + } + + /** + * 通用半流程撞库 + */ + @PostMapping("input") + public AjaxResult input(@RequestBody ComPublicHalfDto comPublicHalfDto) + { + sysPublicHalfService.input(comPublicHalfDto); + return null; + } + + /** + * 通用半流程撞库 + */ + @PostMapping("checkOrder") + public AjaxResult checkOrder(@RequestBody ComPublicHalfDto comPublicHalfDto) + { + sysPublicHalfService.checkOrder(comPublicHalfDto); return null; } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/ComPublicHalfDto.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/ComPublicHalfDto.java new file mode 100644 index 00000000..8c0a92d8 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/ComPublicHalfDto.java @@ -0,0 +1,13 @@ +package com.ruoyi.btc.domain; + +import lombok.Data; + +@Data +public class ComPublicHalfDto { + + //参数实体类 + private String data; + //渠道标识 + private String channelSignature; + +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java new file mode 100644 index 00000000..7af4c349 --- /dev/null +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/domain/CustomerInfoDto.java @@ -0,0 +1,45 @@ +package com.ruoyi.btc.domain; + +import lombok.Data; + +@Data +public class CustomerInfoDto { + //手机号码（Md5） + private String phoneMd5; + //性别 0 男 1 女 + private Integer sex; + //手机号码（Md5） + private String nameMd5; + //年龄 + private Integer age; + //手身份证md5 + private String idCardMd5; + //所在城市 + private String city; + //所在城市代码 + private Integer cityCode; + //本地社保 + private Integer socialSecurity; + //本地公积金 + private Integer accumulationFund; + //名下车产 + private Integer car; + //名下房产 + private Integer hourse; + //个人保险 + private Integer guarantee; + //芝麻分 + private Integer zhiMa; + //职业身份 + private Integer career; + //信用卡（1无 2有 + private Integer creditCard; + //学历 + private Integer education; + //月收入 + private Integer monthlyIncome; + //ip地址 + private String ip; + //渠道标识 + private String channelSignature; +} diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java index e2563d9e..22392d6a 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/ISysPublicHalfService.java @@ -1,5 +1,7 @@ package com.ruoyi.btc.service; +import com.ruoyi.btc.domain.ComPublicHalfDto; + /** * 文件上传接口 * @@ -8,4 +10,22 @@ package com.ruoyi.btc.service; public interface ISysPublicHalfService { + /** + * 半流程通用撞库接口 + * @param comPublicHalfDto + */ + void check(ComPublicHalfDto comPublicHalfDto); + + /** + * 半流程通用进件 + * @param comPublicHalfDto + */ + void input(ComPublicHalfDto comPublicHalfDto); + + /** + * 渠道查询订单是否成功 + * @param comPublicHalfDto + */ + void checkOrder(ComPublicHalfDto comPublicHalfDto); + } diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index e7791779..a42fb729 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.btc.service.impl; +import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.btc.service.ISysPublicHalfService; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; @@ -14,4 +15,63 @@ import org.springframework.stereotype.Service; public class SysPublicHalfServiceImpl implements ISysPublicHalfService { + + /** + * 半流程通用撞库 + * @param comPublicHalfDto + */ + @Override + public void check(ComPublicHalfDto comPublicHalfDto) { + //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 + + //解密为customerInfoDto + + //校验数据必传参数是否未传 + + //转化字段未数据库中资质字段 并保存 用户未实名状态 一并保存用户申请记录 未申请状态 + + //匹配资质 造轮子 返回多个符合的商户 + + //结束返回上游结果 + + } + + /** + * 半流程通用进件 + * @param comPublicHalfDto + */ + @Override + public void input(ComPublicHalfDto comPublicHalfDto) { + //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 + + //解密为customerInfoDto + + //校验数据必传参数是否未传 + + //转化字段未数据库中资质字段 更新 用户实名状态 一并保存用户申请记录 已申请 + + //匹配资质 造轮子 返回多个符合的商户 + + //取排序第一的 + + //返回渠道绑定的注册页拼接token + + //返回上游信息 + + } + + /** + * 渠道查询订单是否成功 + * @param comPublicHalfDto + */ + @Override + public void checkOrder(ComPublicHalfDto comPublicHalfDto) { + //根据手机号MD5渠道标识 查询是否成功 + + //失败直接失败 + + //成功抽奖 按扣量比抽 + + //返回是否成功 + } }