wuxw пре 3 година
родитељ
комит
bcb0a01bde

+ 2 - 2
service-acct/src/main/java/com/java110/acct/smo/impl/AccountInnerServiceSMOImpl.java

@@ -137,7 +137,7 @@ public class AccountInnerServiceSMOImpl extends BaseServiceSMO implements IAccou
             //在账户增加
             double amount = Double.parseDouble(accounts.get(0).getAmount());
             BigDecimal amountBig = new BigDecimal(amount);
-            amount = amountBig.add(new BigDecimal(accountDetailPo.getAmount())).doubleValue();
+            amount = amountBig.add(new BigDecimal(Double.parseDouble(accountDetailPo.getAmount()))).doubleValue();
             AccountPo accountPo = new AccountPo();
             accountPo.setObjId(accountDetailPo.getObjId());
             accountPo.setAcctId(accountDetailPo.getAcctId());
@@ -195,7 +195,7 @@ public class AccountInnerServiceSMOImpl extends BaseServiceSMO implements IAccou
             //在账户增加
             double amount = Double.parseDouble(accounts.get(0).getAmount());
             BigDecimal amountBig = new BigDecimal(amount);
-            amount = amountBig.subtract(new BigDecimal(accountDetailPo.getAmount())).doubleValue();
+            amount = amountBig.subtract(new BigDecimal(Double.parseDouble(accountDetailPo.getAmount()))).doubleValue();
             if(amount < 0){
                 throw new IllegalArgumentException("余额不足");
             }

+ 1 - 1
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java

@@ -756,7 +756,7 @@ public class PayFeeCmd extends Cmd {
             } else {
                 redepositAmount = receivedAmount;//抵扣金额
             }
-            if (!StringUtil.isEmpty(param.getString("acctType")) && param.getString("acctType").equals("2004")) {
+            if ("2004".equals(param.getString("acctType"))) {
                 //获取最大抵扣积分
                 BigDecimal maximumNumber = new BigDecimal(param.getString("maximumNumber"));
                 //获取积分抵扣

+ 5 - 8
springboot/src/test/java/com/java110/AppTest.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.utils.util.DateUtil;
 import org.junit.Test;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -23,13 +24,9 @@ public class AppTest
     public void shouldAnswerWithTrue()
     {
 
-       List<String> abc = new ArrayList<>();
-        abc.add("123123");
-        abc.add("123123");
-        abc.add("123123");
-        abc.add("123123");
-        JSONObject data = new JSONObject();
-        data.put("pccIds",abc);
-        System.out.println(data.toJSONString());
+        double amount = Double.parseDouble("0.6");
+        BigDecimal amountBig = new BigDecimal(amount);
+        amount = amountBig.subtract(new BigDecimal(Double.parseDouble("0.6"))).doubleValue();
+        System.out.println(amount);
     }
 }