|
|
@@ -1,31 +1,24 @@
|
|
|
package com.izouma.nineth.web;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
-import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
|
|
|
-import com.github.binarywang.wxpay.constant.WxPayConstants;
|
|
|
-import com.github.binarywang.wxpay.exception.WxPayException;
|
|
|
-import com.huifu.adapay.core.exception.BaseAdaPayException;
|
|
|
import com.izouma.nineth.domain.Order;
|
|
|
import com.izouma.nineth.enums.OrderStatus;
|
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
|
import com.izouma.nineth.repo.OrderRepo;
|
|
|
-import com.izouma.nineth.service.*;
|
|
|
+import com.izouma.nineth.service.OrderPayService;
|
|
|
+import com.izouma.nineth.service.SandPayService;
|
|
|
import com.izouma.nineth.utils.SecurityUtils;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import me.chanjar.weixin.common.error.WxErrorException;
|
|
|
-import me.chanjar.weixin.mp.api.WxMpService;
|
|
|
-import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
|
|
|
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
|
|
|
-import org.apache.commons.codec.EncoderException;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.Model;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.Map;
|
|
|
-import java.util.regex.Pattern;
|
|
|
|
|
|
@Controller
|
|
|
@RequestMapping({"/payOrder/v2", "/pay/v2"})
|