diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java index c421f5683..9edb40c7a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java @@ -1,5 +1,7 @@ package com.jsowell.pile.domain; +import java.math.BigDecimal; +import java.util.Date; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -7,9 +9,6 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import lombok.experimental.SuperBuilder; -import java.math.BigDecimal; -import java.util.Date; - /** * 订单分账记录表 */ @@ -30,6 +29,16 @@ public class OrderSplitRecord { */ private String orderCode; + /** + * 订单所属运营商id + */ + private String merchantId; + + /** + * 订单所属站点id + */ + private String stationId; + /** * 分账状态 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java index cc0db30e6..56fec8385 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java @@ -1,26 +1,27 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderSplitRecord; -import org.apache.ibatis.annotations.Param; import java.util.List; +import org.apache.ibatis.annotations.Param; + public interface OrderSplitRecordMapper { - // int deleteByPrimaryKey(Integer id); + int deleteByPrimaryKey(Integer id); - // int insertSelective(OrderSplitRecord record); + int insertSelective(OrderSplitRecord record); - // OrderSplitRecord selectByPrimaryKey(Integer id); + OrderSplitRecord selectByPrimaryKey(Integer id); - // int updateByPrimaryKeySelective(OrderSplitRecord record); + int updateByPrimaryKeySelective(OrderSplitRecord record); - // int updateBatchSelective(List list); + int updateBatchSelective(List list); int batchInsert(@Param("list") List list); - // int insertOrUpdate(OrderSplitRecord record); + int insertOrUpdate(OrderSplitRecord record); - // int insertOrUpdateSelective(OrderSplitRecord record); + int insertOrUpdateSelective(OrderSplitRecord record); List selectByOrderCode(String orderCode); } \ No newline at end of file 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 ba52a40c9..c72af4ec3 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 @@ -80,6 +80,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { orderSplitRecord.setSettleAmount(settleAmount); orderSplitRecord.setTradeDate(DateUtils.getDate()); // 订单结算日期 yyyy-MM-dd if (orderInfoDetailVO != null) { + orderSplitRecord.setMerchantId(orderInfoDetailVO.getMerchantId()); + orderSplitRecord.setStationId(orderInfoDetailVO.getStationId()); orderSplitRecord.setElectricityAmount(orderInfoDetailVO.getTotalElectricityAmount()); orderSplitRecord.setServiceAmount(orderInfoDetailVO.getTotalServiceAmount()); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml index 73b66fb4a..ff1975809 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml @@ -6,6 +6,8 @@ + + @@ -27,10 +29,10 @@ - id, order_code, `status`, settle_amount, electricity_amount, service_amount, trade_date, - adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio, electricity_split_amount, - service_split_ratio, service_split_amount, remark, create_by, create_time, update_by, - update_time, del_flag + id, order_code, merchant_id, station_id, `status`, settle_amount, electricity_amount, + service_amount, trade_date, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio, + electricity_split_amount, service_split_ratio, service_split_amount, remark, create_by, + create_time, update_by, update_time, del_flag