1.4.5 bug修复版本：修复商品详情优惠券不显示,修复后台发货与退款判断冲突,修复公众号提示服务器出现故障的问题

yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java

@@ -81,6 +81,8 @@ public interface YxStoreOrderService extends BaseService<YxStoreOrder> {
 
     WxPayMpOrderResult wxPay(String orderId) throws WxPayException;
 
+    String aliPay(String orderId) throws Exception;
+
     void delCacheOrderInfo(int uid, String key);
 
     YxStoreOrder createOrder(int uid, String key, OrderParam param);

yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java

@@ -3,6 +3,8 @@ package co.yixiang.modules.order.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.*;
 import co.yixiang.common.constant.CommonConstant;
+import co.yixiang.domain.AlipayConfig;
+import co.yixiang.domain.vo.TradeVo;
 import co.yixiang.exception.ErrorRequestException;
 import co.yixiang.modules.activity.service.YxStoreCombinationService;
 import co.yixiang.modules.activity.service.YxStorePinkService;
@@ -50,6 +52,7 @@ import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo;
 import co.yixiang.modules.wechat.entity.YxWechatTemplate;
 import co.yixiang.mp.service.WxMpTemplateMessageService;
 import co.yixiang.modules.wechat.service.YxWechatTemplateService;
+import co.yixiang.service.AlipayService;
 import co.yixiang.utils.OrderUtil;
 import co.yixiang.utils.RedisUtil;
 import com.alibaba.fastjson.JSON;
@@ -159,6 +162,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
     @Autowired
     private YxExpressService expressService;
 
+    @Autowired
+    private AlipayService alipayService;
+
 
     /**
      * 订单退款
@@ -909,6 +915,27 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
 
     }
 
+
+    /**
+     * 支付宝支付
+     * @param orderId,支付宝支付 本系统已经集成，请自行根据下面找到代码整合下即可
+     * @return
+     */
+    @Override
+    public String aliPay(String orderId) throws Exception {
+        AlipayConfig alipay = alipayService.find();
+        if(ObjectUtil.isNull(alipay)) throw new ErrorRequestException("请先配置支付宝");
+        YxStoreOrderQueryVo orderInfo = getOrderInfo(orderId,0);
+        if(ObjectUtil.isNull(orderInfo)) throw new ErrorRequestException("订单不存在");
+        if(orderInfo.getPaid() == 1) throw new ErrorRequestException("该订单已支付");
+
+        if(orderInfo.getPayPrice().doubleValue() <= 0) throw new ErrorRequestException("该支付无需支付");
+        TradeVo trade = new TradeVo();
+        trade.setOutTradeNo(orderId);
+        String payUrl = alipayService.toPayAsWeb(alipay,trade);
+        return payUrl;
+    }
+
     /**
      * 微信支付
      * @param orderId

yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java

@@ -167,7 +167,8 @@ public class StoreOrderController extends BaseController {
         if(StrUtil.isNotEmpty(orderId)){
             switch (param.getPayType()){
                 case "weixin":
-                    if(param.getFrom().equals("weixinh5")){
+                    if(param.getFrom().equals("weixinh5")){//此此为支付宝支付
+
                         throw new ErrorRequestException("H5模式不支持微信支付，请用公众号演示");
                     }
                      try {

yshop-api/src/main/resources/config/application-prod.yml

@@ -4,7 +4,7 @@ spring:
     druid:
       type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&useSSL=false
       username: yshop
       password: