From a4d873761dd03a74950d05f204171255509bd5fb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 17 六月 2024 16:03:35 +0800
Subject: [PATCH] 修改 bug
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index a120571..f66961f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1524,8 +1524,17 @@
pointsMerchandise.setCash(merchandise.getCash());
pointsMerchandise.setCashPayType(exchangeType.getPayType());
}
+
+ Double m = new BigDecimal((merchandise.getIntegral() == null ? 0 : merchandise.getIntegral())).add((merchandise.getCash() == null ? BigDecimal.ZERO : merchandise.getCash())).doubleValue();
+ if((m * goodsNums) == 0) {
+ pointsMerchandise.setPayStatus(2);
+ pointsMerchandise.setPaymentTime(new Date());
+ }
returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
-
+ if((m * goodsNums) == 0 && pointsMerchandise.getPayStatus() == 2){
+ returnModel.setReturnId(returnId);
+ return ResultUtil.success(returnModel);
+ }
switch (exchangeType.getExchangeType()) {
// 积分
@@ -1944,6 +1953,7 @@
if ("TRADE_SUCCESS".equals(tradeStatus)) {
for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
userPointsMerchandise.setPayStatus(2);
+ userPointsMerchandise.setPaymentTime(new Date());
userPointsMerchandise.setOrderNumber(tradeNo);
userPointsMerchandise.setPayType(2);
userPointsMerchandise.setInsertTime(null);
@@ -2109,6 +2119,7 @@
}
if ("SUCCESS".equals(s)) {
userPointsMerchandise.setPayStatus(2);
+ userPointsMerchandise.setPaymentTime(new Date());
userPointsMerchandise.setOrderNumber(transaction_id);
userPointsMerchandise.setPayType(1);
mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
--
Gitblit v1.7.1