add 会员证书

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;
     }
     /**

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)
 

jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java

@@ -115,6 +115,30 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 		return payPaymentRecordService.standardsAddAR(tbPaymentId,payPaymentRecord,memberInfo);
 	}
 
+	 /**
+	  *   标协会议添加来款
+	  * @return
+	  */
+	 @ApiOperation(value="标协会议添加来款")
+	 @PostMapping(value = "/standardsMeetingAddAR")
+	 public Result<?> 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

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;
 }