diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index e1e311de..a0b7b0d3 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -115,6 +115,12 @@
cn.hutool
hutool-all
+
+ com.baomidou
+ mybatis-plus-annotation
+ 3.5.2
+ compile
+
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java
index dc2c62f3..0d290876 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Channel.java
@@ -1,5 +1,7 @@
package com.ruoyi.common.core.domain.http;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.web.domain.BaseEntity;
@@ -16,6 +18,7 @@ public class Channel extends BaseEntity
private static final long serialVersionUID = 1L;
/** */
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 渠道名称 */
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java
index 8437cf4b..08a4562f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java
@@ -1,6 +1,9 @@
package com.ruoyi.common.core.domain.http;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -20,6 +23,7 @@ public class Customer extends BaseEntity
private static final long serialVersionUID = 1L;
/** $column.columnComment */
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**渠道ID**/
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java
index ff134ad3..62c456f2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/CustomerApplyLog.java
@@ -2,6 +2,8 @@ package com.ruoyi.common.core.domain.http;
import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -20,6 +22,7 @@ public class CustomerApplyLog extends BaseEntity
private static final long serialVersionUID = 1L;
/** $column.columnComment */
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 用户id */
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java
index d2d9c96f..873aa67e 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java
@@ -1,5 +1,7 @@
package com.ruoyi.common.core.domain.http;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -18,6 +20,7 @@ public class Merchant extends BaseEntity
private static final long serialVersionUID = 1L;
/** $column.columnComment */
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 商户类型 1H5 2连登 3半流程 4全流程 */
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java
index ac5a7a23..30aa15f8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java
@@ -323,6 +323,12 @@ public class SecureUtils {
return null;
}
+ public static void main(String[] args) {
+
+ String s = "{\"accumulationFund\":1,\"age\":18,\"car\":1,\"career\":1,\"city\":\"重庆\",\"cityCode\":1000,\"creditCard\":1,\"education\":1,\"guarantee\":1,\"hourse\":1,\"idCardMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"monthlyIncome\":5000,\"nameMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"phoneMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"sex\":0,\"socialSecurity\":1,\"zhiMa\":600}";
+ String s1 = "{\"accumulationFund\":1,\"age\":18,\"car\":1,\"career\":1,\"city\":\"重庆\",\"cityCode\":1000,\"creditCard\":1,\"education\":1,\"guarantee\":1,\"hourse\":1,\"idCard\":\"341202199306023511\",\"idCardMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"monthlyIncome\":5000,\"name\":\"朱三\",\"nameMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"phone\":\"15205600635\",\"phoneMd5\":\"331d17d1ca8a091410e3238fab16a863\",\"sex\":0,\"socialSecurity\":1,\"zhiMa\":600}";
+ System.out.println(AesEncode(s,"LwLjtU1Bt8dcxxjY"));
+ }
/**
* 解密
*
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
index 1327c9bc..0e4778dd 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
@@ -4,6 +4,8 @@ import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -19,9 +21,11 @@ public class BaseEntity implements Serializable
/** 搜索值 */
@JsonIgnore
+ @TableField(exist = false)
private String searchValue;
/** 创建者 */
+ @TableField(exist = false)
private String createBy;
/** 创建时间 */
@@ -29,6 +33,7 @@ public class BaseEntity implements Serializable
private Date createTime;
/** 更新者 */
+ @TableField(exist = false)
private String updateBy;
/** 更新时间 */
@@ -40,6 +45,7 @@ public class BaseEntity implements Serializable
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
+ @TableField(exist = false)
private Map params;
public String getSearchValue()
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 8f7814d6..e53a726e 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
@@ -22,31 +22,29 @@ public class PublicHalfController{
/**
* 通用半流程撞库
*/
- @PostMapping("check")
+ @PostMapping("/check")
public AjaxResult upload(@RequestBody ComPublicHalfDto comPublicHalfDto)
{
- sysPublicHalfService.check(comPublicHalfDto);
- return null;
+ return sysPublicHalfService.check(comPublicHalfDto);
}
/**
* 通用半流程撞库
*/
- @PostMapping("input")
+ @PostMapping("/input")
public AjaxResult input(@RequestBody ComPublicHalfDto comPublicHalfDto)
{
- sysPublicHalfService.input(comPublicHalfDto);
- return null;
+ return sysPublicHalfService.input(comPublicHalfDto);
}
/**
* 通用半流程撞库
*/
- @GetMapping("checkOrder")
+ @GetMapping("/checkOrder")
public AjaxResult checkOrder(@RequestParam("phoneMD5")String phoneMd5,@RequestParam("channelSign")String channelSign)
{
- sysPublicHalfService.checkOrder(phoneMd5,channelSign);
- return null;
+
+ return sysPublicHalfService.checkOrder(phoneMd5,channelSign);
}
}
\ No newline at end of file
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 6a8b1289..a1b9ee53 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
@@ -278,4 +278,29 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService
//返回是否成功
return draw==0?AjaxResult.success("用户已申请",true):AjaxResult.success("用户未申请","false");
}
+
+ public static void main(String[] args) {
+ CustomerInfoDto customerInfoDto = new CustomerInfoDto();
+ customerInfoDto.setPhoneMd5("331d17d1ca8a091410e3238fab16a863");
+ customerInfoDto.setPhone("15205600635");
+ customerInfoDto.setSex(0);
+ customerInfoDto.setNameMd5("331d17d1ca8a091410e3238fab16a863");
+ customerInfoDto.setName("朱三");
+ customerInfoDto.setAge(18);
+ customerInfoDto.setIdCardMd5("331d17d1ca8a091410e3238fab16a863");
+ customerInfoDto.setIdCard("341202199306023511");
+ customerInfoDto.setCity("重庆");
+ customerInfoDto.setCityCode(1000);
+ customerInfoDto.setSocialSecurity(1);
+ customerInfoDto.setAccumulationFund(1);
+ customerInfoDto.setCar(1);
+ customerInfoDto.setHourse(1);
+ customerInfoDto.setGuarantee(1);
+ customerInfoDto.setZhiMa(600);
+ customerInfoDto.setCareer(1);
+ customerInfoDto.setCreditCard(1);
+ customerInfoDto.setEducation(1);
+ customerInfoDto.setMonthlyIncome(5000);
+ System.out.println(JSONObject.toJSONString(customerInfoDto));
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java
index 41918e09..90bc0a6d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java
@@ -96,7 +96,7 @@ public class CustomerController extends BaseController
* 新增客户信息
* @return
*/
- @PostMapping("/customer/addNewCustomer")
+ @PostMapping("/addNewCustomer")
public R add(@RequestBody Customer customer,@RequestHeader(SecurityConstants.FROM_SOURCE) String source){
boolean save = customerService.save(customer);
if (save){