diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java index bbc69c5..ad1114f 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java @@ -2,41 +2,35 @@ package com.mcwl.web.controller.pay.AliPay; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.UUID; -import cn.hutool.db.sql.Order; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; -import com.alipay.api.*; +import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; +import com.alipay.api.AlipayConfig; import com.alipay.api.DefaultAlipayClient; -import com.alipay.api.domain.*; +import com.alipay.api.domain.AlipayFundAccountQueryModel; +import com.alipay.api.domain.AlipayFundTransToaccountTransferModel; import com.alipay.api.request.AlipayFundAccountQueryRequest; import com.alipay.api.request.AlipayFundTransToaccountTransferRequest; -import com.alipay.api.request.AlipayFundTransUniTransferRequest; import com.alipay.api.response.AlipayFundAccountQueryResponse; import com.alipay.api.response.AlipayFundTransToaccountTransferResponse; -import com.alipay.api.CertAlipayRequest; -import com.alipay.api.response.AlipayFundTransUniTransferResponse; import com.alipay.easysdk.factory.Factory; import com.alipay.easysdk.kernel.Config; import com.alipay.easysdk.payment.facetoface.models.AlipayTradePrecreateResponse; import com.mcwl.common.core.redis.RedisCache; import com.mcwl.common.exception.ServiceException; import com.mcwl.common.utils.SecurityUtils; -import com.mcwl.memberCenter.domain.Member; import com.mcwl.memberCenter.domain.MemberLevel; import com.mcwl.memberCenter.service.MemberLevelService; import com.mcwl.memberCenter.service.MemberService; import com.mcwl.pay.config.AliConfig; import com.mcwl.pay.domain.OrderTrade; import com.mcwl.pay.domain.OrderTradeDto; -import com.mcwl.resource.service.MallProductService; import com.mcwl.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -50,17 +44,10 @@ public class AliPayIntegration { @Autowired private RedisCache redisCache; - @Autowired - private MemberService memberService; @Autowired private MemberLevelService memberLevelService; - @Autowired - private MallProductService mallProductService; - - @Autowired - private ISysUserService sysUserService; @Autowired private AliConfig aliConfig; diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java index 18222d6..7c0fae5 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java @@ -1,30 +1,19 @@ package com.mcwl.resource.service.impl; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.utils.SecurityUtils; -import com.mcwl.resource.domain.MallProductLike; import com.mcwl.resource.domain.ModelImage; import com.mcwl.resource.domain.ModelImageComment; -import com.mcwl.resource.domain.ModelProduct; import com.mcwl.resource.domain.dto.ModelImageCommentRes; import com.mcwl.resource.domain.dto.ModelImageRes; -import com.mcwl.resource.domain.vo.MallProductVo; -import com.mcwl.resource.mapper.MallProductLikeMapper; import com.mcwl.resource.mapper.ModelImageCommentMapper; import com.mcwl.resource.mapper.ModelImageMapper; -import com.mcwl.resource.service.MallProductLikeService; -import com.mcwl.resource.service.MallProductService; -import com.mcwl.resource.service.ModelImageCommentService; import com.mcwl.resource.service.ModelImageService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; -import java.util.List; import java.util.Objects; @Service