From d82554bc50065657fd01e29b5aa3b6daf70d0d0a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 十一月 2023 17:32:19 +0800
Subject: [PATCH] bug

---
 server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
index 0b0d5fc..5542746 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -33,6 +33,7 @@
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -349,8 +350,7 @@
             //鍙兘鍚屾鏄ㄥぉ10涔嬪墠鐨勬暟鎹�
             Calendar caln = Calendar.getInstance();
             caln.setTime(ydate);
-//            System.out.println(caln.get(Calendar.HOUR_OF_DAY) );
-            if(caln.get(Calendar.HOUR_OF_DAY) <= 10){
+            if(caln.get(Calendar.HOUR_OF_DAY)  > 10){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈�杩戝悓姝ユ椂闂村彧鑳芥埅姝㈠埌鏄ㄥぉ10鐐瑰墠锛�");
             }
         }
@@ -410,12 +410,14 @@
                 //璁$畻鑷杞︽敹鍏ワ紝鍖归厤鏉ヨ嚜鑷杞﹀皬绋嬪簭鐨勬墍鏈夋敮浠樻垚鍔熷拰閫�娆炬垚鍔熺殑閲戦锛屼綔涓鸿嚜琛岃溅鏀跺叆锛堢疮璁℃敹娆鹃噾棰�-绱閫�娆炬垚鍔熼噾棰濓級
                 if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayService.getConfig().getAppId())){
                     //鑷杞︽敹鍏ョ疮璁℃敹娆鹃噾棰�(鏀粯鎴愬姛鎬婚噾棰�-閫�娆炬�婚噾棰濓級
-                    if(StringUtils.equals(detail.getBillType(),"SUCCESS")){
+                    if(StringUtils.equals(info.getTradeState(),"SUCCESS")){
                         //濡傛灉鏄氦鏄�
                         bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee()));
-                    }else  if(StringUtils.equals(info.getTradeType(),"REFUND" )){
+                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
+                    }else  if(StringUtils.equals(info.getTradeState(),"REFUND" )){
                         //濡傛灉閫�娆炬垚鍔燂紝鎵i櫎閫�娆鹃噾棰�
-                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getApplyRefundFee()));
+                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getRefundFee()) );
+                        bill.setBikeFee(bill.getBikeFee().subtract(detail.getCmmsAmt()) );
                     }
                 }
 

--
Gitblit v1.9.3