总余额修改 2025年2月25日13:44:52

modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonAssetServiceImpl.java

@@ -352,7 +352,7 @@ public class QyCarbonAssetServiceImpl implements QyCarbonAssetService {
 
     private static void calBalanceAndUnitPrice(List<QyCarbonAssetDTO> carbonList) {
         //总数
-        BigDecimal sum = carbonList.stream().filter(s -> !"1".equals(s.getState()))
+        BigDecimal sum = carbonList.stream().filter(s -> "2".equals(s.getState())||"3".equals(s.getState()))
                 .map(QyCarbonAssetDTO::getTotal)
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         //核销和卖出

modules/qingyuan/src/main/java/com/thing/qingyuan/carbon/service/impl/QyCarbonQuotaInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.thing.qingyuan.carbon.entity.QyCarbonQuotaInfoEntity;
 import com.thing.qingyuan.carbon.mapper.QyCarbonQuotaInfoMapper;
 import com.thing.qingyuan.carbon.service.QyCarbonQuotaInfoService;
 import com.thing.qingyuan.carbon.util.Constant;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +26,9 @@ public class QyCarbonQuotaInfoServiceImpl extends BaseServiceImpl<QyCarbonQuotaI
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params) {
         QueryWrapper queryWrapper = new QueryWrapper();
+        if(MapUtils.isEmpty(params)){
+          return queryWrapper;
+        }
         if (params.containsKey("state")) {
             queryWrapper.eq("state", params.get("state"));
         }