diff --git a/server/like-front/src/main/java/com/mdd/front/service/IPayService.java b/server/like-front/src/main/java/com/mdd/front/service/IPayService.java index 6f8ea7fc..679683f9 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IPayService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IPayService.java @@ -1,6 +1,5 @@ package com.mdd.front.service; -import com.github.binarywang.wxpay.bean.notify.SignatureHeader; import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result; import com.github.binarywang.wxpay.exception.WxPayException; import com.mdd.front.validate.PaymentValidate; diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java index 9d186d36..f8a90434 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java @@ -53,6 +53,14 @@ public class PayServiceImpl implements IPayService { @Resource DevPayConfigMapper devPayConfigMapper; + /** + * 支付方式 + * + * @author fzr + * @param from 场景 + * @param terminal 总端 + * @return List + */ @Override public List payWay(String from, Integer terminal) { List devPayWays = devPayWayMapper.selectList( @@ -83,6 +91,7 @@ public class PayServiceImpl implements IPayService { /** * 微信支付 * + * @author fzr * @param params 支付参数 * @param terminal 终端 * @throws Exception 异常 @@ -110,7 +119,7 @@ public class PayServiceImpl implements IPayService { // 失效时间 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - Long expireTime = System.currentTimeMillis() + 60 * 1000; + Long expireTime = (System.currentTimeMillis() * 1000) + 1800; String timeExpire = format.format(expireTime) + "+08:00"; // 订单信息