xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java
@@ -95,13 +95,14 @@ }else{ voList = baseMapper.getMeditationListByTagId(null, null); } // voList = handlePaidMeditation(voList); if(voList.isEmpty()){ voList = baseMapper.getMeditationListByTagId(null, null); voList = voList.stream().limit(1).collect(Collectors.toList()); } return voList; }else{ voList = baseMapper.getMeditationListByTagId(null, null); voList = voList.stream().limit(1).collect(Collectors.toList()); return voList; } } xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java
@@ -614,7 +614,7 @@ OrderPaymentRecord one1 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId()) .eq(OrderPaymentRecord::getPaymentType, 4).one(); AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord(); appUserWalletRecord.setAppUserId(data.getInviteUserId()); appUserWalletRecord.setAppUserId(one.getAppUserId()); String reason=null; switch (one.getOrderFrom()){ case 1: @@ -648,7 +648,6 @@ } appUserWalletRecord.setReason(reason); appUserWalletRecord.setAmount(one1.getPayAmount()); appUserWalletRecord.setChildAppUserId(one.getAppUserId()); appUserWalletRecord.setOrderId(one.getId()); remoteAppUserService.addBalanceRecord(appUserWalletRecord); }else{ xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/service/impl/OrderServiceImpl.java
@@ -130,6 +130,14 @@ order.setRealPayAmount(meditation.getGeneralPrice()); this.updateById(order); return clientPlaceOrderVO; }else{ // 余额抵扣不完 OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getPaymentType, 4) .eq(OrderPaymentRecord::getOrderId, orderId9).one(); if (one!=null){ one.setPayAmount(meditation.getGeneralPrice().subtract(needPayAmount)); orderPaymentRecordService.updateById(one); } } if (payType==1){ // 微信+余额 @@ -185,6 +193,14 @@ order.setRealPayAmount(course.getGeneralPrice()); this.updateById(order); return clientPlaceOrderVO; }else{ // 余额抵扣不完 OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getPaymentType, 4) .eq(OrderPaymentRecord::getOrderId, orderId8).one(); if (one!=null){ one.setPayAmount(course.getGeneralPrice().subtract(needPayAmount)); orderPaymentRecordService.updateById(one); } } if (payType==1){ // 微信+余额 @@ -193,6 +209,7 @@ // 支付宝+余额 order.setPayType(6); } this.updateById(order); // 创建支付订单 createPayment(payType, orderNo, needPayAmount, courseTitle, description, wxOpenId, orderId8, clientPlaceOrderVO); @@ -319,7 +336,7 @@ // 调用第三方支付获取支付信息 JSONObject payInfo = JuHeFuUtil.createPayment1(orderNo, payType, needPayAmount.toString(), goodsTitle, goodsDesc, IpUtils.getIpAddr(), wxOpenId, "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"); IpUtils.getIpAddr(), wxOpenId, "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback"); // 第三方支付记录 OrderPaymentRecord paymentRecord = new OrderPaymentRecord(); paymentRecord.setOrderId(orderId); @@ -341,7 +358,7 @@ // 调用第三方支付获取支付信息 JSONObject payInfo = JuHeFuUtil.createPayment(orderNo, payType, needPayAmount.toString(), goodsTitle, goodsDesc, IpUtils.getIpAddr(), wxOpenId, "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"); IpUtils.getIpAddr(), wxOpenId, "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback"); // 第三方支付记录 OrderPaymentRecord paymentRecord = new OrderPaymentRecord(); paymentRecord.setOrderId(orderId); xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/utils/JuHeFuUtil.java
@@ -104,7 +104,7 @@ createPaymentCode("CZ19281833123", 1, "0.01", "充值", "充值", "127.0.0.1", "openId", "https://xq.xqzhihui.com/api/order/client/order/order/base/callback"); "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/order/client/order/order/base/callback"); // String orderNo = OrderUtil.getOrderNoForPrefix("User"); // createUser("usera12937812893718297391"); //// balancePay("12345678912", "0.01", "http://www.baidu.com");
