diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 0edd4f868..61fb67d53 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -3,7 +3,10 @@ package com.jsowell.pile.service.impl; import com.google.common.collect.Lists; import com.jsowell.adapay.dto.PaymentConfirmParam; import com.jsowell.adapay.dto.SplitData; +import com.jsowell.common.constant.Constants; import com.jsowell.common.enums.DelFlagEnum; +import com.jsowell.common.enums.adapay.AdapayStatusEnum; +import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.mapper.OrderSplitRecordMapper; import com.jsowell.pile.service.OrderSplitRecordService; @@ -66,28 +69,11 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { String orderCode = param.getOrderCode(); BigDecimal settleAmount = param.getConfirmAmt(); String paymentId = param.getPaymentId(); - // List divMemberList = param.getDivMemberList(); - // for (DivMember divMember : divMemberList) { - // OrderSplitRecord orderSplitRecord = new OrderSplitRecord(); - // orderSplitRecord.setOrderCode(orderCode); - // orderSplitRecord.setStatus(""); - // orderSplitRecord.setSettleAmount(settleAmount); - // orderSplitRecord.setAdapayMemberId(divMember.getMemberId()); - // orderSplitRecord.setPaymentId(paymentId); - // orderSplitRecord.setPaymentConfirmId(paymentConfirmId); - // // orderSplitRecord.setElectricitySplitRatio(divMember.getElectricitySplitRatio()); - // // orderSplitRecord.setElectricitySplitAmount(divMember.getElectricitySplitAmount()); - // // orderSplitRecord.setServiceSplitRatio(divMember.getServiceSplitRatio()); - // // orderSplitRecord.setServiceSplitAmount(divMember.getServiceSplitAmount()); - // orderSplitRecord.setRemark(""); - // orderSplitRecord.setDelFlag(DelFlagEnum.NORMAL.getValue()); - // list.add(orderSplitRecord); - // } for (SplitData splitData : splitDataList) { OrderSplitRecord orderSplitRecord = new OrderSplitRecord(); orderSplitRecord.setOrderCode(orderCode); - orderSplitRecord.setStatus(""); + orderSplitRecord.setStatus(AdapayStatusEnum.SUCCEEDED.getValue()); orderSplitRecord.setSettleAmount(settleAmount); orderSplitRecord.setAdapayMemberId(splitData.getMemberId()); orderSplitRecord.setPaymentId(paymentId); @@ -98,6 +84,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { orderSplitRecord.setServiceSplitAmount(splitData.getServiceAmount()); orderSplitRecord.setRemark(""); orderSplitRecord.setDelFlag(DelFlagEnum.NORMAL.getValue()); + orderSplitRecord.setCreateBy(Constants.SYSTEM); + orderSplitRecord.setCreateTime(DateUtils.getNowDate()); list.add(orderSplitRecord); } this.batchInsert(list); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java index 36fd1d2c0..069f353d6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java @@ -81,7 +81,7 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ .electricitySplitRatio(new BigDecimal(100)) .serviceSplitRatio(new BigDecimal(100)) .feeFlag(Constants.ONE) - .createBy("system") + .createBy(Constants.SYSTEM) .createTime(DateUtils.getNowDate()) .delFlag(DelFlagEnum.NORMAL.getValue()) .build();