update

jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderDetail.java

@@ -1,27 +1,20 @@
 package com.jsowell.pile.domain;
 
-import com.jsowell.common.annotation.Excel;
-import com.jsowell.common.core.domain.BaseEntity;
 import lombok.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 订单详情对象 order_detail
+ * 订单详情
- *
- * @author jsowell
- * @date 2022-09-30
  */
 @Getter
 @Setter
-@NoArgsConstructor
-@AllArgsConstructor
 @Builder
-public class OrderDetail extends BaseEntity {
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderDetail {
     private static final long serialVersionUID = 1L;
-
     /**
      * 主键
      */
@@ -30,184 +23,160 @@ public class OrderDetail extends BaseEntity {
     /**
      * 订单编号
      */
-	@Excel(name = "订单编号")
     private String orderCode;
 
     /**
      * 总用电量
      */
-	@Excel(name = "总用电量")
     private BigDecimal totalUsedElectricity;
 
     /**
      * 订单总金额（电费总额+服务费总额）
      */
-	@Excel(name = "订单总金额", readConverterExp = "电=费总额+服务费总额")
     private BigDecimal totalOrderAmount;
 
     /**
      * 电费总金额（各时段消耗电费总金额）
      */
-	@Excel(name = "电费总金额", readConverterExp = "各=时段消耗电费总金额")
     private BigDecimal totalElectricityAmount;
 
+    /**
+     * 电费折扣金额
+     */
+    private BigDecimal discountElectricityAmount;
+
     /**
      * 服务费总金额（各时段服务费总金额）
      */
-	@Excel(name = "服务费总金额", readConverterExp = "各=时段服务费总金额")
     private BigDecimal totalServiceAmount;
 
     /**
-	 * 尖单价
+     * 服务费折扣金额
+     */
+    private BigDecimal discountServiceAmount;
+
+    /**
+     * 尖单价（尖电费+尖服务费）
      */
-	@Excel(name = "尖单价")
     private BigDecimal sharpPrice;
 
     /**
      * 尖时段用电量
      */
-	@Excel(name = "尖时段用电量")
     private BigDecimal sharpUsedElectricity;
 
     /**
      * 尖时段电费单价
      */
-	@Excel(name = "尖时段电费单价")
     private BigDecimal sharpElectricityPrice;
 
     /**
      * 尖时段服务费单价
      */
-	@Excel(name = "尖时段服务费单价")
     private BigDecimal sharpServicePrice;
 
     /**
      * 尖金额
      */
-	@Excel(name = "尖金额")
     private BigDecimal sharpAmount;
 
     /**
      * 峰单价
      */
-	@Excel(name = "峰单价")
     private BigDecimal peakPrice;
 
     /**
      * 峰时段用电量
      */
-	@Excel(name = "峰时段用电量")
     private BigDecimal peakUsedElectricity;
 
     /**
      * 峰时段电费单价
      */
-	@Excel(name = "峰时段电费单价")
     private BigDecimal peakElectricityPrice;
 
     /**
      * 峰时段服务费单价
      */
-	@Excel(name = "峰时段服务费单价")
     private BigDecimal peakServicePrice;
 
     /**
      * 峰金额
      */
-	@Excel(name = "峰金额")
     private BigDecimal peakAmount;
 
-	/***
+    /**
      * 平单价
      */
-	@Excel(name = "平单价")
     private BigDecimal flatPrice;
 
     /**
      * 平时段用电量
      */
-	@Excel(name = "平时段用电量")
     private BigDecimal flatUsedElectricity;
 
     /**
      * 平时段电费单价
      */
-	@Excel(name = "平时段电费单价")
     private BigDecimal flatElectricityPrice;
 
     /**
      * 平时段服务费单价
      */
-	@Excel(name = "平时段服务费单价")
     private BigDecimal flatServicePrice;
 
     /**
      * 平金额
      */
-	@Excel(name = "平金额")
     private BigDecimal flatAmount;
 
     /**
      * 谷单价
      */
-	@Excel(name = "谷单价")
     private BigDecimal valleyPrice;
 
     /**
      * 谷时段用电量
      */
-	@Excel(name = "谷时段用电量")
     private BigDecimal valleyUsedElectricity;
 
     /**
      * 谷时段电费单价
      */
-	@Excel(name = "谷时段电费单价")
     private BigDecimal valleyElectricityPrice;
 
     /**
      * 谷时段服务费单价
      */
-	@Excel(name = "谷时段服务费单价")
     private BigDecimal valleyServicePrice;
 
     /**
      * 谷金额
      */
-	@Excel(name = "谷金额")
     private BigDecimal valleyAmount;
 
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
     /**
      * 删除标识（0-正常；1-删除）
      */
     private String delFlag;
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
-				.append("id", getId())
-				.append("orderCode", getOrderCode())
-				.append("totalUsedElectricity", getTotalUsedElectricity())
-				.append("totalOrderAmount", getTotalOrderAmount())
-				.append("totalElectricityAmount", getTotalElectricityAmount())
-				.append("totalServiceAmount", getTotalServiceAmount())
-				.append("sharpUsedElectricity", getSharpUsedElectricity())
-				.append("sharpElectricityPrice", getSharpElectricityPrice())
-				.append("sharpServicePrice", getSharpServicePrice())
-				.append("peakUsedElectricity", getPeakUsedElectricity())
-				.append("peakElectricityPrice", getPeakElectricityPrice())
-				.append("peakServicePrice", getPeakServicePrice())
-				.append("flatUsedElectricity", getFlatUsedElectricity())
-				.append("flatElectricityPrice", getFlatElectricityPrice())
-				.append("flatServicePrice", getFlatServicePrice())
-				.append("valleyUsedElectricity", getValleyUsedElectricity())
-				.append("valleyElectricityPrice", getValleyElectricityPrice())
-				.append("valleyServicePrice", getValleyServicePrice())
-				.append("createBy", getCreateBy())
-				.append("createTime", getCreateTime())
-				.append("updateBy", getUpdateBy())
-				.append("updateTime", getUpdateTime())
-				.append("delFlag", getDelFlag())
-				.toString();
-	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderDetailMapper.java

@@ -0,0 +1,59 @@
+package com.jsowell.pile.mapper;
+
+import com.jsowell.pile.domain.OrderDetail;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OrderDetailMapper {
+    /**
+     * delete by primary key
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * insert record to table
+     * @param record the record
+     * @return insert count
+     */
+    int insert(OrderDetail record);
+
+    int insertOrUpdate(OrderDetail record);
+
+    int insertOrUpdateSelective(OrderDetail record);
+
+    /**
+     * insert record to table selective
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(OrderDetail record);
+
+    /**
+     * select by primary key
+     * @param id primary key
+     * @return object by primary key
+     */
+    OrderDetail selectByPrimaryKey(Integer id);
+
+    /**
+     * update record selective
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(OrderDetail record);
+
+    /**
+     * update record
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(OrderDetail record);
+
+    int updateBatch(List<OrderDetail> list);
+
+    int updateBatchSelective(List<OrderDetail> list);
+
+    int batchInsert(@Param("list") List<OrderDetail> list);
+}

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderDetailService.java

@@ -0,0 +1,30 @@
+package com.jsowell.pile.service;
+
+import java.util.List;
+import com.jsowell.pile.domain.OrderDetail;
+public interface OrderDetailService{
+
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(OrderDetail record);
+
+    int insertOrUpdate(OrderDetail record);
+
+    int insertOrUpdateSelective(OrderDetail record);
+
+    int insertSelective(OrderDetail record);
+
+    OrderDetail selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(OrderDetail record);
+
+    int updateByPrimaryKey(OrderDetail record);
+
+    int updateBatch(List<OrderDetail> list);
+
+    int updateBatchSelective(List<OrderDetail> list);
+
+    int batchInsert(List<OrderDetail> list);
+
+}

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderDetailServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jsowell.pile.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.jsowell.pile.mapper.OrderDetailMapper;
+import com.jsowell.pile.domain.OrderDetail;
+import com.jsowell.pile.service.OrderDetailService;
+@Service
+public class OrderDetailServiceImpl implements OrderDetailService{
+
+    @Resource
+    private OrderDetailMapper orderDetailMapper;
+
+    @Override
+    public int deleteByPrimaryKey(Integer id) {
+        return orderDetailMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(OrderDetail record) {
+        return orderDetailMapper.insert(record);
+    }
+
+    @Override
+    public int insertOrUpdate(OrderDetail record) {
+        return orderDetailMapper.insertOrUpdate(record);
+    }
+
+    @Override
+    public int insertOrUpdateSelective(OrderDetail record) {
+        return orderDetailMapper.insertOrUpdateSelective(record);
+    }
+
+    @Override
+    public int insertSelective(OrderDetail record) {
+        return orderDetailMapper.insertSelective(record);
+    }
+
+    @Override
+    public OrderDetail selectByPrimaryKey(Integer id) {
+        return orderDetailMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(OrderDetail record) {
+        return orderDetailMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(OrderDetail record) {
+        return orderDetailMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int updateBatch(List<OrderDetail> list) {
+        return orderDetailMapper.updateBatch(list);
+    }
+
+    @Override
+    public int updateBatchSelective(List<OrderDetail> list) {
+        return orderDetailMapper.updateBatchSelective(list);
+    }
+
+    @Override
+    public int batchInsert(List<OrderDetail> list) {
+        return orderDetailMapper.batchInsert(list);
+    }
+
+}