feats

pom.xml

@@ -103,7 +103,16 @@
 			<artifactId>weixin-java-pay</artifactId>
 			<version>4.2.0</version>
 		</dependency>
-		<!--weixin-pay start-->
+		<!--weixin-pay end-->
+
+
+		<!--alipay-pay start-->
+		<dependency>
+			<groupId>com.alipayFactory.sdk</groupId>
+			<artifactId>alipayFactory-sdk-java</artifactId>
+			<version>4.31.12.ALL</version>
+		</dependency>
+		<!--alipay-pay end-->
 
 		<!--lombok start-->
 		<dependency>

src/main/java/com/yunzhi/nanyang/common/DateUtils.java

@@ -4,6 +4,11 @@ import java.time.*;
 import java.time.format.DateTimeFormatter;
 
 public class DateUtils {
+    public static LocalDateTime now() {
+        // 北京时间
+        return LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+    }
+
     public static LocalDateTime from(String str, DateTimeFormatter fmt) {
         return LocalDateTime.parse(str, fmt);
     }

src/main/java/com/yunzhi/nanyang/common/MathUtils.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.common;
 
+import java.text.DecimalFormat;
 import java.util.Random;
 
 public class MathUtils {
@@ -8,4 +9,9 @@ public class MathUtils {
         Random random = new Random();
         return random.nextInt(max) % (max - min + 1) + min;
     }
+
+    public static String formatFloat(float f, String formater) {
+        DecimalFormat df = new DecimalFormat(formater);
+        return  df.format(f);
+    }
 }

src/main/java/com/yunzhi/nanyang/common/alipay/AlipayFactory.java

@@ -0,0 +1,75 @@
+package com.yunzhi.nanyang.common.alipay;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.CertAlipayRequest;
+import com.alipay.api.DefaultAlipayClient;
+import lombok.Data;
+
+/**
+ * 主要用来构造 支付宝支付客户端
+ */
+public class AlipayFactory {
+
+    Config config;
+    AlipayClient alipayClient;
+
+    public AlipayFactory(Config config) {
+        this.config = config;
+
+        try {
+            this.initAlipayClient();
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public AlipayClient getAlipayClient() throws AlipayApiException {
+        if (alipayClient == null) {
+            this.initAlipayClient();
+        }
+
+        return alipayClient;
+    }
+
+    private void initAlipayClient() throws AlipayApiException {
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+        //设置网关地址
+        certAlipayRequest.setServerUrl(config.getServerUrl());
+        //设置应用Id
+        certAlipayRequest.setAppId(config.getAppid());
+        //设置应用私钥
+        certAlipayRequest.setPrivateKey(config.getPrivateKey());
+        //设置请求格式，固定值json
+        certAlipayRequest.setFormat(config.getFormat());
+        //设置字符集
+        certAlipayRequest.setCharset(config.getCharset());
+        //设置签名类型
+        certAlipayRequest.setSignType(config.getSignType());
+        //设置应用公钥证书路径
+        certAlipayRequest.setCertPath(config.getCertPath());
+        //设置支付宝公钥证书路径
+        certAlipayRequest.setAlipayPublicCertPath(config.getAlipayPublicCertPath());
+        //设置支付宝根证书路径
+        certAlipayRequest.setRootCertPath(config.getRootCertPath());
+        //构造client
+        alipayClient = new DefaultAlipayClient(certAlipayRequest);
+    }
+
+    @Data
+    public static class Config {
+        String appid;
+        String privateKey;
+        String certPath;
+        String alipayPublicCertPath;
+        String rootCertPath;
+        String format;
+        String charset;
+        String signType;
+        String serverUrl;
+        String notifyUrl;
+        String authUrl;
+        String authCallback;
+    }
+
+}

src/main/java/com/yunzhi/nanyang/common/alipay/AlipayService.java

@@ -0,0 +1,131 @@
+package com.yunzhi.nanyang.common.alipay;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
+import com.alipay.api.domain.AlipayTradeRefundModel;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.alipay.api.request.AlipayTradeAppPayRequest;
+import com.alipay.api.request.AlipayTradeRefundRequest;
+import com.alipay.api.response.AlipayTradeAppPayResponse;
+import com.alipay.api.response.AlipayTradeRefundResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.nanyang.entity.SysAliPayConfig;
+import com.yunzhi.nanyang.service.ISysAliPayConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 主要用来实现支付等相关功能
+ */
+@Component
+public class AlipayService {
+
+    ISysAliPayConfigService iSysAliPayConfigService;
+    AlipayFactory alipayFactory = null;
+    AlipayFactory.Config config = null;
+    AlipayClient alipayClient = null;
+
+    @Autowired
+    public AlipayService(ISysAliPayConfigService iSysAliPayConfigService) {
+        this.iSysAliPayConfigService = iSysAliPayConfigService;
+
+        try {
+            config = getConfig();
+            alipayFactory = new AlipayFactory(config);
+            alipayClient = alipayFactory.getAlipayClient();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 支付下单
+     * @param model
+     * @param client
+     * @return
+     * @throws AlipayApiException
+     */
+    public AlipayTradeAppPayResponse createOrder(AlipayTradeAppPayModel model, String client) throws AlipayApiException {
+        if (null == alipayClient) {
+            try {
+                config = getConfig();
+                alipayFactory = new AlipayFactory(config);
+                alipayClient = alipayFactory.getAlipayClient();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+
+        String notifyUrl = String.format("%s/alipay/%s/order", config.getNotifyUrl(), client);
+
+        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+        request.setBizModel (model);
+        request.setNotifyUrl(notifyUrl);
+        return alipayClient.sdkExecute( request );
+    }
+
+    /**
+     * 退款
+     * @param model
+     * @param client
+     * @return
+     * @throws AlipayApiException
+     */
+    public AlipayTradeRefundResponse refund(AlipayTradeRefundModel model, String client) throws AlipayApiException {
+        if (null == alipayClient) {
+            try {
+                config = getConfig();
+                alipayFactory = new AlipayFactory(config);
+                alipayClient = alipayFactory.getAlipayClient();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+
+        String notifyUrl = String.format("%s/alipay/%s/refund", config.getNotifyUrl(), client);
+
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        request.setBizModel(model);
+        request.setNotifyUrl(notifyUrl);
+        return alipayClient.execute(request);
+    }
+
+    /**
+     * 获取 支付宝配置
+     * @return
+     */
+    public boolean rsaCheckV1(Map<String, String> params) throws AlipayApiException {
+        if (null == config) return false;
+
+        return AlipaySignature.rsaCheckV1 (params, config.getAlipayPublicCertPath(), config.getCharset(),config.getSignType());
+    }
+
+    private AlipayFactory.Config getConfig() throws Exception {
+        SysAliPayConfig sysAliPayConfig = iSysAliPayConfigService.getOne(new QueryWrapper<SysAliPayConfig>().eq("status", 1).last("limit 1"));
+        if (null == sysAliPayConfig) {
+            throw new Exception("未找到支付宝支付相关配置");
+        }
+
+        AlipayFactory.Config config = new AlipayFactory.Config();
+        config.setAppid(sysAliPayConfig.getAppid());
+        config.setPrivateKey(sysAliPayConfig.getPrivateKey());
+        config.setCertPath(sysAliPayConfig.getCertPath());
+        config.setAlipayPublicCertPath(sysAliPayConfig.getAlipayPublicCertPath());
+        config.setRootCertPath(sysAliPayConfig.getRootCertPath());
+        config.setServerUrl(sysAliPayConfig.getServerUrl());
+        config.setNotifyUrl(sysAliPayConfig.getNotifyUrl());
+        config.setAuthUrl(sysAliPayConfig.getAuthUrl());
+        config.setAuthCallback(sysAliPayConfig.getAuthCallback());
+        config.setFormat("json");
+        config.setCharset("UTF-8");
+        config.setSignType("RSA2");
+
+        return config;
+    }
+}

src/main/java/com/yunzhi/nanyang/common/alipay/Utils.java

@@ -0,0 +1,26 @@
+package com.yunzhi.nanyang.common.alipay;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+
+public class Utils {
+    /**
+     * 小文件读取, 文件大小不能超过 2M
+     * @param f
+     * @return
+     * @throws IOException
+     */
+    public static String readFile(String f) throws IOException {
+        FileChannel file = FileChannel.open(Paths.get(f));
+        int fileSize = (int) file.size();
+        ByteBuffer buff = ByteBuffer.allocate(fileSize);
+        file.read(buff);
+        buff.flip();
+        file.close();
+        return StandardCharsets.UTF_8.decode(buff).toString();
+    }
+
+}

src/main/java/com/yunzhi/nanyang/controller/PayNotifyController.java

@@ -0,0 +1,143 @@
+package com.yunzhi.nanyang.controller;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.github.binarywang.wxpay.bean.notify.*;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.WxUtils;
+import com.yunzhi.nanyang.common.alipay.AlipayFactory;
+import com.yunzhi.nanyang.common.alipay.AlipayService;
+import com.yunzhi.nanyang.service.ITaPayService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+@Api(tags = "支付回调")
+@RestController
+@RequestMapping("/")
+public class PayNotifyController extends BaseController {
+
+    @Autowired
+    WxUtils wxUtils;
+
+    @Autowired
+    AlipayService alipayService;
+
+    @Autowired
+    ITaPayService orderPayService;
+
+    @ResponseBody
+    @RequestMapping("/wxpay/notify/{client}/order")
+    public String wxNotify(@PathVariable String client,
+                            @RequestBody String jsonData) {
+        WxPayService payService = null;
+        if ("ios".equals(client) || "android".equals(client)) {
+            payService = wxUtils.getAndroidPayService();
+        } else {
+            payService = wxUtils.getMiniPayService();
+        }
+
+        WxPayOrderNotifyV3Result result = null;
+        try {
+            result = payService.parseOrderNotifyV3Result(jsonData, null);
+            orderPayService.notifyOrder(result.getResult());
+            return WxPayNotifyResponse.success("OK");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return WxPayNotifyResponse.fail(e.getMessage());
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping("/wxpay/notify/{client}/refund")
+    public String wxRefundNotify(@PathVariable String client,
+                               @RequestBody String jsonData) {
+        WxPayService payService = null;
+        if ("ios".equals(client) || "android".equals(client)) {
+            payService = wxUtils.getAndroidPayService();
+        } else {
+            payService = wxUtils.getMiniPayService();
+        }
+
+        WxPayRefundNotifyV3Result result = null;
+        try {
+            result = payService.parseRefundNotifyV3Result(jsonData, null);
+            orderPayService.refundNotifyOrder(result.getResult());
+            return WxPayNotifyResponse.success("OK");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return WxPayNotifyResponse.fail(e.getMessage());
+        }
+
+    }
+
+
+    @ResponseBody
+    @RequestMapping("/alipay/notify/{client}/order")
+    public String aliNotify(@PathVariable String client,
+                            HttpServletRequest request) {
+        Map<String, String> params = getRequestParams(request);
+
+        // 支付等待中
+        if ("WAIT_BUYER_PAY".equals(params.get("trade_status"))) {
+            return "success";
+        }
+
+        //切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+        //boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
+        try {
+            boolean isOk = alipayService.rsaCheckV1(params);
+            if (!isOk) return "failure";
+
+            orderPayService.notifyOrder(params);
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "failure";
+        }
+    }
+
+
+    @ResponseBody
+    @RequestMapping("/alipay/notify/{client}/refund")
+    public String aliRefundNotify(@PathVariable String client,
+                                  HttpServletRequest request) {
+        Map<String, String> params = getRequestParams(request);
+
+        try {
+            boolean isOk = alipayService.rsaCheckV1(params);
+            if (!isOk) return "failure";
+
+            orderPayService.refundNotifyOrder(params);
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "failure";
+        }
+
+    }
+
+    private Map<String, String> getRequestParams(HttpServletRequest request) {
+        Map<String, String> params = new HashMap<>();
+        Map requestParams = request.getParameterMap();
+        for(Iterator iter = requestParams.keySet().iterator(); iter.hasNext();){
+            String name = (String)iter.next();
+            String[] values = (String [])requestParams.get(name);
+            String valueStr = "";
+            for(int i = 0;i < values.length;i ++ ){
+                valueStr =  (i==values.length-1)?valueStr + values [i]:valueStr + values[i] + ",";
+            }
+            //乱码解决，这段代码在出现乱码时使用。
+            //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+            params.put (name,valueStr);
+        }
+        return params;
+    }
+
+}

src/main/java/com/yunzhi/nanyang/controller/SysAliPayConfigController.java

@@ -0,0 +1,119 @@
+package com.yunzhi.nanyang.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.ResponseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.nanyang.service.ISysAliPayConfigService;
+import com.yunzhi.nanyang.entity.SysAliPayConfig;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 阿里支付配置 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+
+@Api(tags = "阿里支付配置")
+@RestController
+@RequestMapping("/")
+public class SysAliPayConfigController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysAliPayConfigController.class);
+
+    @Autowired
+    public ISysAliPayConfigService iSysAliPayConfigService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysAliPayConfig",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysAliPayConfigList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+		    IPage<SysAliPayConfig> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysAliPayConfig> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysAliPayConfig> result = iSysAliPayConfigService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param sysAliPayConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysAliPayConfig",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean sysAliPayConfigAdd(@ApiParam("保存内容") @RequestBody SysAliPayConfig sysAliPayConfig) throws Exception{
+
+        if (iSysAliPayConfigService.save(sysAliPayConfig)){
+            return ResponseBean.success(sysAliPayConfig);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysAliPayConfig/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean sysAliPayConfigDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iSysAliPayConfigService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysAliPayConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysAliPayConfig/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean sysAliPayConfigUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody SysAliPayConfig sysAliPayConfig) throws Exception{
+
+        if (iSysAliPayConfigService.updateById(sysAliPayConfig)){
+            return ResponseBean.success(iSysAliPayConfigService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysAliPayConfig/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysAliPayConfigGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iSysAliPayConfigService.getById(id));
+    }
+}

src/main/java/com/yunzhi/nanyang/controller/SysWxPayConfigController.java

@@ -0,0 +1,119 @@
+package com.yunzhi.nanyang.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.ResponseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.nanyang.service.ISysWxPayConfigService;
+import com.yunzhi.nanyang.entity.SysWxPayConfig;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 微信支付配置 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+
+@Api(tags = "微信支付配置")
+@RestController
+@RequestMapping("/")
+public class SysWxPayConfigController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysWxPayConfigController.class);
+
+    @Autowired
+    public ISysWxPayConfigService iSysWxPayConfigService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysWxPayConfig",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysWxPayConfigList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+		    IPage<SysWxPayConfig> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysWxPayConfig> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysWxPayConfig> result = iSysWxPayConfigService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param sysWxPayConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysWxPayConfig",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean sysWxPayConfigAdd(@ApiParam("保存内容") @RequestBody SysWxPayConfig sysWxPayConfig) throws Exception{
+
+        if (iSysWxPayConfigService.save(sysWxPayConfig)){
+            return ResponseBean.success(sysWxPayConfig);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysWxPayConfig/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean sysWxPayConfigDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iSysWxPayConfigService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysWxPayConfig 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysWxPayConfig/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean sysWxPayConfigUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody SysWxPayConfig sysWxPayConfig) throws Exception{
+
+        if (iSysWxPayConfigService.updateById(sysWxPayConfig)){
+            return ResponseBean.success(iSysWxPayConfigService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysWxPayConfig/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysWxPayConfigGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iSysWxPayConfigService.getById(id));
+    }
+}

src/main/java/com/yunzhi/nanyang/controller/TaPayController.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.controller;
 
+import com.alipay.api.response.AlipayTradeAppPayResponse;
 import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
 import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -53,15 +54,29 @@ public class TaPayController extends BaseController {
             return ResponseBean.error("订单已支付");
         }
 
-        WxPayUnifiedOrderV3Result payResult = iTaPayService.createPay(client, clientId, taOrder);
-        if ("wx".equals(client)) {
+        iTaOrderService.updateById(taOrder);
+
+        // 是否微信小程序
+        boolean isMiniapp = "wx".equals(client);
+        // 是否微信支付
+        boolean isWxpay = "wx".equals(payOrder.getPayType());
+
+        // 如果是微信小程序支付
+        if (isMiniapp) {
+            WxPayUnifiedOrderV3Result payResult = iTaPayService.createWxPay(client, clientId, taOrder);
             WxPayConfig payConfig = wxUtils.getMiniPayService().getConfig();
             WxPayUnifiedOrderV3Result.JsapiResult result = payResult.getPayInfo(TradeTypeEnum.JSAPI, payConfig.getAppId(), payConfig.getMchId(), payConfig.getPrivateKey());
             return ResponseBean.success(result);
-        } else {
+        } else if (isWxpay) {
+            // 如果是 APP 微信支付
+            WxPayUnifiedOrderV3Result payResult = iTaPayService.createWxPay(client, clientId, taOrder);
             WxPayConfig payConfig = wxUtils.getAndroidPayService().getConfig();
             WxPayUnifiedOrderV3Result.AppResult result = payResult.getPayInfo(TradeTypeEnum.APP, payConfig.getAppId(), payConfig.getMchId(), payConfig.getPrivateKey());
             return ResponseBean.success(result);
+        } else {
+            // 如果是 APP 支付宝支付
+            AlipayTradeAppPayResponse aliPayResponse = iTaPayService.createAliPay(client, clientId, taOrder);
+            return ResponseBean.success(aliPayResponse.getBody());
         }
     }
 

src/main/java/com/yunzhi/nanyang/controller/WxPayController.java

@@ -1,71 +0,0 @@
-package com.yunzhi.nanyang.controller;
-
-import com.github.binarywang.wxpay.bean.notify.*;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.yunzhi.nanyang.common.BaseController;
-import com.yunzhi.nanyang.common.WxUtils;
-import com.yunzhi.nanyang.service.ITaPayService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Api(tags = "微信小程序")
-@RestController
-@RequestMapping("/wxpay")
-public class WxPayController extends BaseController {
-
-    @Autowired
-    WxUtils wxUtils;
-
-    @Autowired
-    ITaPayService orderPayService;
-
-    @ResponseBody
-    @RequestMapping("/notify/{client}/order")
-    public String payNotify(@PathVariable String client,
-                            @RequestBody String jsonData) {
-        WxPayService payService = null;
-        if ("ios".equals(client) || "android".equals(client)) {
-            payService = wxUtils.getAndroidPayService();
-        } else {
-            payService = wxUtils.getMiniPayService();
-        }
-
-        WxPayOrderNotifyV3Result result = null;
-        try {
-            result = payService.parseOrderNotifyV3Result(jsonData, null);
-            orderPayService.notifyOrder(result.getResult());
-            return WxPayNotifyResponse.success("OK");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return WxPayNotifyResponse.fail(e.getMessage());
-        }
-
-
-    }
-
-    @ResponseBody
-    @RequestMapping("/notify/{client}/refund")
-    public String refundNotify(@PathVariable String client,
-                               @RequestBody String jsonData) {
-        WxPayService payService = null;
-        if ("ios".equals(client) || "android".equals(client)) {
-            payService = wxUtils.getAndroidPayService();
-        } else {
-            payService = wxUtils.getMiniPayService();
-        }
-
-        WxPayRefundNotifyV3Result result = null;
-        try {
-            result = payService.parseRefundNotifyV3Result(jsonData, null);
-            orderPayService.refundNotifyOrder(result.getResult());
-            return WxPayNotifyResponse.success("OK");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return WxPayNotifyResponse.fail(e.getMessage());
-        }
-
-    }
-
-}

src/main/java/com/yunzhi/nanyang/entity/SysAliPayConfig.java

@@ -0,0 +1,62 @@
+package com.yunzhi.nanyang.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 阿里支付配置
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SysAliPayConfig对象", description="阿里支付配置")
+public class SysAliPayConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "应用ID")
+    @TableId(value = "appid", type = IdType.INPUT)
+    private String appid;
+
+    @ApiModelProperty(value = "应用类型")
+    private String appType;
+
+    @ApiModelProperty(value = "应用私钥")
+    private String privateKey;
+
+    @ApiModelProperty(value = "应用公钥证书路径")
+    private String certPath;
+
+    @ApiModelProperty(value = "支付宝公钥证书路径")
+    private String alipayPublicCertPath;
+
+    @ApiModelProperty(value = "支付宝根证书路径")
+    private String rootCertPath;
+
+    @ApiModelProperty(value = "网关地址")
+    private String serverUrl;
+
+    @ApiModelProperty(value = "授权地址")
+    private String authUrl;
+
+    @ApiModelProperty(value = "授权回调地址")
+    private String authCallback;
+
+    @ApiModelProperty(value = "支付回调地址")
+    private String notifyUrl;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+}

src/main/java/com/yunzhi/nanyang/entity/SysWxPayConfig.java

@@ -0,0 +1,66 @@
+package com.yunzhi.nanyang.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 微信支付配置
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SysWxPayConfig对象", description="微信支付配置")
+public class SysWxPayConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "应用ID")
+    @TableId(value = "appid", type = IdType.INPUT)
+    private String appid;
+
+    @ApiModelProperty(value = "应用类型")
+    private String appType;
+
+    @ApiModelProperty(value = "商户ID")
+    private String mchId;
+
+    @ApiModelProperty(value = "商户密钥")
+    private String mchKey;
+
+    @ApiModelProperty(value = "子商户应用ID")
+    private String subAppId;
+
+    @ApiModelProperty(value = "子商户ID")
+    private String subMchId;
+
+    @ApiModelProperty(value = "微信V3版本KEY")
+    private String apiV3Key;
+
+    @ApiModelProperty(value = "密钥路径")
+    private String keyPath;
+
+    @ApiModelProperty(value = "私钥路径")
+    private String privateKeyPath;
+
+    @ApiModelProperty(value = "私钥证书路径")
+    private String privateCertPath;
+
+    @ApiModelProperty(value = "支付回调")
+    private String notifyUrl;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+
+}

src/main/java/com/yunzhi/nanyang/mapper/SysAliPayConfigMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.yunzhi.nanyang.entity.SysAliPayConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 阿里支付配置 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+@Mapper
+public interface SysAliPayConfigMapper extends BaseMapper<SysAliPayConfig> {
+
+}

src/main/java/com/yunzhi/nanyang/mapper/SysWxPayConfigMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.yunzhi.nanyang.entity.SysWxPayConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 微信支付配置 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+@Mapper
+public interface SysWxPayConfigMapper extends BaseMapper<SysWxPayConfig> {
+
+}

src/main/java/com/yunzhi/nanyang/service/ISysAliPayConfigService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.SysAliPayConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 阿里支付配置 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+public interface ISysAliPayConfigService extends IService<SysAliPayConfig> {
+
+}

src/main/java/com/yunzhi/nanyang/service/ISysWxPayConfigService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.SysWxPayConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 微信支付配置 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+public interface ISysWxPayConfigService extends IService<SysWxPayConfig> {
+
+}

src/main/java/com/yunzhi/nanyang/service/ITaPayService.java

@@ -1,14 +1,17 @@
 package com.yunzhi.nanyang.service;
 
+import com.alipay.api.response.AlipayTradeAppPayResponse;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
 import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaPay;
 
+import java.util.Map;
+
 public interface ITaPayService extends IBaseService<TaPay> {
 
-    WxPayUnifiedOrderV3Result createPay(String client, String clientId, TaOrder taOrder) throws Exception;
+    WxPayUnifiedOrderV3Result createWxPay(String client, String clientId, TaOrder taOrder) throws Exception;
 
     WxPayUnifiedOrderV3Result prePay(TaPay taPay, String client) throws Exception;
 
@@ -19,4 +22,10 @@ public interface ITaPayService extends IBaseService<TaPay> {
     void refund(String client, String clientId, TaOrder taOrder) throws Exception;
 
     void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) throws Exception;
+
+    AlipayTradeAppPayResponse createAliPay(String client, String clientId, TaOrder taOrder) throws Exception;
+
+    void notifyOrder(Map<String, String> params) throws Exception;
+
+    void refundNotifyOrder(Map<String, String> params) throws Exception;
 }

src/main/java/com/yunzhi/nanyang/service/impl/SysAliPayConfigServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.yunzhi.nanyang.entity.SysAliPayConfig;
+import com.yunzhi.nanyang.mapper.SysAliPayConfigMapper;
+import com.yunzhi.nanyang.service.ISysAliPayConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 阿里支付配置 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+@Service
+public class SysAliPayConfigServiceImpl extends ServiceImpl<SysAliPayConfigMapper, SysAliPayConfig> implements ISysAliPayConfigService {
+
+}

src/main/java/com/yunzhi/nanyang/service/impl/SysWxPayConfigServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.yunzhi.nanyang.entity.SysWxPayConfig;
+import com.yunzhi.nanyang.mapper.SysWxPayConfigMapper;
+import com.yunzhi.nanyang.service.ISysWxPayConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 微信支付配置 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-06-22
+ */
+@Service
+public class SysWxPayConfigServiceImpl extends ServiceImpl<SysWxPayConfigMapper, SysWxPayConfig> implements ISysWxPayConfigService {
+
+}

src/main/java/com/yunzhi/nanyang/service/impl/TaPayServiceImpl.java

@@ -1,5 +1,10 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
+import com.alipay.api.domain.AlipayTradeRefundModel;
+import com.alipay.api.response.AlipayTradeAppPayResponse;
+import com.alipay.api.response.AlipayTradeRefundResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
@@ -9,10 +14,8 @@ import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.constant.WxPayErrorCode;
 import com.github.binarywang.wxpay.exception.WxPayException;
-import com.yunzhi.nanyang.common.Constants;
-import com.yunzhi.nanyang.common.DateUtils;
-import com.yunzhi.nanyang.common.StringUtils;
-import com.yunzhi.nanyang.common.WxPayUtils;
+import com.yunzhi.nanyang.common.*;
+import com.yunzhi.nanyang.common.alipay.AlipayService;
 import com.yunzhi.nanyang.entity.TaAccount;
 import com.yunzhi.nanyang.entity.TaAccountLog;
 import com.yunzhi.nanyang.entity.TaOrder;
@@ -26,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -49,24 +53,14 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     @Autowired
     TaAccountMapper taAccountMapper;
 
+    @Autowired
+    AlipayService alipayService;
+
     @Override
-    public WxPayUnifiedOrderV3Result createPay(String client, String clientId, TaOrder taOrder) throws Exception {
+    public WxPayUnifiedOrderV3Result createWxPay(String client, String clientId, TaOrder taOrder) throws Exception {
         TaPay taPay = getByOrderNo(taOrder.getOrderNo());
         if (null == taPay) {
-            taPay = new TaPay();
-            taPay.setOrderId(taOrder.getOrderId());
-            taPay.setOrderNo(taOrder.getOrderNo());
-            taPay.setPersonId(taOrder.getPersonId());
-            taPay.setCharges(taOrder.getCharges());
-
-            if (taOrder.getTypeName().length() > 127) {
-                taPay.setDescription(taOrder.getTypeName().substring(0, 127));
-            } else {
-                taPay.setDescription(taOrder.getTypeName());
-            }
-
-            taPay.setPayType(taOrder.getPayType());
-            taPay.setStatus(Constants.PAY_READY);
+            taPay = initPayByOrder(taOrder);
         }
 
         try {
@@ -83,20 +77,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
 
             boolean isPaid = WxPayErrorCode.UnifiedOrder.ORDERPAID.equals(e.getErrCode());
             if (isPaid) {
-                // 如果订单已支付
-                taPay.setStatus(Constants.PAY_PAID);
-                taPay.setPayDate(LocalDateTime.now());
-                if (StringUtils.isEmpty(taPay.getPayId())) {
-                    taPay.setPayId(StringUtils.uuid());
-                    if (!save(taPay)) {
-                        throw new Exception("系统出错请重试");
-                    }
-                } else {
-                    updateById(taPay);
-                }
-                taOrderMapper.updatePayStatus(taPay.getOrderId(), Constants.PAY_PAID);
-                // 插入账户流水
-                insertAccount(taPay, taOrder.getOrgId(), Constants.ACCOUNT_INCOME, Constants.ACCOUNT_ORDER_PAY);
+                updateOrderPay(taPay, taOrder, DateUtils.now(), true, null);
             }
 
             throw e;
@@ -139,26 +120,30 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
 
     @Override
     public void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result) throws Exception {
-        TaPay orderPay = getByOrderNo(result.getOutTradeNo());
-        if (orderPay.getStatus() != Constants.PAY_READY) {
-            return;
-        }
-
+        String orderNo = result.getOutTradeNo();
         boolean isSuccess = WxPayConstants.ResultCode.SUCCESS.equals(result.getTradeState());
+        LocalDateTime payTime = DateUtils.from(result.getSuccessTime(), DateTimeFormatter.ISO_DATE_TIME);
+        String message = result.getTradeStateDesc();
+        notifyOrder(orderNo, isSuccess, payTime, message);
+    }
 
-        orderPay.setPayDate(DateUtils.from(result.getSuccessTime(), DateTimeFormatter.ISO_DATE_TIME));
-        orderPay.setStatus(isSuccess ? Constants.PAY_PAID : Constants.PAY_FAIL);
-        orderPay.setMessage(isSuccess ? null : result.getTradeStateDesc());
-        baseMapper.updateById(orderPay);
-
-        // 更新订单状态
-        if (isSuccess) {
-            TaOrder taOrder = taOrderMapper.selectById(orderPay.getOrderId());
-            taOrderMapper.updatePayStatus(orderPay.getOrderId(), Constants.PAY_PAID);
+    @Override
+    public void notifyOrder(Map<String, String> params) throws Exception {
+        String orderNo = params.get("out_trade_no");
+        LocalDateTime payTime = DateUtils.from(params.get("gmt_payment"), "yyyy-MM- dd HH:mm:ss");
+        boolean isSuccess = "TRADE_SUCCESS".equals(params.get("trade_status"));
+        String message = params.get("trade_status");
+        notifyOrder(orderNo, isSuccess, payTime, message);
+    }
 
-            // 插入账户流水
-            insertAccount(orderPay, taOrder.getOrgId(), Constants.ACCOUNT_INCOME, Constants.ACCOUNT_ORDER_PAY);
+    private void notifyOrder(String orderNo, boolean isSuccess, LocalDateTime payTime, String message) throws Exception {
+        TaPay orderPay = getByOrderNo(orderNo);
+        if (orderPay.getStatus() != Constants.PAY_READY) {
+            return;
         }
+        TaOrder taOrder = taOrderMapper.selectById(orderPay.getOrderId());
+
+        updateOrderPay(orderPay, taOrder, payTime, isSuccess, message);
     }
 
     @Override
@@ -186,16 +171,33 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
             taPay.setStatus(Constants.PAY_READY);
         }
 
-        WxPayRefundV3Request request = new WxPayRefundV3Request();
-        request.setOutTradeNo(origin.getOrderNo()); // 原单号
-        request.setOutRefundNo(taPay.getOrderNo()); // 退款单号
-        WxPayRefundV3Request.Amount amount = new  WxPayRefundV3Request.Amount();
-        amount.setTotal(taPay.getCharges());
-        amount.setRefund(taPay.getCharges());
-        amount.setCurrency("CNY");
-        request.setAmount(amount);
+        // 是否微信支付
+        boolean isWxpay = "wx".equals(taOrder.getPayType());
+        if (isWxpay) {
+            WxPayRefundV3Request request = new WxPayRefundV3Request();
+            request.setOutTradeNo(origin.getOrderNo()); // 原单号
+            request.setOutRefundNo(taPay.getOrderNo()); // 退款单号
+            WxPayRefundV3Request.Amount amount = new  WxPayRefundV3Request.Amount();
+            amount.setTotal(taPay.getCharges());
+            amount.setRefund(taPay.getCharges());
+            amount.setCurrency("CNY");
+            request.setAmount(amount);
+
+            wxPayUtils.refund(request, client);
+        } else {
+            AlipayTradeRefundModel model = new AlipayTradeRefundModel();
+            model.setOutTradeNo(origin.getOrderNo());
+            model.setOutRequestNo(taPay.getOrderNo());
+            model.setRefundAmount(MathUtils.formatFloat(taPay.getCharges() / 100f, "0.00"));
+            AlipayTradeRefundResponse refundResponse = alipayService.refund(model, client);
+            if (null == refundResponse) {
+                throw new Exception("初始化支付宝客户端错误");
+            }
+            if (!refundResponse.isSuccess()) {
+                throw new Exception(refundResponse.getSubMsg());
+            }
+        }
 
-        wxPayUtils.refund(request, client);
         if (StringUtils.isEmpty(taPay.getPayId())) {
             // 退款申请中 ...
             taOrder.setPayStatus(Constants.PAY_REFUNDING);
@@ -210,10 +212,28 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
 
     @Override
     public void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) throws Exception {
-        TaPay taPay = getByOrderNo(result.getOutRefundNo());
+        String refundNo = result.getOutRefundNo();
+        LocalDateTime refundTime = DateUtils.from(result.getSuccessTime(), DateTimeFormatter.ISO_DATE_TIME);
+        boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(result.getRefundStatus());
+        String message = result.getRefundStatus();
+        refundNotifyOrder(refundNo, isSuccess, refundTime, message);
+    }
+
+
+    @Override
+    public void refundNotifyOrder(Map<String, String> params) throws Exception {
+        String orderNo = params.get("out_trade_no");
+        String refundNo = "R-"+ orderNo;
+        LocalDateTime refundTime = DateUtils.from(params.get("gmt_refund"), "yyyy-MM- dd HH:mm:ss");
+        boolean isSuccess = "TRADE_SUCCESS".equals(params.get("trade_status"));
+        String message = params.get("trade_status");
+        refundNotifyOrder(refundNo, isSuccess, refundTime, message);
+    }
+
+    private void refundNotifyOrder(String refundNo, boolean isSuccess, LocalDateTime refundTime, String message) throws Exception {
+        TaPay taPay = getByOrderNo(refundNo);
         if (null == taPay) {
-            log.error("退款通知处理失败: 单号 " + result.getOutRefundNo());
-            log.error(result.toString());
+            log.error("退款通知处理失败: 单号 " + refundNo);
             return;
         }
 
@@ -221,12 +241,18 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
             return;
         }
 
-        boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(result.getRefundStatus());
-
-        taPay.setPayDate(DateUtils.from(result.getSuccessTime(), DateTimeFormatter.ISO_DATE_TIME));
+        taPay.setPayDate(refundTime);
         taPay.setStatus(isSuccess ? Constants.PAY_PAID : Constants.PAY_FAIL);
-        taPay.setMessage(isSuccess ? null : result.getRefundStatus());
-        baseMapper.updateById(taPay);
+        taPay.setMessage(message);
+
+        if (StringUtils.isEmpty(taPay.getPayId())) {
+            taPay.setPayId(StringUtils.uuid());
+            if (!save(taPay)) {
+                throw new Exception("系统出错请重试");
+            }
+        } else {
+            updateById(taPay);
+        }
 
         // 更新订单状态
         if (isSuccess) {
@@ -241,6 +267,76 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
         }
     }
 
+    @Override
+    public AlipayTradeAppPayResponse createAliPay(String client, String clientId, TaOrder taOrder) throws Exception {
+        TaPay taPay = getByOrderNo(taOrder.getOrderNo());
+        if (null == taPay) {
+            taPay = initPayByOrder(taOrder);
+        }
+
+        try {
+            AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+            model.setSubject (taPay.getDescription());
+            model.setOutTradeNo (taPay.getOrderNo());
+            model.setTotalAmount (MathUtils.formatFloat(taPay.getCharges() / 100f, "0.00"));
+            AlipayTradeAppPayResponse response = alipayService.createOrder(model, client);
+            if (null == response) {
+                throw new Exception("初始化支付宝客户端错误");
+            }
+
+            if (!response.isSuccess()) {
+                if ("ACQ.TRADE_HAS_SUCCESS".equals(response.getSubCode())) {
+                    // 如果是已经支付成功的
+                    updateOrderPay(taPay, taOrder, DateUtils.now(), true, null);
+                    throw new Exception("当前订单已支付");
+                } else {
+                    throw new Exception(response.getSubMsg());
+                }
+            }
+
+            return response;
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    private void updateOrderPay(TaPay taPay, TaOrder taOrder, LocalDateTime payDate, boolean isSuccess, String errorMessage) throws Exception {
+        taPay.setPayDate(payDate);
+        taPay.setStatus(isSuccess ? Constants.PAY_PAID : Constants.PAY_FAIL);
+        taPay.setMessage(errorMessage);
+        baseMapper.updateById(taPay);
+
+        // 更新订单状态
+        if (isSuccess) {
+            taOrderMapper.updatePayStatus(taPay.getOrderId(), Constants.PAY_PAID);
+
+            // 插入账户流水
+            insertAccount(taPay, taOrder.getOrgId(), Constants.ACCOUNT_INCOME, Constants.ACCOUNT_ORDER_PAY);
+        } else {
+            taOrderMapper.updatePayStatus(taPay.getOrderId(), Constants.PAY_FAIL);
+        }
+    }
+
+    private TaPay initPayByOrder(TaOrder taOrder) {
+        TaPay taPay = new TaPay();
+        taPay.setOrderId(taOrder.getOrderId());
+        taPay.setOrderNo(taOrder.getOrderNo());
+        taPay.setPersonId(taOrder.getPersonId());
+        taPay.setCharges(taOrder.getCharges());
+
+        if (taOrder.getTypeName().length() > 127) {
+            taPay.setDescription(taOrder.getTypeName().substring(0, 127));
+        } else {
+            taPay.setDescription(taOrder.getTypeName());
+        }
+
+        taPay.setPayType(taOrder.getPayType());
+        taPay.setStatus(Constants.PAY_READY);
+
+        return taPay;
+    }
+
     private void insertAccount(TaPay taPay, String orgId, Integer feeType, String chargeType) throws Exception {
         TaAccount taAccount = iTaAccountService.getUserAccount(orgId);
         String accountId = taAccount.getAccountId();

src/main/resources/application-dev.yml

@@ -15,3 +15,13 @@ logging:
     root: info
     springfox: info
 
+aliPay:
+  appid: 2019053065353839
+  private-key: E:/work/nanyang/sevice/src/main/resources/cert/rsa-private.txt
+  cert-path: E:/work/nanyang/sevice/src/main/resources/cert/appCertPublicKey_2019053065353839.crt
+  public-cert-path: E:/work/nanyang/sevice/src/main/resources/cert/alipayCertPublicKey_RSA2.crt
+  root-cert-path: E:/work/nanyang/sevice/src/main/resources/cert/alipayRootCert.crt
+  api-url: https://openapi.alipaydev.com/gateway.do
+  notify-url: http://127.0.0.1:8080/api/callback/alipay/pay
+  auth-url: https://openauth.alipaydev.com/oauth2/appToAppAuth.htm
+  auth-callback: https://app.xnsport.cn/callback

src/main/resources/application-prod.yml

@@ -5,7 +5,17 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/dianyang_colmo?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: dianyang_colmo
-    password: dianyang_colmo@ABC123
+    url: jdbc:mysql://110.40.183.156:3306/nanyang_machinery?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: nanyang_machinery
+    password: nanyang_machinery@ABCD1234
 
+aliPay:
+  appid: 2021001190647352
+  private-key: /opt/niucai/cert/rsa-private.txt
+  cert-path: /opt/niucai/cert/appCertPublicKey_2021001196673227.crt
+  public-cert-path: /opt/niucai/cert/alipayCertPublicKey_RSA2.crt
+  root-cert-path: /opt/niucai/cert/alipayRootCert.crt
+  api-url: https://openapi.alipay.com/gateway.do
+  notify-url: https://app.xnsport.cn/api/callback/alipay/pay
+  auth-url: https://openauth.alipay.com/oauth2/appToAppAuth.htm
+  auth-callback: https://app.xnsport.cn/callback

src/main/resources/application.yml

@@ -69,6 +69,12 @@ aliyun:
     endpoint: oss-accelerate.aliyuncs.com
     bucketName: yz-shigongli
     bucketURL: https://yz-shigongli.oss-accelerate.aliyuncs.com
+###
+alipay:
+  publicKey:
+  format: json
+  charset: UTF-8
+  sign-type: RSA2
 
 
 ###

src/main/resources/mapper/SysAliPayConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.nanyang.mapper.SysAliPayConfigMapper">
+
+</mapper>

src/main/resources/mapper/SysWxPayConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.nanyang.mapper.SysWxPayConfigMapper">
+
+</mapper>