diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderTaskController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderTaskController.java index bc78e96..beec244 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderTaskController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderTaskController.java @@ -40,10 +40,9 @@ public class OrderTaskController extends BaseController { final OrderParam p = new OrderParam(); p.setOrderStatus(0); p.setExpirationTime(DateUtil.date()); - System.out.println("p = " + p); final List list = orderMapper.selectExpirationOrder(p); - System.out.println("自动处理过期订单任务 = " + list); list.forEach(d -> { + System.out.println("自动处理过期订单任务 = " + d); orderMapper.updateExpirationOrder(d.getOrderId()); }); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java index 169d31c..22efe4c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java @@ -125,7 +125,7 @@ public class OrderServiceImpl extends ServiceImpl implements // 计算金额 BigDecimal decimal = order.getTotalPrice(); - final BigDecimal multiply = decimal.multiply(new BigDecimal(10)); + final BigDecimal multiply = decimal.multiply(new BigDecimal(100)); // 将 BigDecimal 转换为 Integer Integer money = multiply.intValue(); String privateKey = uploadPath.concat("/file").concat(payment.getApiclientKey()); // 秘钥证书 @@ -154,22 +154,27 @@ public class OrderServiceImpl extends ServiceImpl implements request.setAppid(mpWx.getString("appId")); request.setMchid(payment.getMchId()); request.setDescription(order.getComments()); - request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-pay/notify/" + order.getTenantId()); // 默认回调地址 request.setOutTradeNo(order.getOrderNo()); request.setAttach(order.getTenantId().toString()); final Payer payer = new Payer(); payer.setOpenid(order.getOpenid()); request.setPayer(payer); + // 测试环境 + if(active.equals("dev")){ + amount.setTotal(1); + request.setAmount(amount); + request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-pay/notify/" + order.getTenantId()); // 默认回调地址 + } + // 生成环境 + if(active.equals("prod")){ + amount.setTotal(10); + request.setAmount(amount); + request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-pay/notify/" + order.getTenantId()); // 默认回调地址 + } if (StrUtil.isNotBlank(payment.getNotifyUrl())) { // 后台配置的回调地址 request.setNotifyUrl(payment.getNotifyUrl().concat("/").concat(order.getTenantId().toString())); } - // 测试金额 - if(active.equals("dev")){ - amount.setTotal(1); - request.setAmount(amount); - } - System.out.println("request = " + request); PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request); orderInfo.put("provider", "wxpay"); orderInfo.put("timeStamp", response.getTimeStamp());