增加字段

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/PayOrder.java

@@ -1,5 +1,6 @@
 package com.yijia.station.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -9,9 +10,9 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 订单支付对象 pay_order
- *
+ * 
  * @author yijia
- * @date 2020-12-31
+ * @date 2021-01-12
  */
 public class PayOrder extends BaseEntity
 {
@@ -62,67 +63,75 @@ public class PayOrder extends BaseEntity
 
     /** 加油升数 */
     @Excel(name = "加油升数")
-    private Double orderLiters;
+    private Long orderLiters;
 
     /** 实收金额 */
     @Excel(name = "实收金额")
-    private Double amt;
+    private Long amt;
 
     /** 应收金额 */
     @Excel(name = "应收金额")
-    private Double receivableAmt;
+    private BigDecimal receivableAmt;
+
+    /** 到账金额 */
+    @Excel(name = "到账金额")
+    private BigDecimal receivedAmt;
 
     /** 优惠金额 */
     @Excel(name = "优惠金额")
-    private Double discountAmt;
+    private BigDecimal discountAmt;
 
     /** 优惠券金额 */
     @Excel(name = "优惠券金额")
-    private Double discountCouponAmt;
+    private BigDecimal discountCouponAmt;
 
     /** 优惠券 */
     @Excel(name = "优惠券")
-    private Double discountCoupon;
+    private String discountCoupon;
 
     /** 微信支付金额 */
     @Excel(name = "微信支付金额")
-    private Double wxAmt;
+    private BigDecimal wxAmt;
 
     /** 支付宝支付金额 */
     @Excel(name = "支付宝支付金额")
-    private Double zfbAmt;
+    private BigDecimal zfbAmt;
 
     /** pos支付金额 */
     @Excel(name = "pos支付金额")
-    private Double posAmt;
+    private BigDecimal posAmt;
 
     /** 现金支付金额 */
     @Excel(name = "现金支付金额")
-    private Double xjAmt;
+    private BigDecimal xjAmt;
 
     /** 滴滴app支付金额 */
     @Excel(name = "滴滴app支付金额")
-    private Double didiAppAmt;
+    private BigDecimal didiAppAmt;
 
     /** 团油app支付金额 */
     @Excel(name = "团油app支付金额")
-    private Double tyAppAmt;
+    private BigDecimal tyAppAmt;
 
     /** 其他支付金额 */
     @Excel(name = "其他支付金额")
-    private Double otherAmt;
+    private BigDecimal otherAmt;
 
-    /** 电子卡祝福金额 */
-    @Excel(name = "电子卡祝福金额")
-    private Double dzkAmt;
+    /** 电子卡金额 */
+    @Excel(name = "电子卡金额")
+    private BigDecimal dzkAmt;
 
     /** 消费积分 */
     @Excel(name = "消费积分")
     private Long score;
 
+    /** 会员卡号 */
+    @Excel(name = "会员卡号")
+    private String memberNo;
+
     /** 会员支付金额 */
     @Excel(name = "会员支付金额")
-    private Double memberAmt;
+    private BigDecimal memberAmt;
 
     /** 打印小票数量 */
     @Excel(name = "打印小票数量")
@@ -136,18 +145,18 @@ public class PayOrder extends BaseEntity
     @Excel(name = "支付方式：02公众号，03小程序")
     private String payWay;
 
-    /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date payDate;
-
     /** 加油员 */
     @Excel(name = "加油员")
     private String oilPersonnel;
 
+    /** 支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payDate;
+
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdDate;
 
     /** 订单类型（1.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分） */
@@ -156,23 +165,23 @@ public class PayOrder extends BaseEntity
 
     /** pos支付金额 */
     @Excel(name = "汽油金额")
-    private Double qyAmt;
+    private BigDecimal qyAmt;
     @Excel(name = "柴油金额")
-    private Double cyAmt;
+    private BigDecimal cyAmt;
 
-    public Double getQyAmt() {
+    public BigDecimal getQyAmt() {
         return qyAmt;
     }
 
-    public void setQyAmt(Double qyAmt) {
+    public void setQyAmt(BigDecimal qyAmt) {
         this.qyAmt = qyAmt;
     }
 
-    public Double getCyAmt() {
+    public BigDecimal getCyAmt() {
         return cyAmt;
     }
 
-    public void setCyAmt(Double cyAmt) {
+    public void setCyAmt(BigDecimal cyAmt) {
         this.cyAmt = cyAmt;
     }
 
@@ -181,290 +190,322 @@ public class PayOrder extends BaseEntity
         this.orderId = orderId;
     }
 
-    public Long getOrderId()
+    public Long getOrderId() 
     {
         return orderId;
     }
-    public void setOrderNo(String orderNo)
+    public void setOrderNo(String orderNo) 
     {
         this.orderNo = orderNo;
     }
 
-    public String getOrderNo()
+    public String getOrderNo() 
     {
         return orderNo;
     }
-    public void setStationId(Long stationId)
+    public void setStationId(Long stationId) 
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId()
+    public Long getStationId() 
     {
         return stationId;
     }
-    public void setStationName(String stationName)
+    public void setStationName(String stationName) 
     {
         this.stationName = stationName;
     }
 
-    public String getStationName()
+    public String getStationName() 
     {
         return stationName;
     }
-    public void setStatus(String status)
+    public void setStatus(String status) 
     {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() 
     {
         return status;
     }
-    public void setConsumerId(Long consumerId)
+    public void setConsumerId(Long consumerId) 
     {
         this.consumerId = consumerId;
     }
 
-    public Long getConsumerId()
+    public Long getConsumerId() 
     {
         return consumerId;
     }
-    public void setConsumer(String consumer)
+    public void setConsumer(String consumer) 
     {
         this.consumer = consumer;
     }
 
-    public String getConsumer()
+    public String getConsumer() 
     {
         return consumer;
     }
-    public void setOilGun(String oilGun)
+    public void setOilGun(String oilGun) 
     {
         this.oilGun = oilGun;
     }
 
-    public String getOilGun()
+    public String getOilGun() 
     {
         return oilGun;
     }
-    public void setOilName(String oilName)
+    public void setOilName(String oilName) 
     {
         this.oilName = oilName;
     }
 
-    public String getOilName()
+    public String getOilName() 
     {
         return oilName;
     }
-    public void setOilPirce(String oilPirce)
+    public void setOilPirce(String oilPirce) 
     {
         this.oilPirce = oilPirce;
     }
 
-    public String getOilPirce()
+    public String getOilPirce() 
     {
         return oilPirce;
     }
-    public void setOilType(String oilType)
+    public void setOilType(String oilType) 
     {
         this.oilType = oilType;
     }
 
-    public String getOilType()
+    public String getOilType() 
     {
         return oilType;
     }
+    public void setOrderLiters(Long orderLiters) 
+    {
+        this.orderLiters = orderLiters;
+    }
 
-    public Double getOrderLiters() {
+    public Long getOrderLiters() 
+    {
         return orderLiters;
     }
-
-    public void setOrderLiters(Double orderLiters) {
-        this.orderLiters = orderLiters;
+    public void setAmt(Long amt) 
+    {
+        this.amt = amt;
     }
 
-    public Double getAmt() {
+    public Long getAmt() 
+    {
         return amt;
     }
-
-    public void setAmt(Double amt) {
-        this.amt = amt;
+    public void setReceivableAmt(BigDecimal receivableAmt) 
+    {
+        this.receivableAmt = receivableAmt;
     }
 
-    public Double getReceivableAmt() {
+    public BigDecimal getReceivableAmt() 
+    {
         return receivableAmt;
     }
-
-    public void setReceivableAmt(Double receivableAmt) {
-        this.receivableAmt = receivableAmt;
+    public void setReceivedAmt(BigDecimal receivedAmt) 
+    {
+        this.receivedAmt = receivedAmt;
     }
 
-    public Double getDiscountAmt() {
-        return discountAmt;
+    public BigDecimal getReceivedAmt() 
+    {
+        return receivedAmt;
     }
-
-    public void setDiscountAmt(Double discountAmt) {
+    public void setDiscountAmt(BigDecimal discountAmt) 
+    {
         this.discountAmt = discountAmt;
     }
 
-    public Double getDiscountCouponAmt() {
-        return discountCouponAmt;
+    public BigDecimal getDiscountAmt() 
+    {
+        return discountAmt;
     }
-
-    public void setDiscountCouponAmt(Double discountCouponAmt) {
+    public void setDiscountCouponAmt(BigDecimal discountCouponAmt) 
+    {
         this.discountCouponAmt = discountCouponAmt;
     }
 
-    public Double getDiscountCoupon() {
-        return discountCoupon;
+    public BigDecimal getDiscountCouponAmt() 
+    {
+        return discountCouponAmt;
     }
-
-    public void setDiscountCoupon(Double discountCoupon) {
+    public void setDiscountCoupon(String discountCoupon) 
+    {
         this.discountCoupon = discountCoupon;
     }
 
-    public Double getWxAmt() {
-        return wxAmt;
+    public String getDiscountCoupon() 
+    {
+        return discountCoupon;
     }
-
-    public void setWxAmt(Double wxAmt) {
+    public void setWxAmt(BigDecimal wxAmt) 
+    {
         this.wxAmt = wxAmt;
     }
 
-    public Double getZfbAmt() {
-        return zfbAmt;
+    public BigDecimal getWxAmt() 
+    {
+        return wxAmt;
     }
-
-    public void setZfbAmt(Double zfbAmt) {
+    public void setZfbAmt(BigDecimal zfbAmt) 
+    {
         this.zfbAmt = zfbAmt;
     }
 
-    public Double getPosAmt() {
-        return posAmt;
+    public BigDecimal getZfbAmt() 
+    {
+        return zfbAmt;
     }
-
-    public void setPosAmt(Double posAmt) {
+    public void setPosAmt(BigDecimal posAmt) 
+    {
         this.posAmt = posAmt;
     }
 
-    public Double getXjAmt() {
-        return xjAmt;
+    public BigDecimal getPosAmt() 
+    {
+        return posAmt;
     }
-
-    public void setXjAmt(Double xjAmt) {
+    public void setXjAmt(BigDecimal xjAmt) 
+    {
         this.xjAmt = xjAmt;
     }
 
-    public Double getDidiAppAmt() {
-        return didiAppAmt;
+    public BigDecimal getXjAmt() 
+    {
+        return xjAmt;
     }
-
-    public void setDidiAppAmt(Double didiAppAmt) {
+    public void setDidiAppAmt(BigDecimal didiAppAmt) 
+    {
         this.didiAppAmt = didiAppAmt;
     }
 
-    public Double getTyAppAmt() {
-        return tyAppAmt;
+    public BigDecimal getDidiAppAmt() 
+    {
+        return didiAppAmt;
     }
-
-    public void setTyAppAmt(Double tyAppAmt) {
+    public void setTyAppAmt(BigDecimal tyAppAmt) 
+    {
         this.tyAppAmt = tyAppAmt;
     }
 
-    public Double getOtherAmt() {
-        return otherAmt;
+    public BigDecimal getTyAppAmt() 
+    {
+        return tyAppAmt;
     }
-
-    public void setOtherAmt(Double otherAmt) {
+    public void setOtherAmt(BigDecimal otherAmt) 
+    {
         this.otherAmt = otherAmt;
     }
 
-    public Double getDzkAmt() {
-        return dzkAmt;
+    public BigDecimal getOtherAmt() 
+    {
+        return otherAmt;
     }
-
-    public void setDzkAmt(Double dzkAmt) {
+    public void setDzkAmt(BigDecimal dzkAmt) 
+    {
         this.dzkAmt = dzkAmt;
     }
 
-    public Double getMemberAmt() {
-        return memberAmt;
+    public BigDecimal getDzkAmt() 
+    {
+        return dzkAmt;
     }
-
-    public void setMemberAmt(Double memberAmt) {
-        this.memberAmt = memberAmt;
+    public void setScore(Long score) 
+    {
+        this.score = score;
     }
 
-    public Long getScore() {
+    public Long getScore() 
+    {
         return score;
     }
-
-    public void setScore(Long score) {
-        this.score = score;
+    public void setMemberNo(String memberNo) 
+    {
+        this.memberNo = memberNo;
     }
 
+    public String getMemberNo() 
+    {
+        return memberNo;
+    }
+    public void setMemberAmt(BigDecimal memberAmt) 
+    {
+        this.memberAmt = memberAmt;
+    }
 
-    public void setPrintCount(Long printCount)
+    public BigDecimal getMemberAmt() 
+    {
+        return memberAmt;
+    }
+    public void setPrintCount(Long printCount) 
     {
         this.printCount = printCount;
     }
 
-    public Long getPrintCount()
+    public Long getPrintCount() 
     {
         return printCount;
     }
-    public void setPayType(String payType)
+    public void setPayType(String payType) 
     {
         this.payType = payType;
     }
 
-    public String getPayType()
+    public String getPayType() 
     {
         return payType;
     }
-    public void setPayWay(String payWay)
+    public void setPayWay(String payWay) 
     {
         this.payWay = payWay;
     }
 
-    public String getPayWay()
+    public String getPayWay() 
     {
         return payWay;
     }
-    public void setOilPersonnel(String oilPersonnel)
+    public void setOilPersonnel(String oilPersonnel) 
     {
         this.oilPersonnel = oilPersonnel;
     }
 
-    public String getOilPersonnel()
+    public String getOilPersonnel() 
     {
         return oilPersonnel;
     }
-    public void setPayDate(Date payDate)
+    public void setPayDate(Date payDate) 
     {
         this.payDate = payDate;
     }
 
-    public Date getPayDate()
+    public Date getPayDate() 
     {
         return payDate;
     }
-    public void setCreatedDate(Date createdDate)
+    public void setCreatedDate(Date createdDate) 
     {
         this.createdDate = createdDate;
     }
 
-    public Date getCreatedDate()
+    public Date getCreatedDate() 
     {
         return createdDate;
     }
-    public void setOrderType(String orderType)
+    public void setOrderType(String orderType) 
     {
         this.orderType = orderType;
     }
 
-    public String getOrderType()
+    public String getOrderType() 
     {
         return orderType;
     }
@@ -486,6 +527,7 @@ public class PayOrder extends BaseEntity
             .append("orderLiters", getOrderLiters())
             .append("amt", getAmt())
             .append("receivableAmt", getReceivableAmt())
+            .append("receivedAmt", getReceivedAmt())
             .append("discountAmt", getDiscountAmt())
             .append("discountCouponAmt", getDiscountCouponAmt())
             .append("discountCoupon", getDiscountCoupon())
@@ -498,6 +540,7 @@ public class PayOrder extends BaseEntity
             .append("otherAmt", getOtherAmt())
             .append("dzkAmt", getDzkAmt())
             .append("score", getScore())
+            .append("memberNo", getMemberNo())
             .append("memberAmt", getMemberAmt())
             .append("printCount", getPrintCount())
             .append("payType", getPayType())

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationClassStructure.java

@@ -1,5 +1,6 @@
 package com.yijia.station.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,7 +12,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 班结管理对象 station_class_structure
  * 
  * @author yijia
- * @date 2020-12-31
+ * @date 2021-01-12
  */
 public class StationClassStructure extends BaseEntity
 {
@@ -20,13 +21,17 @@ public class StationClassStructure extends BaseEntity
     /** $column.columnComment */
     private Long id;
 
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNo;
+
     /** 油站id */
     @Excel(name = "油站id")
     private Long stationId;
 
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String orderNo;
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
 
     /** 加油枪号 */
     @Excel(name = "加油枪号")
@@ -36,6 +41,14 @@ public class StationClassStructure extends BaseEntity
     @Excel(name = "油品名称")
     private String oilName;
 
+    /** 油品价格 */
+    @Excel(name = "油品价格")
+    private BigDecimal oilPirce;
+
+    /** 油品类型（柴油，汽油） */
+    @Excel(name = "油品类型", readConverterExp = "柴=油，汽油")
+    private String oilType;
+
     /** 用户（app_user_info  id消费者id） */
     @Excel(name = "用户", readConverterExp = "a=pp_user_info,i=d消费者id")
     private Long consumerId;
@@ -46,15 +59,11 @@ public class StationClassStructure extends BaseEntity
 
     /** 金额 */
     @Excel(name = "金额")
-    private Double amt;
+    private Long amt;
 
-    /** 油站名称 */
-    @Excel(name = "油站名称")
-    private String stationName;
-
-    /** 加油升数· */
-    @Excel(name = "加油升数·")
-    private Double orderLiters;
+    /** 加油升数 */
+    @Excel(name = "加油升数")
+    private Long orderLiters;
 
     /** 支付类型 sxf */
     @Excel(name = "支付类型 sxf")
@@ -77,10 +86,6 @@ public class StationClassStructure extends BaseEntity
     @Excel(name = "订单类型订单类型", readConverterExp = "1=.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分")
     private String orderType;
 
-    /** 油品类型（柴油，汽油） */
-    @Excel(name = "油品类型", readConverterExp = "柴=油，汽油")
-    private String oilType;
-
     /** 打印小票数（含重复） */
     @Excel(name = "打印小票数", readConverterExp = "含=重复")
     private Long printNum;
@@ -129,7 +134,71 @@ public class StationClassStructure extends BaseEntity
         this.likeClassStructureNo = likeClassStructureNo;
     }
 
-    public void setId(Long id)
+    /** 应收金额 */
+    @Excel(name = "应收金额")
+    private BigDecimal receivableAmt;
+
+    /** 到账金额 */
+    @Excel(name = "到账金额")
+    private BigDecimal receivedAmt;
+
+    /** 优惠金额 */
+    @Excel(name = "优惠金额")
+    private BigDecimal discountAmt;
+
+    /** 优惠劵金额 */
+    @Excel(name = "优惠劵金额")
+    private BigDecimal discountCouponAmt;
+
+    /** 优惠劵 */
+    @Excel(name = "优惠劵")
+    private String discountCoupon;
+
+    /** 微信金额 */
+    @Excel(name = "微信金额")
+    private BigDecimal wxAmt;
+
+    /** 支付宝金额 */
+    @Excel(name = "支付宝金额")
+    private BigDecimal zfbAmt;
+
+    /** pos支付金额 */
+    @Excel(name = "pos支付金额")
+    private BigDecimal posAmt;
+
+    /** 现金支付金额 */
+    @Excel(name = "现金支付金额")
+    private BigDecimal xjAmt;
+
+    /** 滴滴app支付金额 */
+    @Excel(name = "滴滴app支付金额")
+    private BigDecimal didiAppAmt;
+
+    /** 团油app支付金额 */
+    @Excel(name = "团油app支付金额")
+    private BigDecimal tyAppAmt;
+
+    /** 其他支付金额 */
+    @Excel(name = "其他支付金额")
+    private BigDecimal otherAmt;
+
+    /** 电子卡金额 */
+    @Excel(name = "电子卡金额")
+    private BigDecimal dzkAmt;
+
+    /** 消费积分 */
+    @Excel(name = "消费积分")
+    private Long score;
+
+    /** 会员卡号 */
+    @Excel(name = "会员卡号")
+    private String memberNo;
+
+    /** 会员支付金额 */
+    @Excel(name = "会员支付金额")
+    private BigDecimal memberAmt;
+
+    public void setId(Long id) 
     {
         this.id = id;
     }
@@ -138,6 +207,15 @@ public class StationClassStructure extends BaseEntity
     {
         return id;
     }
+    public void setOrderNo(String orderNo) 
+    {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderNo() 
+    {
+        return orderNo;
+    }
     public void setStationId(Long stationId) 
     {
         this.stationId = stationId;
@@ -147,14 +225,14 @@ public class StationClassStructure extends BaseEntity
     {
         return stationId;
     }
-    public void setOrderNo(String orderNo) 
+    public void setStationName(String stationName) 
     {
-        this.orderNo = orderNo;
+        this.stationName = stationName;
     }
 
-    public String getOrderNo() 
+    public String getStationName() 
     {
-        return orderNo;
+        return stationName;
     }
     public void setOilGun(String oilGun) 
     {
@@ -174,6 +252,24 @@ public class StationClassStructure extends BaseEntity
     {
         return oilName;
     }
+    public void setOilPirce(BigDecimal oilPirce) 
+    {
+        this.oilPirce = oilPirce;
+    }
+
+    public BigDecimal getOilPirce() 
+    {
+        return oilPirce;
+    }
+    public void setOilType(String oilType) 
+    {
+        this.oilType = oilType;
+    }
+
+    public String getOilType() 
+    {
+        return oilType;
+    }
     public void setConsumerId(Long consumerId) 
     {
         this.consumerId = consumerId;
@@ -192,34 +288,25 @@ public class StationClassStructure extends BaseEntity
     {
         return consumer;
     }
-
-    public void setStationName(String stationName) 
+    public void setAmt(Long amt)
     {
-        this.stationName = stationName;
+        this.amt = amt;
     }
 
-    public String getStationName() 
+    public Long getAmt() 
     {
-        return stationName;
-    }
-
-    public Double getAmt() {
         return amt;
     }
-
-    public void setAmt(Double amt) {
-        this.amt = amt;
+    public void setOrderLiters(Long orderLiters) 
+    {
+        this.orderLiters = orderLiters;
     }
 
-    public Double getOrderLiters() {
+    public Long getOrderLiters() 
+    {
         return orderLiters;
     }
-
-    public void setOrderLiters(Double orderLiters) {
-        this.orderLiters = orderLiters;
-    }
-
-    public void setPayType(String payType)
+    public void setPayType(String payType) 
     {
         this.payType = payType;
     }
@@ -264,15 +351,6 @@ public class StationClassStructure extends BaseEntity
     {
         return orderType;
     }
-    public void setOilType(String oilType) 
-    {
-        this.oilType = oilType;
-    }
-
-    public String getOilType() 
-    {
-        return oilType;
-    }
     public void setPrintNum(Long printNum) 
     {
         this.printNum = printNum;
@@ -327,32 +405,193 @@ public class StationClassStructure extends BaseEntity
     {
         return oils;
     }
+    public void setReceivableAmt(BigDecimal receivableAmt) 
+    {
+        this.receivableAmt = receivableAmt;
+    }
+
+    public BigDecimal getReceivableAmt() 
+    {
+        return receivableAmt;
+    }
+    public void setReceivedAmt(BigDecimal receivedAmt) 
+    {
+        this.receivedAmt = receivedAmt;
+    }
+
+    public BigDecimal getReceivedAmt() 
+    {
+        return receivedAmt;
+    }
+    public void setDiscountAmt(BigDecimal discountAmt) 
+    {
+        this.discountAmt = discountAmt;
+    }
+
+    public BigDecimal getDiscountAmt() 
+    {
+        return discountAmt;
+    }
+    public void setDiscountCouponAmt(BigDecimal discountCouponAmt) 
+    {
+        this.discountCouponAmt = discountCouponAmt;
+    }
+
+    public BigDecimal getDiscountCouponAmt() 
+    {
+        return discountCouponAmt;
+    }
+    public void setDiscountCoupon(String discountCoupon) 
+    {
+        this.discountCoupon = discountCoupon;
+    }
+
+    public String getDiscountCoupon() 
+    {
+        return discountCoupon;
+    }
+    public void setWxAmt(BigDecimal wxAmt) 
+    {
+        this.wxAmt = wxAmt;
+    }
+
+    public BigDecimal getWxAmt() 
+    {
+        return wxAmt;
+    }
+    public void setZfbAmt(BigDecimal zfbAmt) 
+    {
+        this.zfbAmt = zfbAmt;
+    }
+
+    public BigDecimal getZfbAmt() 
+    {
+        return zfbAmt;
+    }
+    public void setPosAmt(BigDecimal posAmt) 
+    {
+        this.posAmt = posAmt;
+    }
+
+    public BigDecimal getPosAmt() 
+    {
+        return posAmt;
+    }
+    public void setXjAmt(BigDecimal xjAmt) 
+    {
+        this.xjAmt = xjAmt;
+    }
+
+    public BigDecimal getXjAmt() 
+    {
+        return xjAmt;
+    }
+    public void setDidiAppAmt(BigDecimal didiAppAmt) 
+    {
+        this.didiAppAmt = didiAppAmt;
+    }
+
+    public BigDecimal getDidiAppAmt() 
+    {
+        return didiAppAmt;
+    }
+    public void setTyAppAmt(BigDecimal tyAppAmt) 
+    {
+        this.tyAppAmt = tyAppAmt;
+    }
+
+    public BigDecimal getTyAppAmt() 
+    {
+        return tyAppAmt;
+    }
+    public void setOtherAmt(BigDecimal otherAmt) 
+    {
+        this.otherAmt = otherAmt;
+    }
+
+    public BigDecimal getOtherAmt() 
+    {
+        return otherAmt;
+    }
+    public void setDzkAmt(BigDecimal dzkAmt) 
+    {
+        this.dzkAmt = dzkAmt;
+    }
+
+    public BigDecimal getDzkAmt() 
+    {
+        return dzkAmt;
+    }
+    public void setScore(Long score) 
+    {
+        this.score = score;
+    }
+
+    public Long getScore() 
+    {
+        return score;
+    }
+    public void setMemberNo(String memberNo) 
+    {
+        this.memberNo = memberNo;
+    }
+
+    public String getMemberNo() 
+    {
+        return memberNo;
+    }
+    public void setMemberAmt(BigDecimal memberAmt) 
+    {
+        this.memberAmt = memberAmt;
+    }
+
+    public BigDecimal getMemberAmt() 
+    {
+        return memberAmt;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("stationId", getStationId())
             .append("orderNo", getOrderNo())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
             .append("oilGun", getOilGun())
             .append("oilName", getOilName())
+            .append("oilPirce", getOilPirce())
+            .append("oilType", getOilType())
             .append("consumerId", getConsumerId())
             .append("consumer", getConsumer())
             .append("amt", getAmt())
-            .append("stationName", getStationName())
             .append("orderLiters", getOrderLiters())
             .append("payType", getPayType())
             .append("payWay", getPayWay())
             .append("payDate", getPayDate())
             .append("oilPersonnel", getOilPersonnel())
             .append("orderType", getOrderType())
-            .append("oilType", getOilType())
             .append("printNum", getPrintNum())
             .append("classStructureNo", getClassStructureNo())
             .append("classStartDate", getClassStartDate())
             .append("classStructureDate", getClassStructureDate())
             .append("classStructureMan", getClassStructureMan())
             .append("oils", getOils())
+            .append("receivableAmt", getReceivableAmt())
+            .append("receivedAmt", getReceivedAmt())
+            .append("discountAmt", getDiscountAmt())
+            .append("discountCouponAmt", getDiscountCouponAmt())
+            .append("discountCoupon", getDiscountCoupon())
+            .append("wxAmt", getWxAmt())
+            .append("zfbAmt", getZfbAmt())
+            .append("posAmt", getPosAmt())
+            .append("xjAmt", getXjAmt())
+            .append("didiAppAmt", getDidiAppAmt())
+            .append("tyAppAmt", getTyAppAmt())
+            .append("otherAmt", getOtherAmt())
+            .append("dzkAmt", getDzkAmt())
+            .append("score", getScore())
+            .append("memberNo", getMemberNo())
+            .append("memberAmt", getMemberAmt())
             .toString();
     }
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationClassesSummary.java

@@ -1,5 +1,6 @@
 package com.yijia.station.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -59,53 +60,53 @@ public class StationClassesSummary extends BaseEntity
 
     /** 销售额元 */
     @Excel(name = "销售额元")
-    private Double saleAmt;
+    private BigDecimal saleAmt;
 
     /** 微信销售金额 */
     @Excel(name = "微信销售金额")
-    private Double wxAmt;
+    private BigDecimal wxAmt;
 
     /** 支付宝销售金额 */
     @Excel(name = "支付宝销售金额")
-    private Double zfbAmt;
+    private BigDecimal zfbAmt;
 
     /** 电子卡销售金额 */
     @Excel(name = "电子卡销售金额")
-    private Double dzkAmt;
+    private BigDecimal dzkAmt;
 
     /** 班结人 */
     @Excel(name = "班结人")
     private String classesMan;
 
-    public Double getSaleAmt() {
+    public BigDecimal getSaleAmt() {
         return saleAmt;
     }
 
-    public void setSaleAmt(Double saleAmt) {
+    public void setSaleAmt(BigDecimal saleAmt) {
         this.saleAmt = saleAmt;
     }
 
-    public Double getWxAmt() {
+    public BigDecimal getWxAmt() {
         return wxAmt;
     }
 
-    public void setWxAmt(Double wxAmt) {
+    public void setWxAmt(BigDecimal wxAmt) {
         this.wxAmt = wxAmt;
     }
 
-    public Double getZfbAmt() {
+    public BigDecimal getZfbAmt() {
         return zfbAmt;
     }
 
-    public void setZfbAmt(Double zfbAmt) {
+    public void setZfbAmt(BigDecimal zfbAmt) {
         this.zfbAmt = zfbAmt;
     }
 
-    public Double getDzkAmt() {
+    public BigDecimal getDzkAmt() {
         return dzkAmt;
     }
 
-    public void setDzkAmt(Double dzkAmt) {
+    public void setDzkAmt(BigDecimal dzkAmt) {
         this.dzkAmt = dzkAmt;
     }
 

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderLiters"    column="order_liters"    />
         <result property="amt"    column="amt"    />
         <result property="receivableAmt"    column="receivable_amt"    />
+        <result property="receivedAmt"    column="received_amt"    />
         <result property="discountAmt"    column="discount_amt"    />
         <result property="discountCouponAmt"    column="discount_coupon_amt"    />
         <result property="discountCoupon"    column="discount_coupon"    />
@@ -31,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="otherAmt"    column="other_amt"    />
         <result property="dzkAmt"    column="dzk_amt"    />
         <result property="score"    column="score"    />
+        <result property="memberNo"    column="member_no"    />
         <result property="memberAmt"    column="member_amt"    />
         <result property="printCount"    column="print_count"    />
         <result property="payType"    column="pay_type"    />
@@ -44,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPayOrderVo">
-        select order_id, order_no, station_id, station_name, status, consumer_id, consumer, oil_gun, oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_amt, print_count, pay_type, pay_way, oil_personnel, pay_date, created_date, order_type from pay_order
+        select order_id, order_no, station_id, station_name, status, consumer_id, consumer, oil_gun, oil_name, oil_pirce, oil_type, order_liters, amt, receivable_amt, received_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_no, member_amt, print_count, pay_type, pay_way, oil_personnel, pay_date, created_date, order_type from pay_order
     </sql>
 
     <select id="selectPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
             <if test="amt != null "> and amt = #{amt}</if>
             <if test="receivableAmt != null "> and receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and received_amt = #{receivedAmt}</if>
             <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
             <if test="discountCouponAmt != null "> and discount_coupon_amt = #{discountCouponAmt}</if>
             <if test="discountCoupon != null  and discountCoupon != ''"> and discount_coupon = #{discountCoupon}</if>
@@ -75,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
             <if test="score != null "> and score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
             <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
             <if test="printCount != null "> and print_count = #{printCount}</if>
             <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
@@ -94,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY created_date DESC
     </select>
-
+    
     <select id="selectPayOrderById" parameterType="Long" resultMap="PayOrderResult">
         <include refid="selectPayOrderVo"/>
         where order_id = #{orderId}
@@ -161,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderLiters != null">order_liters,</if>
             <if test="amt != null">amt,</if>
             <if test="receivableAmt != null">receivable_amt,</if>
+            <if test="receivedAmt != null">received_amt,</if>
             <if test="discountAmt != null">discount_amt,</if>
             <if test="discountCouponAmt != null">discount_coupon_amt,</if>
             <if test="discountCoupon != null">discount_coupon,</if>
@@ -173,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherAmt != null">other_amt,</if>
             <if test="dzkAmt != null">dzk_amt,</if>
             <if test="score != null">score,</if>
+            <if test="memberNo != null">member_no,</if>
             <if test="memberAmt != null">member_amt,</if>
             <if test="printCount != null">print_count,</if>
             <if test="payType != null">pay_type,</if>
@@ -196,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderLiters != null">#{orderLiters},</if>
             <if test="amt != null">#{amt},</if>
             <if test="receivableAmt != null">#{receivableAmt},</if>
+            <if test="receivedAmt != null">#{receivedAmt},</if>
             <if test="discountAmt != null">#{discountAmt},</if>
             <if test="discountCouponAmt != null">#{discountCouponAmt},</if>
             <if test="discountCoupon != null">#{discountCoupon},</if>
@@ -208,6 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherAmt != null">#{otherAmt},</if>
             <if test="dzkAmt != null">#{dzkAmt},</if>
             <if test="score != null">#{score},</if>
+            <if test="memberNo != null">#{memberNo},</if>
             <if test="memberAmt != null">#{memberAmt},</if>
             <if test="printCount != null">#{printCount},</if>
             <if test="payType != null">#{payType},</if>
@@ -235,6 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderLiters != null">order_liters = #{orderLiters},</if>
             <if test="amt != null">amt = #{amt},</if>
             <if test="receivableAmt != null">receivable_amt = #{receivableAmt},</if>
+            <if test="receivedAmt != null">received_amt = #{receivedAmt},</if>
             <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
             <if test="discountCouponAmt != null">discount_coupon_amt = #{discountCouponAmt},</if>
             <if test="discountCoupon != null">discount_coupon = #{discountCoupon},</if>
@@ -247,6 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherAmt != null">other_amt = #{otherAmt},</if>
             <if test="dzkAmt != null">dzk_amt = #{dzkAmt},</if>
             <if test="score != null">score = #{score},</if>
+            <if test="memberNo != null">member_no = #{memberNo},</if>
             <if test="memberAmt != null">member_amt = #{memberAmt},</if>
             <if test="printCount != null">print_count = #{printCount},</if>
             <if test="payType != null">pay_type = #{payType},</if>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml

@@ -6,58 +6,92 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="StationClassStructure" id="StationClassStructureResult">
         <result property="id"    column="id"    />
-        <result property="stationId"    column="station_id"    />
         <result property="orderNo"    column="order_no"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
         <result property="oilGun"    column="oil_gun"    />
         <result property="oilName"    column="oil_name"    />
+        <result property="oilPirce"    column="oil_pirce"    />
+        <result property="oilType"    column="oil_type"    />
         <result property="consumerId"    column="consumer_id"    />
         <result property="consumer"    column="consumer"    />
         <result property="amt"    column="amt"    />
-        <result property="stationName"    column="station_name"    />
         <result property="orderLiters"    column="order_liters"    />
         <result property="payType"    column="pay_type"    />
         <result property="payWay"    column="pay_way"    />
         <result property="payDate"    column="pay_date"    />
         <result property="oilPersonnel"    column="oil_personnel"    />
         <result property="orderType"    column="order_type"    />
-        <result property="oilType"    column="oil_type"    />
         <result property="printNum"    column="print_num"    />
         <result property="classStructureNo"    column="class_structure_no"    />
         <result property="classStartDate"    column="class_start_date"    />
         <result property="classStructureDate"    column="class_structure_date"    />
         <result property="classStructureMan"    column="class_structure_man"    />
         <result property="oils"    column="oils"    />
+        <result property="receivableAmt"    column="receivable_amt"    />
+        <result property="receivedAmt"    column="received_amt"    />
+        <result property="discountAmt"    column="discount_amt"    />
+        <result property="discountCouponAmt"    column="discount_coupon_amt"    />
+        <result property="discountCoupon"    column="discount_coupon"    />
+        <result property="wxAmt"    column="wx_amt"    />
+        <result property="zfbAmt"    column="zfb_amt"    />
+        <result property="posAmt"    column="pos_amt"    />
+        <result property="xjAmt"    column="xj_amt"    />
+        <result property="didiAppAmt"    column="didi_app_amt"    />
+        <result property="tyAppAmt"    column="ty_app_amt"    />
+        <result property="otherAmt"    column="other_amt"    />
+        <result property="dzkAmt"    column="dzk_amt"    />
+        <result property="score"    column="score"    />
+        <result property="memberNo"    column="member_no"    />
+        <result property="memberAmt"    column="member_amt"    />
         <result property="num"    column="num"    />
     </resultMap>
 
     <sql id="selectStationClassStructureVo">
-        select id, station_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_name, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, oil_type, print_num, class_structure_no, class_start_date, class_structure_date, class_structure_man, oils from station_class_structure
+        select id, order_no, station_id, station_name, oil_gun, oil_name, oil_pirce, oil_type, consumer_id, consumer, amt, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, print_num, class_structure_no, class_start_date, class_structure_date, class_structure_man, oils, receivable_amt, received_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_no, member_amt from station_class_structure
     </sql>
 
     <select id="selectStationClassStructureList" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>
         <where>  
-            <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
             <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null "> and oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
             <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
-            <if test="amt != null  and amt != ''"> and amt = #{amt}</if>
-            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
-            <if test="orderLiters != null  and orderLiters != ''"> and order_liters = #{orderLiters}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
             <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
             <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
             <if test="payDate != null "> and pay_date = #{payDate}</if>
             <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
             <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
-            <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
             <if test="printNum != null "> and print_num = #{printNum}</if>
             <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
             <if test="classStartDate != null "> and class_start_date = #{classStartDate}</if>
             <if test="classStructureDate != null "> and class_structure_date = #{classStructureDate}</if>
             <if test="classStructureMan != null  and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
             <if test="oils != null  and oils != ''"> and oils = #{oils}</if>
+            <if test="receivableAmt != null "> and receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and received_amt = #{receivedAmt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
+            <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
         </where>
     </select>
 
@@ -89,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </where>
 		)
     </select>
+    
     <select id="selectStationClassStructureById" parameterType="Long" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>
         where id = #{id}
@@ -114,77 +149,128 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
         insert into station_class_structure
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="stationId != null">station_id,</if>
             <if test="orderNo != null">order_no,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
             <if test="oilGun != null">oil_gun,</if>
             <if test="oilName != null">oil_name,</if>
+            <if test="oilPirce != null">oil_pirce,</if>
+            <if test="oilType != null">oil_type,</if>
             <if test="consumerId != null">consumer_id,</if>
             <if test="consumer != null">consumer,</if>
             <if test="amt != null">amt,</if>
-            <if test="stationName != null">station_name,</if>
             <if test="orderLiters != null">order_liters,</if>
             <if test="payType != null">pay_type,</if>
             <if test="payWay != null">pay_way,</if>
             <if test="payDate != null">pay_date,</if>
             <if test="oilPersonnel != null">oil_personnel,</if>
             <if test="orderType != null">order_type,</if>
-            <if test="oilType != null">oil_type,</if>
             <if test="printNum != null">print_num,</if>
             <if test="classStructureNo != null">class_structure_no,</if>
             <if test="classStartDate != null">class_start_date,</if>
             <if test="classStructureDate != null">class_structure_date,</if>
             <if test="classStructureMan != null">class_structure_man,</if>
             <if test="oils != null">oils,</if>
+            <if test="receivableAmt != null">receivable_amt,</if>
+            <if test="receivedAmt != null">received_amt,</if>
+            <if test="discountAmt != null">discount_amt,</if>
+            <if test="discountCouponAmt != null">discount_coupon_amt,</if>
+            <if test="discountCoupon != null">discount_coupon,</if>
+            <if test="wxAmt != null">wx_amt,</if>
+            <if test="zfbAmt != null">zfb_amt,</if>
+            <if test="posAmt != null">pos_amt,</if>
+            <if test="xjAmt != null">xj_amt,</if>
+            <if test="didiAppAmt != null">didi_app_amt,</if>
+            <if test="tyAppAmt != null">ty_app_amt,</if>
+            <if test="otherAmt != null">other_amt,</if>
+            <if test="dzkAmt != null">dzk_amt,</if>
+            <if test="score != null">score,</if>
+            <if test="memberNo != null">member_no,</if>
+            <if test="memberAmt != null">member_amt,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stationId != null">#{stationId},</if>
             <if test="orderNo != null">#{orderNo},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
             <if test="oilGun != null">#{oilGun},</if>
             <if test="oilName != null">#{oilName},</if>
+            <if test="oilPirce != null">#{oilPirce},</if>
+            <if test="oilType != null">#{oilType},</if>
             <if test="consumerId != null">#{consumerId},</if>
             <if test="consumer != null">#{consumer},</if>
             <if test="amt != null">#{amt},</if>
-            <if test="stationName != null">#{stationName},</if>
             <if test="orderLiters != null">#{orderLiters},</if>
             <if test="payType != null">#{payType},</if>
             <if test="payWay != null">#{payWay},</if>
             <if test="payDate != null">#{payDate},</if>
             <if test="oilPersonnel != null">#{oilPersonnel},</if>
             <if test="orderType != null">#{orderType},</if>
-            <if test="oilType != null">#{oilType},</if>
             <if test="printNum != null">#{printNum},</if>
             <if test="classStructureNo != null">#{classStructureNo},</if>
             <if test="classStartDate != null">#{classStartDate},</if>
             <if test="classStructureDate != null">#{classStructureDate},</if>
             <if test="classStructureMan != null">#{classStructureMan},</if>
             <if test="oils != null">#{oils},</if>
+            <if test="receivableAmt != null">#{receivableAmt},</if>
+            <if test="receivedAmt != null">#{receivedAmt},</if>
+            <if test="discountAmt != null">#{discountAmt},</if>
+            <if test="discountCouponAmt != null">#{discountCouponAmt},</if>
+            <if test="discountCoupon != null">#{discountCoupon},</if>
+            <if test="wxAmt != null">#{wxAmt},</if>
+            <if test="zfbAmt != null">#{zfbAmt},</if>
+            <if test="posAmt != null">#{posAmt},</if>
+            <if test="xjAmt != null">#{xjAmt},</if>
+            <if test="didiAppAmt != null">#{didiAppAmt},</if>
+            <if test="tyAppAmt != null">#{tyAppAmt},</if>
+            <if test="otherAmt != null">#{otherAmt},</if>
+            <if test="dzkAmt != null">#{dzkAmt},</if>
+            <if test="score != null">#{score},</if>
+            <if test="memberNo != null">#{memberNo},</if>
+            <if test="memberAmt != null">#{memberAmt},</if>
          </trim>
     </insert>
 
     <update id="updateStationClassStructure" parameterType="StationClassStructure">
         update station_class_structure
         <trim prefix="SET" suffixOverrides=",">
-            <if test="stationId != null">station_id = #{stationId},</if>
             <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
             <if test="oilGun != null">oil_gun = #{oilGun},</if>
             <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="oilPirce != null">oil_pirce = #{oilPirce},</if>
+            <if test="oilType != null">oil_type = #{oilType},</if>
             <if test="consumerId != null">consumer_id = #{consumerId},</if>
             <if test="consumer != null">consumer = #{consumer},</if>
             <if test="amt != null">amt = #{amt},</if>
-            <if test="stationName != null">station_name = #{stationName},</if>
             <if test="orderLiters != null">order_liters = #{orderLiters},</if>
             <if test="payType != null">pay_type = #{payType},</if>
             <if test="payWay != null">pay_way = #{payWay},</if>
             <if test="payDate != null">pay_date = #{payDate},</if>
             <if test="oilPersonnel != null">oil_personnel = #{oilPersonnel},</if>
             <if test="orderType != null">order_type = #{orderType},</if>
-            <if test="oilType != null">oil_type = #{oilType},</if>
             <if test="printNum != null">print_num = #{printNum},</if>
             <if test="classStructureNo != null">class_structure_no = #{classStructureNo},</if>
             <if test="classStartDate != null">class_start_date = #{classStartDate},</if>
             <if test="classStructureDate != null">class_structure_date = #{classStructureDate},</if>
             <if test="classStructureMan != null">class_structure_man = #{classStructureMan},</if>
             <if test="oils != null">oils = #{oils},</if>
+            <if test="receivableAmt != null">receivable_amt = #{receivableAmt},</if>
+            <if test="receivedAmt != null">received_amt = #{receivedAmt},</if>
+            <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
+            <if test="discountCouponAmt != null">discount_coupon_amt = #{discountCouponAmt},</if>
+            <if test="discountCoupon != null">discount_coupon = #{discountCoupon},</if>
+            <if test="wxAmt != null">wx_amt = #{wxAmt},</if>
+            <if test="zfbAmt != null">zfb_amt = #{zfbAmt},</if>
+            <if test="posAmt != null">pos_amt = #{posAmt},</if>
+            <if test="xjAmt != null">xj_amt = #{xjAmt},</if>
+            <if test="didiAppAmt != null">didi_app_amt = #{didiAppAmt},</if>
+            <if test="tyAppAmt != null">ty_app_amt = #{tyAppAmt},</if>
+            <if test="otherAmt != null">other_amt = #{otherAmt},</if>
+            <if test="dzkAmt != null">dzk_amt = #{dzkAmt},</if>
+            <if test="score != null">score = #{score},</if>
+            <if test="memberNo != null">member_no = #{memberNo},</if>
+            <if test="memberAmt != null">member_amt = #{memberAmt},</if>
         </trim>
         where id = #{id}
     </update>