|
@@ -12,10 +12,7 @@ import com.example.util.RedisUtil;
|
|
import com.example.util.UUIDUtils;
|
|
import com.example.util.UUIDUtils;
|
|
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
|
|
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
|
|
import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
|
|
import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
|
|
-import com.github.binarywang.wxpay.bean.request.WxPayAuthcode2OpenidRequest;
|
|
|
|
-import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest;
|
|
|
|
-import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
|
|
|
|
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
|
|
|
|
|
|
+import com.github.binarywang.wxpay.bean.request.*;
|
|
import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult;
|
|
import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult;
|
|
import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult;
|
|
import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult;
|
|
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
|
|
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
|
|
@@ -258,9 +255,9 @@ public class WechatH5PayController extends BaseController {
|
|
WxPayRefundResult refund = wxPayService.refund(refundRequest);
|
|
WxPayRefundResult refund = wxPayService.refund(refundRequest);
|
|
String errCode = refund.getReturnCode();
|
|
String errCode = refund.getReturnCode();
|
|
String returnMsg = refund.getReturnMsg();
|
|
String returnMsg = refund.getReturnMsg();
|
|
- if("SUCCESS".equals(errCode)){
|
|
|
|
|
|
+ if ("SUCCESS".equals(errCode)) {
|
|
return responseSuccess(success("申请退款成功"));
|
|
return responseSuccess(success("申请退款成功"));
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
return responseSuccess(error(returnMsg));
|
|
return responseSuccess(error(returnMsg));
|
|
}
|
|
}
|
|
} catch (WxPayException e) {
|
|
} catch (WxPayException e) {
|
|
@@ -448,5 +445,29 @@ public class WechatH5PayController extends BaseController {
|
|
return responseSuccess(new ResultVO(ResultEnum.SUCCESS, unOrder));
|
|
return responseSuccess(new ResultVO(ResultEnum.SUCCESS, unOrder));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @PostMapping("/pay/query")
|
|
|
|
+ public ResponseBase query(@RequestBody WxPayFrom wxPayFrom, HttpServletRequest request) {
|
|
|
|
+ WxPayOrderQueryRequest orderRequest = new WxPayOrderQueryRequest();
|
|
|
|
+ //随机字符串
|
|
|
|
+ String s = UUIDUtils.randomUUID();
|
|
|
|
+ orderRequest.setNonceStr(s);
|
|
|
|
+ //商户订单号(支付编号)
|
|
|
|
+ String orderNum = wxPayFrom.getOrderId();
|
|
|
|
+ log.info("OutTradeNo:" + orderNum);
|
|
|
|
+ //设置商户订单号
|
|
|
|
+ orderRequest.setOutTradeNo(orderNum);
|
|
|
|
+ Object unOrder = null;
|
|
|
|
+ try {
|
|
|
|
+ unOrder = wxPayService.queryOrder(orderRequest);
|
|
|
|
+ } catch (WxPayException e) {
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ log.error("错误信息:{}", e);
|
|
|
|
+ //签名完成新增支付订单
|
|
|
|
+ return responseError(500, e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ //签名完成新增支付订单
|
|
|
|
+ return responseSuccess(new ResultVO(ResultEnum.SUCCESS, unOrder));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|