订单表添加字段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, car_no, customer_phone, customer_grade

修改油站实体类

YijiaRestful/src/main/java/com/platform/yijia/param/request/PayOrderRequest.java

@@ -1,5 +1,8 @@
 package com.platform.yijia.param.request;
 
+import lombok.Data;
+
+@Data
 public class PayOrderRequest {
     private String orderNo;
     private String oilGun;
@@ -11,111 +14,134 @@ public class PayOrderRequest {
     private String orderLiters;
     private String payType;
     private String payWay;
-    private  String userType;
-    private  String oilPersonnel;
-    private  String orderType;
-
-    public String getOilPersonnel() {
-        return oilPersonnel;
-    }
-
-    public void setOilPersonnel(String oilPersonnel) {
-        this.oilPersonnel = oilPersonnel;
-    }
-
-    public String getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getOilGun() {
-        return oilGun;
-    }
-
-    public void setOilGun(String oilGun) {
-        this.oilGun = oilGun;
-    }
-
-    public String getOilName() {
-        return oilName;
-    }
-
-    public void setOilName(String oilName) {
-        this.oilName = oilName;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getAmt() {
-        return amt;
-    }
-
-    public void setAmt(String amt) {
-        this.amt = amt;
-    }
-
-    public Integer getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(Integer stationId) {
-        this.stationId = stationId;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOrderLiters() {
-        return orderLiters;
-    }
-
-    public void setOrderLiters(String orderLiters) {
-        this.orderLiters = orderLiters;
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType;
-    }
-
-    public String getPayWay() {
-        return payWay;
-    }
-
-    public void setPayWay(String payWay) {
-        this.payWay = payWay;
-    }
+    private String userType;
+    private String oilPersonnel;
+    private String orderType;
+    private Double receivableAmt;   //应收金额
+    private Double receivedAmt;    //到账金额
+    private String discountCoupon;  //优惠券
+    private Double discountAmt;    //优惠金额
+    private Double discountCouponAmt; //优惠券金额
+    private Double wxAmt; //微信支付金额
+    private Double zfbAmt; //支付宝支付金额
+    private Double posAmt; //pos支付金额
+    private Double xjAmt; //现金支付金额
+    private Double didiAppAmt; //滴滴app支付金额
+    private Double tyAppAmt; //团油app支付金额
+    private Double otherAmt; //其他支付金额
+    private Double dzkAmt; //电子卡金额
+    private Integer score; //消费积分
+    private String memberNo; //会员卡号
+    private Double memberAmt; //会员支付金额
+    private Integer printCount; //打印小票数量
+    private String carNo; //车牌号
+    private String customerPhone; //客户电话
+    private String customerGrade; //客户等级
+
+
+
+
+//    public String getOilPersonnel() {
+//        return oilPersonnel;
+//    }
+//
+//    public void setOilPersonnel(String oilPersonnel) {
+//        this.oilPersonnel = oilPersonnel;
+//    }
+//
+//    public String getOrderType() {
+//        return orderType;
+//    }
+//
+//    public void setOrderType(String orderType) {
+//        this.orderType = orderType;
+//    }
+//
+//    public String getUserType() {
+//        return userType;
+//    }
+//
+//    public void setUserType(String userType) {
+//        this.userType = userType;
+//    }
+//
+//    public String getOrderNo() {
+//        return orderNo;
+//    }
+//
+//    public void setOrderNo(String orderNo) {
+//        this.orderNo = orderNo;
+//    }
+//
+//    public String getOilGun() {
+//        return oilGun;
+//    }
+//
+//    public void setOilGun(String oilGun) {
+//        this.oilGun = oilGun;
+//    }
+//
+//    public String getOilName() {
+//        return oilName;
+//    }
+//
+//    public void setOilName(String oilName) {
+//        this.oilName = oilName;
+//    }
+//
+//    public String getToken() {
+//        return token;
+//    }
+//
+//    public void setToken(String token) {
+//        this.token = token;
+//    }
+//
+//    public String getAmt() {
+//        return amt;
+//    }
+//
+//    public void setAmt(String amt) {
+//        this.amt = amt;
+//    }
+//
+//    public Integer getStationId() {
+//        return stationId;
+//    }
+//
+//    public void setStationId(Integer stationId) {
+//        this.stationId = stationId;
+//    }
+//
+//    public String getStatus() {
+//        return status;
+//    }
+//
+//    public void setStatus(String status) {
+//        this.status = status;
+//    }
+//
+//    public String getOrderLiters() {
+//        return orderLiters;
+//    }
+//
+//    public void setOrderLiters(String orderLiters) {
+//        this.orderLiters = orderLiters;
+//    }
+//
+//    public String getPayType() {
+//        return payType;
+//    }
+//
+//    public void setPayType(String payType) {
+//        this.payType = payType;
+//    }
+//
+//    public String getPayWay() {
+//        return payWay;
+//    }
+//
+//    public void setPayWay(String payWay) {
+//        this.payWay = payWay;
+//    }
 }

YijiaRestful/src/main/java/com/platform/yijia/param/response/StationInfoResponse.java

@@ -13,13 +13,13 @@ public class StationInfoResponse {
     private String stationLatitude;//纬度
     private String stationPic;//油站照片
     private Double distance;//距离
-    private Integer mno;//商户号
+    private String mno;//商户号
 
-    public Integer getMno() {
+    public String getMno() {
         return mno;
     }
 
-    public void setMno(Integer mno) {
+    public void setMno(String mno) {
         this.mno = mno;
     }
 

YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -1,7 +1,10 @@
 package com.platform.yijia.pojo;
 
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
 public class PayOrder {
     /**
      *
@@ -64,7 +67,7 @@ public class PayOrder {
      *
      * @mbg.generated
      */
-    private String amt;
+    private Double amt;
 
     /**
      *
@@ -149,404 +152,584 @@ public class PayOrder {
 
     private String oilPirce;
     private String stationName;
-
-    public String getOilPirce() {
-        return oilPirce;
-    }
-
-    public void setOilPirce(String oilPirce) {
-        this.oilPirce = oilPirce;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.order_id
-     *
-     * @return the value of pay_order.order_id
-     *
-     * @mbg.generated
-     */
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.order_id
-     *
-     * @param orderId the value for pay_order.order_id
-     *
-     * @mbg.generated
-     */
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.order_no
-     *
-     * @return the value of pay_order.order_no
-     *
-     * @mbg.generated
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.order_no
-     *
-     * @param orderNo the value for pay_order.order_no
-     *
-     * @mbg.generated
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo == null ? null : orderNo.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.oil_gun
-     *
-     * @return the value of pay_order.oil_gun
-     *
-     * @mbg.generated
-     */
-    public String getOilGun() {
-        return oilGun;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.oil_gun
-     *
-     * @param oilGun the value for pay_order.oil_gun
-     *
-     * @mbg.generated
-     */
-    public void setOilGun(String oilGun) {
-        this.oilGun = oilGun == null ? null : oilGun.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.oil_name
-     *
-     * @return the value of pay_order.oil_name
-     *
-     * @mbg.generated
-     */
-    public String getOilName() {
-        return oilName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.oil_name
-     *
-     * @param oilName the value for pay_order.oil_name
-     *
-     * @mbg.generated
-     */
-    public void setOilName(String oilName) {
-        this.oilName = oilName == null ? null : oilName.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.consumer_id
-     *
-     * @return the value of pay_order.consumer_id
-     *
-     * @mbg.generated
-     */
-    public Integer getConsumerId() {
-        return consumerId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.consumer_id
-     *
-     * @param consumerId the value for pay_order.consumer_id
-     *
-     * @mbg.generated
-     */
-    public void setConsumerId(Integer consumerId) {
-        this.consumerId = consumerId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.consumer
-     *
-     * @return the value of pay_order.consumer
-     *
-     * @mbg.generated
-     */
-    public String getConsumer() {
-        return consumer;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.consumer
-     *
-     * @param consumer the value for pay_order.consumer
-     *
-     * @mbg.generated
-     */
-    public void setConsumer(String consumer) {
-        this.consumer = consumer == null ? null : consumer.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.amt
-     *
-     * @return the value of pay_order.amt
-     *
-     * @mbg.generated
-     */
-    public String getAmt() {
-        return amt;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.amt
-     *
-     * @param amt the value for pay_order.amt
-     *
-     * @mbg.generated
-     */
-    public void setAmt(String amt) {
-        this.amt = amt == null ? null : amt.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.station_id
-     *
-     * @return the value of pay_order.station_id
-     *
-     * @mbg.generated
-     */
-    public Integer getStationId() {
-        return stationId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.station_id
-     *
-     * @param stationId the value for pay_order.station_id
-     *
-     * @mbg.generated
-     */
-    public void setStationId(Integer stationId) {
-        this.stationId = stationId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.status
-     *
-     * @return the value of pay_order.status
-     *
-     * @mbg.generated
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.status
-     *
-     * @param status the value for pay_order.status
-     *
-     * @mbg.generated
-     */
-    public void setStatus(String status) {
-        this.status = status == null ? null : status.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.order_liters
-     *
-     * @return the value of pay_order.order_liters
-     *
-     * @mbg.generated
-     */
-    public String getOrderLiters() {
-        return orderLiters;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.order_liters
-     *
-     * @param orderLiters the value for pay_order.order_liters
-     *
-     * @mbg.generated
-     */
-    public void setOrderLiters(String orderLiters) {
-        this.orderLiters = orderLiters == null ? null : orderLiters.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.pay_type
-     *
-     * @return the value of pay_order.pay_type
-     *
-     * @mbg.generated
-     */
-    public String getPayType() {
-        return payType;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.pay_type
-     *
-     * @param payType the value for pay_order.pay_type
-     *
-     * @mbg.generated
-     */
-    public void setPayType(String payType) {
-        this.payType = payType == null ? null : payType.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.pay_way
-     *
-     * @return the value of pay_order.pay_way
-     *
-     * @mbg.generated
-     */
-    public String getPayWay() {
-        return payWay;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.pay_way
-     *
-     * @param payWay the value for pay_order.pay_way
-     *
-     * @mbg.generated
-     */
-    public void setPayWay(String payWay) {
-        this.payWay = payWay == null ? null : payWay.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.pay_date
-     *
-     * @return the value of pay_order.pay_date
-     *
-     * @mbg.generated
-     */
-    public Date getPayDate() {
-        return payDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.pay_date
-     *
-     * @param payDate the value for pay_order.pay_date
-     *
-     * @mbg.generated
-     */
-    public void setPayDate(Date payDate) {
-        this.payDate = payDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.oil_personnel
-     *
-     * @return the value of pay_order.oil_personnel
-     *
-     * @mbg.generated
-     */
-    public String getOilPersonnel() {
-        return oilPersonnel;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.oil_personnel
-     *
-     * @param oilPersonnel the value for pay_order.oil_personnel
-     *
-     * @mbg.generated
-     */
-    public void setOilPersonnel(String oilPersonnel) {
-        this.oilPersonnel = oilPersonnel == null ? null : oilPersonnel.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.created_date
-     *
-     * @return the value of pay_order.created_date
-     *
-     * @mbg.generated
-     */
-    public Date getCreatedDate() {
-        return createdDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.created_date
-     *
-     * @param createdDate the value for pay_order.created_date
-     *
-     * @mbg.generated
-     */
-    public void setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column pay_order.order_type
-     *
-     * @return the value of pay_order.order_type
-     *
-     * @mbg.generated
-     */
-    public String getOrderType() {
-        return orderType;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column pay_order.order_type
-     *
-     * @param orderType the value for pay_order.order_type
-     *
-     * @mbg.generated
-     */
-    public void setOrderType(String orderType) {
-        this.orderType = orderType == null ? null : orderType.trim();
-    }
+    private Double receivableAmt;   //应收金额
+    private Double receivedAmt;    //到账金额
+    private String discountCoupon;  //优惠券
+    private Double discountAmt;    //优惠金额
+    private Double discountCouponAmt; //优惠券金额
+    private Double wxAmt; //微信支付金额
+    private Double zfbAmt; //支付宝支付金额
+    private Double posAmt; //pos支付金额
+    private Double xjAmt; //现金支付金额
+    private Double didiAppAmt; //滴滴app支付金额
+    private Double tyAppAmt; //团油app支付金额
+    private Double otherAmt; //其他支付金额
+    private Double dzkAmt; //电子卡金额
+    private Integer score; //消费积分
+    private String memberNo; //会员卡号
+    private Double memberAmt; //会员支付金额
+    private Integer printCount; //打印小票数量
+    private String carNo; //车牌号
+    private String customerPhone; //客户电话
+    private String customerGrade; //客户等级
+
+//    public Double getReceivableAmt() {
+//        return receivableAmt;
+//    }
+//
+//    public void setReceivableAmt(Double receivableAmt) {
+//        this.receivableAmt = receivableAmt;
+//    }
+//
+//    public Double getReceivedAmt() {
+//        return receivedAmt;
+//    }
+//
+//    public void setReceivedAmt(Double receivedAmt) {
+//        this.receivedAmt = receivedAmt;
+//    }
+//
+//    public String getDiscountCoupon() {
+//        return discountCoupon;
+//    }
+//
+//    public void setDiscountCoupon(String discountCoupon) {
+//        this.discountCoupon = discountCoupon;
+//    }
+//
+//    public Double getDiscountAmt() {
+//        return discountAmt;
+//    }
+//
+//    public void setDiscountAmt(Double discountAmt) {
+//        this.discountAmt = discountAmt;
+//    }
+//
+//    public Double getDiscountCouponAmt() {
+//        return discountCouponAmt;
+//    }
+//
+//    public void setDiscountCouponAmt(Double discountCouponAmt) {
+//        this.discountCouponAmt = discountCouponAmt;
+//    }
+//
+//    public Double getWxAmt() {
+//        return wxAmt;
+//    }
+//
+//    public void setWxAmt(Double wxAmt) {
+//        this.wxAmt = wxAmt;
+//    }
+//
+//    public Double getZfbAmt() {
+//        return zfbAmt;
+//    }
+//
+//    public void setZfbAmt(Double zfbAmt) {
+//        this.zfbAmt = zfbAmt;
+//    }
+//
+//    public Double getPosAmt() {
+//        return posAmt;
+//    }
+//
+//    public void setPosAmt(Double posAmt) {
+//        this.posAmt = posAmt;
+//    }
+//
+//    public Double getXjAmt() {
+//        return xjAmt;
+//    }
+//
+//    public void setXjAmt(Double xjAmt) {
+//        this.xjAmt = xjAmt;
+//    }
+//
+//    public Double getDidiAppAmt() {
+//        return didiAppAmt;
+//    }
+//
+//    public void setDidiAppAmt(Double didiAppAmt) {
+//        this.didiAppAmt = didiAppAmt;
+//    }
+//
+//    public Double getTyAppAmt() {
+//        return tyAppAmt;
+//    }
+//
+//    public void setTyAppAmt(Double tyAppAmt) {
+//        this.tyAppAmt = tyAppAmt;
+//    }
+//
+//    public Double getOtherAmt() {
+//        return otherAmt;
+//    }
+//
+//    public void setOtherAmt(Double otherAmt) {
+//        this.otherAmt = otherAmt;
+//    }
+//
+//    public Double getDzkAmt() {
+//        return dzkAmt;
+//    }
+//
+//    public void setDzkAmt(Double dzkAmt) {
+//        this.dzkAmt = dzkAmt;
+//    }
+//
+//    public Integer getScore() {
+//        return score;
+//    }
+//
+//    public void setScore(Integer score) {
+//        this.score = score;
+//    }
+//
+//    public String getMemberNo() {
+//        return memberNo;
+//    }
+//
+//    public void setMemberNo(String memberNo) {
+//        this.memberNo = memberNo;
+//    }
+//
+//    public Double getMemberAmt() {
+//        return memberAmt;
+//    }
+//
+//    public void setMemberAmt(Double memberAmt) {
+//        this.memberAmt = memberAmt;
+//    }
+//
+//    public Integer getPrintCount() {
+//        return printCount;
+//    }
+//
+//    public void setPrintCount(Integer printCount) {
+//        this.printCount = printCount;
+//    }
+//
+//    public String getCarNo() {
+//        return carNo;
+//    }
+//
+//    public void setCarNo(String carNo) {
+//        this.carNo = carNo;
+//    }
+//
+//    public String getCustomerPhone() {
+//        return customerPhone;
+//    }
+//
+//    public void setCustomerPhone(String customerPhone) {
+//        this.customerPhone = customerPhone;
+//    }
+//
+//    public String getCustomerGrade() {
+//        return customerGrade;
+//    }
+//
+//    public void setCustomerGrade(String customerGrade) {
+//        this.customerGrade = customerGrade;
+//    }
+//
+//    public String getOilPirce() {
+//        return oilPirce;
+//    }
+//
+//    public void setOilPirce(String oilPirce) {
+//        this.oilPirce = oilPirce;
+//    }
+//
+//    public String getStationName() {
+//        return stationName;
+//    }
+//
+//    public void setStationName(String stationName) {
+//        this.stationName = stationName;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.order_id
+//     *
+//     * @return the value of pay_order.order_id
+//     *
+//     * @mbg.generated
+//     */
+//    public Integer getOrderId() {
+//        return orderId;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.order_id
+//     *
+//     * @param orderId the value for pay_order.order_id
+//     *
+//     * @mbg.generated
+//     */
+//    public void setOrderId(Integer orderId) {
+//        this.orderId = orderId;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.order_no
+//     *
+//     * @return the value of pay_order.order_no
+//     *
+//     * @mbg.generated
+//     */
+//    public String getOrderNo() {
+//        return orderNo;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.order_no
+//     *
+//     * @param orderNo the value for pay_order.order_no
+//     *
+//     * @mbg.generated
+//     */
+//    public void setOrderNo(String orderNo) {
+//        this.orderNo = orderNo == null ? null : orderNo.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.oil_gun
+//     *
+//     * @return the value of pay_order.oil_gun
+//     *
+//     * @mbg.generated
+//     */
+//    public String getOilGun() {
+//        return oilGun;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.oil_gun
+//     *
+//     * @param oilGun the value for pay_order.oil_gun
+//     *
+//     * @mbg.generated
+//     */
+//    public void setOilGun(String oilGun) {
+//        this.oilGun = oilGun == null ? null : oilGun.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.oil_name
+//     *
+//     * @return the value of pay_order.oil_name
+//     *
+//     * @mbg.generated
+//     */
+//    public String getOilName() {
+//        return oilName;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.oil_name
+//     *
+//     * @param oilName the value for pay_order.oil_name
+//     *
+//     * @mbg.generated
+//     */
+//    public void setOilName(String oilName) {
+//        this.oilName = oilName == null ? null : oilName.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.consumer_id
+//     *
+//     * @return the value of pay_order.consumer_id
+//     *
+//     * @mbg.generated
+//     */
+//    public Integer getConsumerId() {
+//        return consumerId;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.consumer_id
+//     *
+//     * @param consumerId the value for pay_order.consumer_id
+//     *
+//     * @mbg.generated
+//     */
+//    public void setConsumerId(Integer consumerId) {
+//        this.consumerId = consumerId;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.consumer
+//     *
+//     * @return the value of pay_order.consumer
+//     *
+//     * @mbg.generated
+//     */
+//    public String getConsumer() {
+//        return consumer;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.consumer
+//     *
+//     * @param consumer the value for pay_order.consumer
+//     *
+//     * @mbg.generated
+//     */
+//    public void setConsumer(String consumer) {
+//        this.consumer = consumer == null ? null : consumer.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.amt
+//     *
+//     * @return the value of pay_order.amt
+//     *
+//     * @mbg.generated
+//     */
+//    public String getAmt() {
+//        return amt;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.amt
+//     *
+//     * @param amt the value for pay_order.amt
+//     *
+//     * @mbg.generated
+//     */
+//    public void setAmt(String amt) {
+//        this.amt = amt == null ? null : amt.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.station_id
+//     *
+//     * @return the value of pay_order.station_id
+//     *
+//     * @mbg.generated
+//     */
+//    public Integer getStationId() {
+//        return stationId;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.station_id
+//     *
+//     * @param stationId the value for pay_order.station_id
+//     *
+//     * @mbg.generated
+//     */
+//    public void setStationId(Integer stationId) {
+//        this.stationId = stationId;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.status
+//     *
+//     * @return the value of pay_order.status
+//     *
+//     * @mbg.generated
+//     */
+//    public String getStatus() {
+//        return status;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.status
+//     *
+//     * @param status the value for pay_order.status
+//     *
+//     * @mbg.generated
+//     */
+//    public void setStatus(String status) {
+//        this.status = status == null ? null : status.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.order_liters
+//     *
+//     * @return the value of pay_order.order_liters
+//     *
+//     * @mbg.generated
+//     */
+//    public String getOrderLiters() {
+//        return orderLiters;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.order_liters
+//     *
+//     * @param orderLiters the value for pay_order.order_liters
+//     *
+//     * @mbg.generated
+//     */
+//    public void setOrderLiters(String orderLiters) {
+//        this.orderLiters = orderLiters == null ? null : orderLiters.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.pay_type
+//     *
+//     * @return the value of pay_order.pay_type
+//     *
+//     * @mbg.generated
+//     */
+//    public String getPayType() {
+//        return payType;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.pay_type
+//     *
+//     * @param payType the value for pay_order.pay_type
+//     *
+//     * @mbg.generated
+//     */
+//    public void setPayType(String payType) {
+//        this.payType = payType == null ? null : payType.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.pay_way
+//     *
+//     * @return the value of pay_order.pay_way
+//     *
+//     * @mbg.generated
+//     */
+//    public String getPayWay() {
+//        return payWay;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.pay_way
+//     *
+//     * @param payWay the value for pay_order.pay_way
+//     *
+//     * @mbg.generated
+//     */
+//    public void setPayWay(String payWay) {
+//        this.payWay = payWay == null ? null : payWay.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.pay_date
+//     *
+//     * @return the value of pay_order.pay_date
+//     *
+//     * @mbg.generated
+//     */
+//    public Date getPayDate() {
+//        return payDate;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.pay_date
+//     *
+//     * @param payDate the value for pay_order.pay_date
+//     *
+//     * @mbg.generated
+//     */
+//    public void setPayDate(Date payDate) {
+//        this.payDate = payDate;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.oil_personnel
+//     *
+//     * @return the value of pay_order.oil_personnel
+//     *
+//     * @mbg.generated
+//     */
+//    public String getOilPersonnel() {
+//        return oilPersonnel;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.oil_personnel
+//     *
+//     * @param oilPersonnel the value for pay_order.oil_personnel
+//     *
+//     * @mbg.generated
+//     */
+//    public void setOilPersonnel(String oilPersonnel) {
+//        this.oilPersonnel = oilPersonnel == null ? null : oilPersonnel.trim();
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.created_date
+//     *
+//     * @return the value of pay_order.created_date
+//     *
+//     * @mbg.generated
+//     */
+//    public Date getCreatedDate() {
+//        return createdDate;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.created_date
+//     *
+//     * @param createdDate the value for pay_order.created_date
+//     *
+//     * @mbg.generated
+//     */
+//    public void setCreatedDate(Date createdDate) {
+//        this.createdDate = createdDate;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method returns the value of the database column pay_order.order_type
+//     *
+//     * @return the value of pay_order.order_type
+//     *
+//     * @mbg.generated
+//     */
+//    public String getOrderType() {
+//        return orderType;
+//    }
+//
+//    /**
+//     * This method was generated by MyBatis Generator.
+//     * This method sets the value of the database column pay_order.order_type
+//     *
+//     * @param orderType the value for pay_order.order_type
+//     *
+//     * @mbg.generated
+//     */
+//    public void setOrderType(String orderType) {
+//        this.orderType = orderType == null ? null : orderType.trim();
+//    }
 }

YijiaRestful/src/main/java/com/platform/yijia/pojo/StationInfo.java

@@ -98,7 +98,7 @@ public class StationInfo {
      *
      * @mbg.generated
      */
-    private Integer mno;
+    private String mno;
 
     /**
      *
@@ -357,7 +357,7 @@ public class StationInfo {
      *
      * @mbg.generated
      */
-    public Integer getMno() {
+    public String getMno() {
         return mno;
     }
 
@@ -369,7 +369,7 @@ public class StationInfo {
      *
      * @mbg.generated
      */
-    public void setMno(Integer mno) {
+    public void setMno(String mno) {
         this.mno = mno;
     }
 

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -23,7 +23,7 @@ public class PayOrderServiceImpl implements PayOrderService {
     @Resource
     private PayOrderMapper payOrderMapper;
 
-    /**
+    /*
      * 添加订单信息
      * @param payOrderRequest
      * @param payOrder
@@ -42,7 +42,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         String ordNo=System.nanoTime()+result;
         payOrder.setOrderNo(ordNo);
         payOrder.setOilName(payOrderRequest.getOilName());      //油品名称
-        payOrder.setAmt(payOrderRequest.getAmt());              //金额
+        payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));              //金额
         payOrder.setStationId(payOrderRequest.getStationId());  //油站id
         payOrder.setStatus("0");         //创建订单 未支付状态 0
         payOrder.setPayType("sxf");      //支付类型
@@ -59,15 +59,23 @@ public class PayOrderServiceImpl implements PayOrderService {
         params.put("oilGunId", payOrderRequest.getOilGun());
         params.put("stationId", payOrderRequest.getStationId());
         String oilPersonnel = "";
-        //使用list原因：一个枪号对应多个加油员场景
+        //使用list原因：(当时无班结管理先用list处理)一个枪号对应多个加油员场景
         List<Map> mapResultList = payOrderMapper.selectOilGunNoAndOilPrice(params);
         if(mapResultList != null && mapResultList.size() > 0){
             for (Map per : mapResultList){
-                oilPersonnel += per.get("personelName").toString() +",";
+                if(per.containsKey("personelName") && per.get("personelName").toString() !=null && per.get("personelName").toString() !=""){
+                    oilPersonnel += per.get("personelName").toString() +",";
+                }
+            }
+            if(oilPersonnel !=""){
+                payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
+            }
+            if(mapResultList.get(0).containsKey("oliGunNo") && mapResultList.get(0).get("oliGunNo").toString() !="" && mapResultList.get(0).get("oliGunNo").toString() !=null ){
+                payOrder.setOilGun(mapResultList.get(0).get("oliGunNo").toString());                //存入油枪号
+            }
+            if(mapResultList.get(0).containsKey("stationName") && mapResultList.get(0).get("stationName").toString() !="" && mapResultList.get(0).get("stationName").toString() !=null ){
+                payOrder.setStationName(mapResultList.get(0).get("stationName").toString());        //油站名称
             }
-            payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
-            payOrder.setOilGun(mapResultList.get(0).get("oliGunNo").toString());                //存入油枪号
-            payOrder.setStationName(mapResultList.get(0).get("stationName").toString());        //油站名称
         }
         //根据油品名称和油站id获取当前油品调价信息
         params.put("oilName", payOrderRequest.getOilName());

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -13,7 +13,7 @@
     <result column="oil_price" jdbcType="VARCHAR" property="oilPirce" />
     <result column="consumer_id" jdbcType="INTEGER" property="consumerId" />
     <result column="consumer" jdbcType="VARCHAR" property="consumer" />
-    <result column="amt" jdbcType="VARCHAR" property="amt" />
+    <result column="amt" jdbcType="DOUBLE" property="amt" />
     <result column="station_id" jdbcType="INTEGER" property="stationId" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="order_liters" jdbcType="VARCHAR" property="orderLiters" />
@@ -24,6 +24,32 @@
     <result column="created_date" jdbcType="TIMESTAMP" property="createdDate" />
     <result column="order_type" jdbcType="CHAR" property="orderType" />
     <result column="station_name" jdbcType="CHAR" property="stationName" />
+
+
+    <result column="receivable_amt" jdbcType="DOUBLE" property="receivableAmt" />
+    <result column="received_amt" jdbcType="DOUBLE" property="receivedAmt" />
+    <result column="discount_coupon" jdbcType="VARCHAR" property="discountCoupon" />
+    <result column="discount_amt" jdbcType="DOUBLE" property="discountAmt" />
+    <result column="discount_coupon_amt" jdbcType="DOUBLE" property="discountCouponAmt" />
+
+    <result column="wx_amt" jdbcType="DOUBLE" property="wxAmt" />
+    <result column="zfb_amt" jdbcType="DOUBLE" property="zfbAmt" />
+    <result column="pos_amt" jdbcType="DOUBLE" property="posAmt" />
+    <result column="xj_amt" jdbcType="DOUBLE" property="xjAmt" />
+    <result column="didi_app_amt" jdbcType="DOUBLE" property="didiAppAmt" />
+
+    <result column="ty_app_amt" jdbcType="DOUBLE" property="tyAppAmt" />
+    <result column="other_amt" jdbcType="DOUBLE" property="otherAmt" />
+    <result column="dzk_amt" jdbcType="TIMESTAMP" property="dzkAmt" />
+    <result column="score" jdbcType="INTEGER" property="score" />
+    <result column="member_no" jdbcType="VARCHAR" property="memberNo" />
+
+    <result column="member_amt" jdbcType="DOUBLE" property="memberAmt" />
+    <result column="print_count" jdbcType="INTEGER" property="printCount" />
+    <result column="car_no" jdbcType="VARCHAR" property="carNo" />
+    <result column="customer_phone" jdbcType="VARCHAR" property="customerPhone" />
+    <result column="customer_grade" jdbcType="VARCHAR" property="customerGrade" />
+
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -97,7 +123,10 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     order_id, order_no, oil_gun, oil_name, oil_pirce, consumer_id, consumer, amt, station_id, status,
-    order_liters, pay_type, pay_way, pay_date, oil_personnel, created_date, order_type, station_name
+    order_liters, pay_type, pay_way, pay_date, oil_personnel, created_date, order_type, station_name,
+    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, car_no, customer_phone, customer_grade
   </sql>
 
   <!-- 根据油品名称和油站查询油枪编号和价格 -->
@@ -198,18 +227,28 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into pay_order (order_id, order_no, oil_gun,
-      oil_name, oli_price, consumer_id, consumer,
-      amt, station_id, status,
-      order_liters, pay_type, pay_way,
-      pay_date, oil_personnel, created_date,
-      order_type, station_name)
-    values (#{orderId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{oilGun,jdbcType=VARCHAR},
-      #{oilName,jdbcType=VARCHAR}, #{oilPirce,jdbcType=VARCHAR}, #{consumerId,jdbcType=INTEGER}, #{consumer,jdbcType=VARCHAR},
-      #{amt,jdbcType=VARCHAR}, #{stationId,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR},
-      #{orderLiters,jdbcType=VARCHAR}, #{payType,jdbcType=VARCHAR}, #{payWay,jdbcType=VARCHAR},
-      #{payDate,jdbcType=TIMESTAMP}, #{oilPersonnel,jdbcType=VARCHAR}, #{createdDate,jdbcType=TIMESTAMP},
-      #{orderType,jdbcType=CHAR}, #{stationName,jdbcType=VARCHAR})
+    INSERT into
+        pay_order (order_id, order_no, oil_gun,
+        oil_name, oli_price, consumer_id, consumer,
+        amt, station_id, status,
+        order_liters, pay_type, pay_way,
+        pay_date, oil_personnel, created_date,
+        order_type, station_name, 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, car_no, customer_phone, customer_grade)
+    VALUES (
+        #{orderId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{oilGun,jdbcType=VARCHAR},
+        #{oilName,jdbcType=VARCHAR}, #{oilPirce,jdbcType=VARCHAR}, #{consumerId,jdbcType=INTEGER}, #{consumer,jdbcType=VARCHAR},
+        #{amt,jdbcType=DOUBLE}, #{stationId,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR},
+        #{orderLiters,jdbcType=VARCHAR}, #{payType,jdbcType=VARCHAR}, #{payWay,jdbcType=VARCHAR},
+        #{payDate,jdbcType=TIMESTAMP}, #{oilPersonnel,jdbcType=VARCHAR}, #{createdDate,jdbcType=TIMESTAMP},
+        #{orderType,jdbcType=CHAR}, #{stationName,jdbcType=VARCHAR},
+        #{receivableAmt,jdbcType=DOUBLE}, #{receivedAmt,jdbcType=DOUBLE},#{discountAmt,jdbcType=DOUBLE}, #{discountCouponAmt,jdbcType=DOUBLE},
+        #{discountCoupon,jdbcType=INTEGER}, #{wxAmt,jdbcType=DOUBLE}, #{zfbAmt,jdbcType=DOUBLE},#{posAmt,jdbcType=DOUBLE},
+        #{xjAmt,jdbcType=DOUBLE}, #{didiAppAmt,jdbcType=DOUBLE}, #{tyAppAmt,jdbcType=DOUBLE}, #{otherAmt,jdbcType=DOUBLE},
+        #{dzkAmt,jdbcType=DOUBLE}, #{score,jdbcType=INTEGER}, #{memberNo,jdbcType=VARCHAR}, #{memberAmt,jdbcType=DOUBLE},
+        #{printCount,jdbcType=INTEGER}, #{carNo,jdbcType=VARCHAR}, #{customerPhone,jdbcType=VARCHAR}, #{customerGrade,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.platform.yijia.pojo.PayOrder">
     <!--
@@ -272,6 +311,73 @@
       <if test="stationName != null">
         station_name,
       </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="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>
+
+
+      <if test="printCount != null">
+        print_count,
+      </if>
+      <if test="carNo != null">
+        car_no,
+      </if>
+      <if test="customerPhone != null">
+        customer_phone,
+      </if>
+      <if test="customerGrade != null">
+        customer_grade,
+      </if>
+
+
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderId != null">
@@ -296,7 +402,7 @@
         #{consumer,jdbcType=VARCHAR},
       </if>
       <if test="amt != null">
-        #{amt,jdbcType=VARCHAR},
+        #{amt,jdbcType=DOUBLE},
       </if>
       <if test="stationId != null">
         #{stationId,jdbcType=INTEGER},
@@ -328,6 +434,73 @@
       <if test="stationName != null">
         #{stationName,jdbcType=VARCHAR},
       </if>
+
+      <if test="receivableAmt != null">
+        #{receivable_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="receivedAmt != null">
+        #{received_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="discountAmt != null">
+        #{discount_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="discountCouponAmt != null">
+        #{discount_coupon_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="discountCoupon != null">
+        #{discount_coupon,jdbcType=VARCHAR},
+      </if>
+
+
+      <if test="wxAmt != null">
+        #{wx_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="zfbAmt != null">
+        #{zfb_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="posAmt != null">
+        #{pos_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="xjAmt != null">
+        #{xj_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="didiAppAmt != null">
+        #{didi_app_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="tyAppAmt != null">
+        #{ty_app_amt,jdbcType=DOUBLE},
+      </if>
+
+
+      <if test="otherAmt != null">
+        #{other_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="dzkAmt != null">
+        #{dzk_amt,jdbcType=DOUBLE},
+      </if>
+      <if test="score != null">
+        #{score,jdbcType=INTEGER},
+      </if>
+      <if test="memberNo != null">
+        #{member_no,jdbcType=VARCHAR},
+      </if>
+      <if test="memberAmt != null">
+        #{member_amt,jdbcType=DOUBLE},
+      </if>
+
+
+      <if test="printCount != null">
+        #{print_count,jdbcType=INTEGER},
+      </if>
+      <if test="carNo != null">
+        #{car_no,jdbcType=VARCHAR},
+      </if>
+      <if test="customerPhone != null">
+        #{customer_phone,jdbcType=VARCHAR},
+      </if>
+      <if test="customerGrade != null">
+        #{customer_grade,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.platform.yijia.pojo.PayOrderExample" resultType="java.lang.Long">
@@ -369,7 +542,7 @@
         consumer = #{record.consumer,jdbcType=VARCHAR},
       </if>
       <if test="record.amt != null">
-        amt = #{record.amt,jdbcType=VARCHAR},
+        amt = #{record.amt,jdbcType=DOUBLE},
       </if>
       <if test="record.stationId != null">
         station_id = #{record.stationId,jdbcType=INTEGER},
@@ -401,6 +574,74 @@
       <if test="record.stationName != null">
         station_name = #{record.stationName,jdbcType=VARCHAR},
       </if>
+
+
+      <if test="record.receivableAmt != null">
+        receivable_amt = #{record.receivableAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.receivedAmt != null">
+        received_amt = #{record.receivedAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.discountAmt != null">
+        discount_amt = #{record.discountAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.discountCouponAmt != null">
+        discount_coupon_amt = #{record.discountCouponAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.discountCoupon != null">
+        discount_coupon = #{record.discountCoupon,jdbcType=VARCHAR},
+      </if>
+
+
+      <if test="record.wxAmt != null">
+        wx_amt = #{record.wxAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.zfbAmt != null">
+        zfb_amt = #{record.zfbAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.posAmt != null">
+        pos_amt = #{record.posAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.xjAmt != null">
+        xj_amt = #{record.xjAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.didiAppAmt != null">
+        didi_app_amt = #{record.didiAppAmt,jdbcType=DOUBLE},
+      </if>
+
+
+      <if test="record.tyAppAmt != null">
+        ty_app_amt = #{record.tyAppAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.otherAmt != null">
+        other_amt = #{record.otherAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.dzkAmt != null">
+        dzk_amt = #{record.dzkAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.score != null">
+        score = #{record.score,jdbcType=INTEGER},
+      </if>
+      <if test="record.memberNo != null">
+        member_no = #{record.memberNo,jdbcType=VARCHAR},
+      </if>
+
+
+      <if test="record.memberAmt != null">
+        member_amt = #{record.memberAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="record.printCount != null">
+        print_count = #{record.printCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.carNo != null">
+        car_no = #{record.carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerPhone != null">
+        customer_phone = #{record.customerPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerGrade != null">
+        customer_grade = #{record.customerGrade,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -419,7 +660,7 @@
       oil_pirce = #{record.oilPirce,jdbcType=VARCHAR},
       consumer_id = #{record.consumerId,jdbcType=INTEGER},
       consumer = #{record.consumer,jdbcType=VARCHAR},
-      amt = #{record.amt,jdbcType=VARCHAR},
+      amt = #{record.amt,jdbcType=DOUBLE},
       station_id = #{record.stationId,jdbcType=INTEGER},
       status = #{record.status,jdbcType=VARCHAR},
       order_liters = #{record.orderLiters,jdbcType=VARCHAR},
@@ -429,7 +670,31 @@
       oil_personnel = #{record.oilPersonnel,jdbcType=VARCHAR},
       created_date = #{record.createdDate,jdbcType=TIMESTAMP},
       order_type = #{record.orderType,jdbcType=CHAR},
-      station_name = #{record.stationName,jdbcType=VARCHAR}
+      station_name = #{record.stationName,jdbcType=VARCHAR},
+
+      receivable_amt = #{record.receivableAmt,jdbcType=DOUBLE},
+      received_amt = #{record.receivedAmt,jdbcType=DOUBLE},
+      discount_amt = #{record.discountAmt,jdbcType=DOUBLE},
+      discount_coupon_amt = #{record.discountCouponAmt,jdbcType=DOUBLE},
+      discount_coupon = #{record.discountCoupon,jdbcType=DOUBLE},
+
+      wx_amt = #{record.wxAmt,jdbcType=DOUBLE},
+      zfb_amt = #{record.zfbAmt,jdbcType=DOUBLE},
+      pos_amt = #{record.posAmt,jdbcType=DOUBLE},
+      xj_amt = #{record.xjAmt,jdbcType=DOUBLE},
+      didi_app_amt = #{record.didiAppAmt,jdbcType=DOUBLE},
+
+      ty_app_amt = #{record.tyAppAmt,jdbcType=DOUBLE},
+      other_amt = #{record.otherAmt,jdbcType=DOUBLE},
+      dzk_amt = #{record.dzkAmt,jdbcType=DOUBLE},
+      score = #{record.score,jdbcType=INTEGER},
+      member_no = #{record.memberNo,jdbcType=VARCHAR},
+
+      member_amt = #{record.memberAmt,jdbcType=DOUBLE},
+      print_count = #{record.printCount,jdbcType=INTEGER},
+      car_no = #{record.carNo,jdbcType=VARCHAR},
+      customer_phone = #{record.customerPhone,jdbcType=VARCHAR},
+      customer_grade = #{record.customerGrade,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -460,7 +725,7 @@
         consumer = #{consumer,jdbcType=VARCHAR},
       </if>
       <if test="amt != null">
-        amt = #{amt,jdbcType=VARCHAR},
+        amt = #{amt,jdbcType=DOUBLE},
       </if>
       <if test="stationId != null">
         station_id = #{stationId,jdbcType=INTEGER},
@@ -492,6 +757,74 @@
       <if test="stationName != null">
         station_name = #{stationName,jdbcType=CHAR},
       </if>
+
+
+      <if test="receivableAmt != null">
+        receivable_amt = #{receivableAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="receivedAmt != null">
+        received_amt = #{receivedAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="discountAmt != null">
+        discount_amt = #{discountAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="discountCouponAmt != null">
+        discount_coupon_amt = #{discountCouponAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="discountCoupon != null">
+        discount_coupon = #{discountCoupon,jdbcType=VARCHAR},
+      </if>
+
+
+      <if test="wxAmt != null">
+        wx_amt = #{wxAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="zfbAmt != null">
+        zfb_amt = #{zfbAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="posAmt != null">
+        pos_amt = #{posAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="xjAmt != null">
+        xj_amt = #{xjAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="didiAppAmt != null">
+        didi_app_amt = #{didiAppAmt,jdbcType=DOUBLE},
+      </if>
+
+
+      <if test="tyAppAmt != null">
+        ty_app_amt = #{tyAppAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="otherAmt != null">
+        other_amt = #{otherAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="dzkAmt != null">
+        dzk_amt = #{dzkAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="score != null">
+        score = #{score,jdbcType=INTEGER},
+      </if>
+      <if test="memberNo != null">
+        member_no = #{memberNo,jdbcType=VARCHAR},
+      </if>
+
+      <if test="memberAmt != null">
+        member_amt = #{memberAmt,jdbcType=DOUBLE},
+      </if>
+      <if test="printCount != null">
+        print_count = #{printCount,jdbcType=INTEGER},
+      </if>
+      <if test="carNo != null">
+        car_no = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="customerPhone != null">
+        customer_phone = #{customerPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="customerGrade != null">
+        customer_grade = #{customerGrade,jdbcType=VARCHAR},
+      </if>
+
     </set>
     where order_id = #{orderId,jdbcType=INTEGER}
   </update>
@@ -518,6 +851,30 @@
       created_date = #{createdDate,jdbcType=TIMESTAMP},
       order_type = #{orderType,jdbcType=CHAR}
       station_name = #{stationName,jdbcType=VARCHAR},
+
+      receivable_amt = #{record.receivableAmt,jdbcType=DOUBLE},
+      received_amt = #{record.receivedAmt,jdbcType=DOUBLE},
+      discount_amt = #{record.discountAmt,jdbcType=DOUBLE},
+      discount_coupon_amt = #{record.discountCouponAmt,jdbcType=DOUBLE},
+      discount_coupon = #{record.discountCoupon,jdbcType=DOUBLE},
+
+      wx_amt = #{record.wxAmt,jdbcType=DOUBLE},
+      zfb_amt = #{record.zfbAmt,jdbcType=DOUBLE},
+      pos_amt = #{record.posAmt,jdbcType=DOUBLE},
+      xj_amt = #{record.xjAmt,jdbcType=DOUBLE},
+      didi_app_amt = #{record.didiAppAmt,jdbcType=DOUBLE},
+
+      ty_app_amt = #{record.tyAppAmt,jdbcType=DOUBLE},
+      other_amt = #{record.otherAmt,jdbcType=DOUBLE},
+      dzk_amt = #{record.dzkAmt,jdbcType=DOUBLE},
+      score = #{record.score,jdbcType=INTEGER},
+      member_no = #{record.memberNo,jdbcType=VARCHAR},
+
+      member_amt = #{record.memberAmt,jdbcType=DOUBLE},
+      print_count = #{record.printCount,jdbcType=INTEGER},
+      car_no = #{record.carNo,jdbcType=VARCHAR},
+      customer_phone = #{record.customerPhone,jdbcType=VARCHAR},
+      customer_grade = #{record.customerGrade,jdbcType=VARCHAR}
     where order_id = #{orderId,jdbcType=INTEGER}
   </update>
 </mapper>