From 9f494a1838ff328d8ccf70beaa5520c19a788398 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 15 Sep 2021 15:42:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B7=A8=E6=9C=8D=E5=8A=A1=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/entity/TbMemberProjectSubitem.java |  2 +-
 .../impl/PayPaymentRecordServiceImpl.java     | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index 0a4c89d7..aa66dd82 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -164,7 +164,7 @@ public class TbMemberProjectSubitem implements Serializable {
     /**缴费方式*/
     @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
     @Dict(dicCode = "meeting_pay_type")
-    private Integer payMode;
+    private Integer paymentMethod;
 
     /**标协缴费表id*/
     @ApiModelProperty(value = "标协缴费表id")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 39ccbb25..403c4f0b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -1,20 +1,11 @@
 package com.jero.payment.service.impl;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.RestUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.meeting.entity.PayMeetingSituation;
@@ -27,29 +18,21 @@ import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.mapper.PayPaymentRecordMapper;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
-import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
-import com.jero.util.AuthenticationUtils;
-import io.lettuce.core.dynamic.annotation.Param;
+import com.jero.common.util.AuthenticationUtils;
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;