打印日志

jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java

@@ -846,7 +846,9 @@ public class AdapayService {
         String id = (String) settleCount.get("id");
 
         // 发起支付手续费请求 inMemberId为0表示本商户
-        createBalancePaymentRequest(adapayAccountBalanceVO.getAdapayMemberId(), Constants.ZERO, feeAmt.toString(), "提现手续费", "提现单号:" + id, config.getWechatAppId());
+        if (BigDecimal.ZERO.compareTo(feeAmt) > 0) {
+            createBalancePaymentRequest(adapayAccountBalanceVO.getAdapayMemberId(), Constants.ZERO, feeAmt.toString(), "提现手续费", "提现单号:" + id, config.getWechatAppId());
+        }
 
         // 保存提现记录
         ClearingWithdrawInfo record = new ClearingWithdrawInfo();

jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java

@@ -215,16 +215,16 @@ public class JsowellTask {
         }
 
         // 调分账方法
-        pileMerchantInfos.parallelStream().forEach(merchant -> {
+        // pileMerchantInfos.parallelStream().forEach(merchant -> {
-            try {
+        //     try {
-                orderBasicInfoService.orderSplittingOperations(merchant.getId() + "", yesterday.toString());
+        //         orderBasicInfoService.orderSplittingOperations(merchant.getId() + "", yesterday.toString());
-            } catch (Exception e) {
+        //     } catch (Exception e) {
-                log.error("处理订单分账异常, merchantId:{}", merchant.getId(), e);
+        //         log.error("处理订单分账异常, merchantId:{}", merchant.getId(), e);
-            }
+        //     }
-        });
+        // });
 
 
-        // TODO 换为实时分账后, 此方法改为 自动提现并计算前一天的分账信息
+        // 换为实时分账后, 此方法改为 自动提现并计算前一天的分账信息
         pileMerchantInfos.parallelStream().forEach(merchant -> {
         	automaticPayouts(merchant.getId() + "");
         });

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java

@@ -11,12 +11,13 @@ import com.jsowell.common.enums.parkplatform.ParkingPlatformEnum;
 import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.enums.ykc.PileConnectorStatusEnum;
-import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.enums.ykc.StartModeEnum;
-import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
-import com.jsowell.pile.domain.*;
+import com.jsowell.pile.domain.CarCouponRecord;
+import com.jsowell.pile.domain.OrderBasicInfo;
+import com.jsowell.pile.domain.PileBasicInfo;
+import com.jsowell.pile.domain.ThirdPartyStationRelation;
 import com.jsowell.pile.dto.PushRealTimeInfoDTO;
 import com.jsowell.pile.dto.PushStationInfoDTO;
 import com.jsowell.pile.dto.ThirdPartyCommonStartChargeDTO;
@@ -689,11 +690,13 @@ public class CommonService {
         String sumChargingTime = realTimeMonitorData.getSumChargingTime(); // 充电时长
         String chargingDegree = realTimeMonitorData.getChargingDegree(); // 充电度数
         String conditionType = String.valueOf(chargeParkingDiscount.getConditionType());
-
         // 判断订单创建时间,是否在优惠时间段内
         LocalTime createLocalTime = DateUtils.date2LocalDateTime(orderBasicInfo.getCreateTime()).toLocalTime();
         LocalTime startTime = chargeParkingDiscount.getStartTime();
         LocalTime endTime = chargeParkingDiscount.getEndTime();
+        log.info("站点:{}绑定停车券, 订单号:{}, 门槛类型:{}, 门槛值:{}, 优惠时间段:{}, 充电度数:{}, 充电时长:{}, 订单创建时间:{}",
+                orderBasicInfo.getStationId(), orderBasicInfo.getOrderCode(), conditionType, chargeParkingDiscount.getConditionValue(),
+                startTime.toString() + endTime.toString(), chargingDegree, sumChargingTime, DateUtils.formatDateTime(orderBasicInfo.getCreateTime()));
         // startTime等于endTime,shuo则不需要判断, 如果startTime不等于endTime,则需要判断订单创建时间是否在优惠时间段内
         if (!StringUtils.equals(startTime.toString(), endTime.toString())) {
             if (createLocalTime.isBefore(startTime) || createLocalTime.isAfter(endTime)) {
@@ -718,14 +721,15 @@ public class CommonService {
         }
         if (!flag) {
             // 不满足发券条件
-            log.info("{} 该订单不满足发券条件", orderBasicInfo.getOrderCode());
+            log.info("{}该订单不满足发券条件, 门槛类型(1电量,2时长):{}, 门槛值:{}, 充电度数:{}, 充电时长:{}",
+                    orderBasicInfo.getOrderCode(), conditionType, chargeParkingDiscount.getConditionValue(), chargingDegree, sumChargingTime);
             return;
         }
         // 是否已经发券
         String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderBasicInfo.getOrderCode();
         Object cacheObject = redisCache.getCacheObject(redisKey);
         if (cacheObject != null) {
-            log.info("{} 该订单已经发券", orderBasicInfo.getOrderCode());
+            log.info("{}该订单已经发券", orderBasicInfo.getOrderCode());
             return;
         }
         // 绑定停车券