From d33e2d4a6e82487532251e8ec6e32b06de442d9f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 07 八月 2023 21:57:27 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/adapt/payment/integral/PayFeeGiftIntegralAdapt.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/payment/integral/PayFeeGiftIntegralAdapt.java b/service-job/src/main/java/com/java110/job/adapt/payment/integral/PayFeeGiftIntegralAdapt.java
index 712a1c2..11fa5e9 100644
--- a/service-job/src/main/java/com/java110/job/adapt/payment/integral/PayFeeGiftIntegralAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/payment/integral/PayFeeGiftIntegralAdapt.java
@@ -6,19 +6,16 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.IComputeFeeSMO;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.couponPropertyPool.CouponPropertyPoolDto;
-import com.java110.dto.couponPropertyPoolConfig.CouponPropertyPoolConfigDto;
-import com.java110.dto.couponPropertyUser.CouponPropertyUserDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.integralRuleConfig.IntegralRuleConfigDto;
-import com.java110.dto.integralRuleFee.IntegralRuleFeeDto;
-import com.java110.dto.logSystemError.LogSystemErrorDto;
+import com.java110.dto.integral.IntegralRuleConfigDto;
+import com.java110.dto.integral.IntegralRuleFeeDto;
+import com.java110.dto.log.LogSystemErrorDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.entity.order.Business;
+import com.java110.dto.system.Business;
import com.java110.intf.acct.*;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRoomV1InnerServiceSMO;
@@ -28,14 +25,10 @@
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.po.account.AccountPo;
-import com.java110.po.accountDetail.AccountDetailPo;
-import com.java110.po.couponPropertyPool.CouponPropertyPoolPo;
-import com.java110.po.couponPropertyPoolDetail.CouponPropertyPoolDetailPo;
-import com.java110.po.couponPropertyUser.CouponPropertyUserPo;
-import com.java110.po.fee.PayFeeConfigPo;
+import com.java110.po.account.AccountDetailPo;
import com.java110.po.fee.PayFeeDetailPo;
-import com.java110.po.integralGiftDetail.IntegralGiftDetailPo;
-import com.java110.po.logSystemError.LogSystemErrorPo;
+import com.java110.po.integral.IntegralGiftDetailPo;
+import com.java110.po.log.LogSystemErrorPo;
import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.lock.DistributedLock;
@@ -44,9 +37,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -157,6 +148,11 @@
Assert.listOnlyOne(feeDtos, "鏈煡璇㈠埌璐圭敤淇℃伅");
+ if(businessPayFeeDetail.containsKey("receivedAmount")
+ && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
+ return ;
+ }
+
IntegralRuleFeeDto integralRuleFeeDto = new IntegralRuleFeeDto();
integralRuleFeeDto.setFeeConfigId(feeDtos.get(0).getConfigId());
integralRuleFeeDto.setCurTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -237,7 +233,7 @@
//鍚戠Н鍒嗚处鎴蜂腑鍏呭�肩Н鍒�
AccountDto accountDto = new AccountDto();
accountDto.setObjId(ownerId);
- accountDto.setObjType(AccountDto.ACCT_TYPE_INTEGRAL);
+ accountDto.setAcctType(AccountDto.ACCT_TYPE_INTEGRAL);
List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
if (accountDtos == null || accountDtos.size() < 1) {
@@ -261,7 +257,7 @@
} catch (Exception e) {
LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
- logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_COUPON);
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_INTEGRAL);
logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
logger.error("閫氱煡寮傚父", e);
@@ -293,6 +289,7 @@
Assert.listOnlyOne(ownerDtos, "涓氫富涓嶅瓨鍦�");
accountPo.setAcctName(ownerDtos.get(0).getName());
accountPo.setPartId(ownerDtos.get(0).getCommunityId());
+ accountPo.setLink(ownerDtos.get(0).getLink());
accountInnerServiceSMOImpl.saveAccount(accountPo);
List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
return accountDtos;
--
Gitblit v1.8.0