jk-GitHub-coder 4 years ago
parent
commit
6cd65760bb

+ 0 - 104
YijiaRestful/src/main/java/com/platform/yijia/param/request/PayOrderRequest.java

@@ -42,108 +42,4 @@ public class PayOrderRequest {
 
 
 
-
-//    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;
-//    }
 }

+ 16 - 25
YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -3,7 +3,6 @@ package com.platform.yijia.pojo;
 import lombok.Data;
 
 import java.util.Date;
-
 @Data
 public class PayOrder {
     /**
@@ -174,6 +173,22 @@ public class PayOrder {
     private String customerGrade; //客户等级
     private String oilType; //油品类型 oil_type
 
+//    public Double getAmt() {
+//        return amt;
+//    }
+//
+//    public void setAmt(Double amt) {
+//        this.amt = amt;
+//    }
+//
+//    public String getOilType() {
+//        return oilType;
+//    }
+//
+//    public void setOilType(String oilType) {
+//        this.oilType = oilType;
+//    }
+//
 //    public Double getReceivableAmt() {
 //        return receivableAmt;
 //    }
@@ -496,30 +511,6 @@ public class PayOrder {
 //
 //    /**
 //     * 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

+ 0 - 1
YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -74,7 +74,6 @@ public class PayOrderServiceImpl implements PayOrderService {
         payOrder.setMemberAmt(payOrderRequest.getMemberAmt());    //会员支付金额
         payOrder.setPrintCount(payOrderRequest.getPrintCount());    //小票数量
         payOrder.setScore(payOrderRequest.getScore());      //积分
-        payOrder.setOilType(payOrderRequest.getOilType());      //油品类型
         payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));   //金额
         payOrder.setStationId(payOrderRequest.getStationId());  //油站id
         payOrder.setStatus("0");         //创建订单 未支付状态 0

+ 1 - 1
YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -506,7 +506,7 @@
         #{customer_grade,jdbcType=VARCHAR},
       </if>
       <if test="oilType != null">
-        #{oil_type,jdbcType=VARCHAR}
+        #{oilType,jdbcType=VARCHAR}
       </if>
     </trim>
   </insert>