diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index f6d5afb3..5546a34b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -987,7 +987,7 @@ public class PayContactsManagementController extends JeroController queryPayContactsManagement = new LambdaQueryWrapper<>(); - queryPayContactsManagement.eq(PayContactsManagement::getUsername,sysUser.getUsername()); + queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername()); PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement); Map baseInfo = memberInfoService.baseInfo(contacts); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index c488bfcf..e6f83a3b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -4,17 +4,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.LoginUser; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; import com.jero.payment.entity.PayPaymentRecordSub; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentCheckService; import com.jero.payment.service.IPayPaymentRecordService; +import com.jero.standards.memberinfo.service.IMemberInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -28,6 +34,10 @@ public class PayPaymentCheckController extends JeroController wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MemberInfo::getId,contacts.getMemberId()); MemberInfo memberInfo = memberInfoMapper.selectOne(wrapper); + //解密 + String memberMobile = PasswordUtil.decrypt(memberInfo.getMobile(), PasswordUtil.ALGORITHM, PasswordUtil.Salt); + memberInfo.setMobile(memberMobile); + String memberEmail = PasswordUtil.decrypt(memberInfo.getEmail(), PasswordUtil.ALGORITHM, PasswordUtil.Salt); + memberInfo.setEmail(memberEmail); //左侧秘书处信息 SysUser secretariat = memberInfoMapper.getBXGLZ();