diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java index 28c481dc..a89d50aa 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java @@ -79,21 +79,25 @@ public class CsrfFilter implements Filter { */ private boolean isWhiteReq(String referUrl) { if (referUrl == null || "".equals(referUrl) || size == 0) { - return true; + return false; } else { String refHost = ""; referUrl = referUrl.toLowerCase(); if (referUrl.startsWith("http://")) { - refHost = referUrl.substring(7); + int i = referUrl.substring(7).indexOf("/"); + refHost = referUrl.substring(7,i+7); } else if (referUrl.startsWith("https://")) { - refHost = referUrl.substring(8); + int i = referUrl.substring(8).indexOf("/"); + refHost = referUrl.substring(8,i+8); } + for (String urlTemp : whiteUrls) { - if (refHost.contains(urlTemp.toLowerCase())) { + if (refHost.equals(urlTemp.toLowerCase())) { return true; } } } + return false; } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java index ec983d28..8db04f7e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java @@ -93,6 +93,16 @@ public class TbCertificatePayment implements Serializable { @ApiModelProperty(value = "联系人") private String liaisonMan; + /**邮箱*/ + @Excel(name = "邮箱", width = 20,exportConvert = true) + @ApiModelProperty(value = "邮箱") + private String email; + + /**手机*/ + @Excel(name = "手机", width = 15,exportConvert = true) + @ApiModelProperty(value = "手机") + private String mobile; + /**缴费类型*/ @Excel(name = "缴费类型", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index 6ed3a0e8..7968b723 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -115,6 +115,30 @@ public class PayPaymentRecordController extends JeroController standardsMeetingAddAR(@RequestParam(name="amountReceived")String amountReceived, + @RequestParam(name="paymentDate")String paymentDate, + @RequestParam(name="tbPaymentId")String tbPaymentId, + @RequestBody MemberInfo memberInfo, + @RequestParam(name="remark",required = false)String remark) { + //TODO + PayPaymentRecord payPaymentRecord=new PayPaymentRecord(); + payPaymentRecord.setAmountReceived(new BigDecimal(amountReceived)); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + try { + payPaymentRecord.setPaymentDate(simpleDateFormat.parse(paymentDate)); + } catch (ParseException e) { + e.printStackTrace(); + } + payPaymentRecord.setRemark(remark); + return payPaymentRecordService.standardsAddAR(tbPaymentId,payPaymentRecord,memberInfo); + } + /** * 标协会员更新会员来款信息 * @return diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java index bce4f126..552ed759 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/vo/TbCheckVo.java @@ -8,8 +8,16 @@ import lombok.Data; @Data public class TbCheckVo { - //缴费id + /** + * 缴费id + */ private String id; - //备注 + /** + *审核结果(0 驳回,1 通过) + */ + private Integer checkResult = 1; + /** + * 备注 + */ private String checkMark; }