jk-GitHub-coder преди 4 години
родител
ревизия
7363606f89

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

@@ -5,7 +5,6 @@ import lombok.Data;
 @Data
 public class PayOrderRequest {
 
-
     private String orderNo;
     private String oilGun;
     private String oilName;
@@ -39,6 +38,7 @@ public class PayOrderRequest {
     private String carNo; //车牌号
     private String customerPhone; //客户电话
     private String customerGrade; //客户等级
+    private String oilType; //油品类型
 
 
 

+ 1 - 0
YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -172,6 +172,7 @@ public class PayOrder {
     private String carNo; //车牌号
     private String customerPhone; //客户电话
     private String customerGrade; //客户等级
+    private String oilType; //油品类型 oil_type
 
 //    public Double getReceivableAmt() {
 //        return receivableAmt;

+ 43 - 30
YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -50,6 +50,8 @@
     <result column="customer_phone" jdbcType="VARCHAR" property="customerPhone" />
     <result column="customer_grade" jdbcType="VARCHAR" property="customerGrade" />
 
+    <result column="oil_type" jdbcType="VARCHAR" property="oilType" />
+
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -126,7 +128,7 @@
     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
+    print_count, car_no, customer_phone, customer_grade, oil_type
   </sql>
 
   <!-- 根据油品名称和油站查询油枪编号和价格 -->
@@ -235,7 +237,7 @@
         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)
+        member_no, member_amt, print_count, car_no, customer_phone, customer_grade, oil_type)
     VALUES (
         #{orderId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{oilGun,jdbcType=VARCHAR},
         #{oilName,jdbcType=VARCHAR}, #{oilPirce,jdbcType=VARCHAR}, #{consumerId,jdbcType=INTEGER}, #{consumer,jdbcType=VARCHAR},
@@ -247,7 +249,7 @@
         #{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}
+        #{printCount,jdbcType=INTEGER}, #{carNo,jdbcType=VARCHAR}, #{customerPhone,jdbcType=VARCHAR}, #{customerGrade,jdbcType=VARCHAR}, #{oilType,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.platform.yijia.pojo.PayOrder">
@@ -376,7 +378,9 @@
       <if test="customerGrade != null">
         customer_grade,
       </if>
-
+      <if test="oilType != null">
+        oil_type
+      </if>
 
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -501,6 +505,9 @@
       <if test="customerGrade != null">
         #{customer_grade,jdbcType=VARCHAR},
       </if>
+      <if test="oilType != null">
+        #{oil_type,jdbcType=VARCHAR}
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.platform.yijia.pojo.PayOrderExample" resultType="java.lang.Long">
@@ -642,6 +649,9 @@
       <if test="record.customerGrade != null">
         customer_grade = #{record.customerGrade,jdbcType=VARCHAR},
       </if>
+      <if test="oilType != null">
+        oil_type = #{record.oilType,jdbcType=VARCHAR}
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -694,7 +704,8 @@
       print_count = #{record.printCount,jdbcType=INTEGER},
       car_no = #{record.carNo,jdbcType=VARCHAR},
       customer_phone = #{record.customerPhone,jdbcType=VARCHAR},
-      customer_grade = #{record.customerGrade,jdbcType=VARCHAR}
+      customer_grade = #{record.customerGrade,jdbcType=VARCHAR},
+      oil_type = #{record.oilType,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -821,8 +832,9 @@
       <if test="customerPhone != null">
         customer_phone = #{customerPhone,jdbcType=VARCHAR},
       </if>
-      <if test="customerGrade != null">
-        customer_grade = #{customerGrade,jdbcType=VARCHAR},
+
+      <if test="oilType != null">
+        oil_type = #{oilType,jdbcType=VARCHAR}
       </if>
 
     </set>
@@ -852,29 +864,30 @@
       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}
+      receivable_amt = #{receivableAmt,jdbcType=DOUBLE},
+      received_amt = #{receivedAmt,jdbcType=DOUBLE},
+      discount_amt = #{discountAmt,jdbcType=DOUBLE},
+      discount_coupon_amt = #{discountCouponAmt,jdbcType=DOUBLE},
+      discount_coupon = #{discountCoupon,jdbcType=DOUBLE},
+
+      wx_amt = #{wxAmt,jdbcType=DOUBLE},
+      zfb_amt = #{zfbAmt,jdbcType=DOUBLE},
+      pos_amt = #{posAmt,jdbcType=DOUBLE},
+      xj_amt = #{xjAmt,jdbcType=DOUBLE},
+      didi_app_amt = #{didiAppAmt,jdbcType=DOUBLE},
+
+      ty_app_amt = #{tyAppAmt,jdbcType=DOUBLE},
+      other_amt = #{otherAmt,jdbcType=DOUBLE},
+      dzk_amt = #{dzkAmt,jdbcType=DOUBLE},
+      score = #{score,jdbcType=INTEGER},
+      member_no = #{memberNo,jdbcType=VARCHAR},
+
+      member_amt = #{memberAmt,jdbcType=DOUBLE},
+      print_count = #{printCount,jdbcType=INTEGER},
+      car_no = #{carNo,jdbcType=VARCHAR},
+      customer_phone = #{customerPhone,jdbcType=VARCHAR},
+      customer_grade = #{customerGrade,jdbcType=VARCHAR},
+      oil_type = #{oilType,jdbcType=VARCHAR}
     where order_id = #{orderId,jdbcType=INTEGER}
   </update>
 </mapper>