From af1b83edc656b1731f8101b8cfe8a24f4cb1758e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 十二月 2022 22:23:55 +0800
Subject: [PATCH] 核销积分

---
 service-acct/src/main/java/com/java110/acct/cmd/integral/UseIntegralCmd.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/service-acct/src/main/java/com/java110/acct/cmd/integral/UseIntegralCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/integral/UseIntegralCmd.java
index a972d08..4d5e603 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/integral/UseIntegralCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/integral/UseIntegralCmd.java
@@ -6,6 +6,7 @@
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.account.AccountDto;
 import com.java110.dto.integralSetting.IntegralSettingDto;
 import com.java110.dto.user.UserDto;
@@ -66,12 +67,15 @@
         List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
         Assert.listOnlyOne(accountDtos, "璐︽埛涓嶅瓨鍦�");
 
-
+        double settingMoney = Double.parseDouble(integralSettingDtos.get(0).getMoney());
+        if(settingMoney == 0){
+            settingMoney = 1;
+        }
         BigDecimal useMoneyDec = new BigDecimal(Double.parseDouble(reqJson.getString("useMoney")));
-        useMoneyDec = useMoneyDec.divide(new BigDecimal(Double.parseDouble(integralSettingDtos.get(0).getMoney()))).setScale(2, BigDecimal.ROUND_HALF_UP);
+        useMoneyDec = useMoneyDec.divide(new BigDecimal(settingMoney),2, BigDecimal.ROUND_HALF_UP);
 
         long quantity = new Double(Math.ceil(useMoneyDec.doubleValue())).longValue();
-        long oldQuantity = Long.parseLong(accountDtos.get(0).getAmount());
+        long oldQuantity = new Double(Double.parseDouble(accountDtos.get(0).getAmount())).longValue();
 
         if (quantity > oldQuantity) {
             throw new CmdException("褰撳墠绉垎涓嶅(" + oldQuantity + ")");
@@ -102,6 +106,7 @@
         integralUserDetailPo.setUserName(userDtos.get(0).getName());
         integralUserDetailPo.setTel(userDtos.get(0).getTel());
         integralUserDetailPo.setCommunityId(reqJson.getString("communityId"));
+        integralUserDetailPo.setUoId(GenerateCodeFactory.getGeneratorId("11"));
         integralUserDetailV1InnerServiceSMOImpl.saveIntegralUserDetail(integralUserDetailPo);
     }
 }

--
Gitblit v1.8.0