From a30e3cdb44bf150e8fdebbb53fed3c4458c4b93e Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Tue, 16 Nov 2021 19:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=A4=9A?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=88=A0=E9=99=A4redis=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/order/api/XhpcPileOrderController.java | 6 +++--- .../service/impl/XhpcRealTimeOrderServiceImpl.java | 2 +- .../controller/AlipayPaymentController.java | 1 + .../payment/controller/WxPaymentController.java | 1 + .../service/impl/XhpcRechargeOrderServiceImpl.java | 14 ++++++++------ .../impl/XhpcUserAccountStatementServiceImpl.java | 9 +++++++++ 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index c154b6b3..292df67a 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -364,9 +364,9 @@ public class XhpcPileOrderController extends BaseController { R.ok(); } }else{ - Map pushOrder = redisService.getCacheMap("pushOrder:"+orderNo); - xhpcHistoryOrder.setInternetSerialNumber(pushOrder.get("internetSerialNumber").toString()); - xhpcChargeOrder.setOperatorId3rdptyEvcs((String) pushOrder.get("operatorId3rdpty")); +// Map pushOrder = redisService.getCacheMap("pushOrder:"+orderNo); +// xhpcHistoryOrder.setInternetSerialNumber(pushOrder.get("internetSerialNumber").toString()); +// xhpcChargeOrder.setOperatorId3rdptyEvcs((String) pushOrder.get("operatorId3rdpty")); } //结算 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 26a549ee..9d6bcc2d 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -443,7 +443,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService { xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); - redisService.deleteObject("pushOrder:"+xhpcChargeOrder.getSerialNumber()); + // redisService.deleteObject("pushOrder:"+xhpcChargeOrder.getSerialNumber()); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java index 33dbe2bb..060e785f 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java @@ -274,6 +274,7 @@ public class AlipayPaymentController { xhpcUserAccountStatement.setAmount(xhpcRechargeOrder.getAmount()); xhpcUserAccountStatement.setRemainingSum(xhpcAppUser.getBalance()); xhpcUserAccountStatement.setCreateTime(new Date()); + xhpcUserAccountStatement.setRemark("支付宝充值订单！"); xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement); } } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java index 0526c16b..ab06813e 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java @@ -386,6 +386,7 @@ public class WxPaymentController { xhpcUserAccountStatement.setAmount(xhpcRechargeOrder.getAmount()); xhpcUserAccountStatement.setRemainingSum(xhpcAppUser.getBalance()); xhpcUserAccountStatement.setCreateTime(new Date()); + xhpcUserAccountStatement.setRemark("微信充值订单！"); xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement); } } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java index f3c03799..0ac3f4d8 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Map; @@ -87,6 +88,7 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService { xhpcRechargeOrder.setAmount(amount); xhpcRechargeOrder.setRechargeOrderNumber(orderNumber); xhpcRechargeOrder.setType(Integer.parseInt(type)); + xhpcRechargeOrder.setCreateTime(new Date()); xhpcRechargeOrderMapper.insert(xhpcRechargeOrder); return xhpcRechargeOrder; } @@ -110,12 +112,12 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService { } else { xhpcRechargeOrder.setAlipayNumber(paymentNumber); } - if (StatusConstants.RECHARGE_ORDER_STATUS_SUCCESS == xhpcRechargeOrder.getStatus()) { - Map map = xhpcRechargeOrderMapper.info(rechargeOrderId); - String amount = StringUtils.valueOf(map.get("amount")); - String userId = StringUtils.valueOf(map.get("userId")); - xhpcUserAccountStatementService.add(rechargeOrderId, amount, userId, Integer.parseInt(type)); - } +// if (StatusConstants.RECHARGE_ORDER_STATUS_SUCCESS == xhpcRechargeOrder.getStatus()) { +// Map map = xhpcRechargeOrderMapper.info(rechargeOrderId); +// String amount = StringUtils.valueOf(map.get("amount")); +// String userId = StringUtils.valueOf(map.get("userId")); +// xhpcUserAccountStatementService.add(rechargeOrderId, amount, userId, Integer.parseInt(type)); +// } xhpcRechargeOrderMapper.update(xhpcRechargeOrder); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java index db2e8511..1beee897 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Map; @@ -72,6 +73,14 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(Double.valueOf(balance))); xhpcUserAccountStatement.setRemainingSum(surplus); } + xhpcUserAccountStatement.setCreateTime(new Date()); + if(type==1){ + xhpcUserAccountStatement.setRemark("充值订单！！！"); + }else if(type==2){ + xhpcUserAccountStatement.setRemark("退款订单！！！"); + }else{ + xhpcUserAccountStatement.setRemark("充电订单！！！"); + } xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement); }