油站支付设置

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

@@ -9,7 +9,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 油站支付设置对象 station_pay
  * 
  * @author yijia
- * @date 2021-01-25
+ * @date 2021-01-26
  */
 public class StationPay extends BaseEntity
 {
@@ -66,6 +66,10 @@ public class StationPay extends BaseEntity
     @Excel(name = "打印小票", readConverterExp = "1=,客=户联，2商户联，3客户和商户联")
     private String printSetting;
 
+    /** 优惠方案设置（1直降，2，满减，3 立减） */
+    @Excel(name = "优惠方案设置", readConverterExp = "1=直降，2，满减，3,立=减")
+    private String discountSetting;
+
     public void setPayId(Long payId) 
     {
         this.payId = payId;
@@ -121,15 +125,7 @@ public class StationPay extends BaseEntity
         return cardEnabledFlag;
     }
 
-    public String getActivityPic() {
-        return activityPic;
-    }
-
-    public void setActivityPic(String activityPic) {
-        this.activityPic = activityPic;
-    }
-
-    public void setPreferentialWayShareFlag(String preferentialWayShareFlag)
+    public void setPreferentialWayShareFlag(String preferentialWayShareFlag) 
     {
         this.preferentialWayShareFlag = preferentialWayShareFlag;
     }
@@ -179,10 +175,27 @@ public class StationPay extends BaseEntity
         this.printSetting = printSetting;
     }
 
+    public String getActivityPic()
+    {
+        return activityPic;
+    }
+    public void setActivityPic(String activityPic)
+    {
+        this.activityPic = activityPic;
+    }
     public String getPrintSetting() 
     {
         return printSetting;
     }
+    public void setDiscountSetting(String discountSetting) 
+    {
+        this.discountSetting = discountSetting;
+    }
+
+    public String getDiscountSetting() 
+    {
+        return discountSetting;
+    }
 
     @Override
     public String toString() {
@@ -200,6 +213,7 @@ public class StationPay extends BaseEntity
             .append("payCallbackPage", getPayCallbackPage())
             .append("wsPrintFlag", getWsPrintFlag())
             .append("printSetting", getPrintSetting())
+            .append("discountSetting", getDiscountSetting())
             .toString();
     }
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationPayServiceImpl.java

@@ -109,6 +109,7 @@ public class StationPayServiceImpl implements IStationPayService
             pay.setPrintSetting(list.get(0).getPrintSetting());
             pay.setStationId(list.get(0).getStationId());
             pay.setStationName(list.get(0).getStationName());
+            pay.setDiscountSetting(list.get(0).getDiscountSetting());
         }
         return pay;
     }

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

@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payCallbackPage"    column="pay_callback_page"    />
         <result property="wsPrintFlag"    column="ws_print_flag"    />
         <result property="printSetting"    column="print_setting"    />
+        <result property="discountSetting"    column="discount_setting"    />
     </resultMap>
 
     <sql id="selectStationPayVo">
-        select pay_id, pay_mode, station_id, station_name, image_photos_flag, card_enabled_flag, activity_pic, preferential_way_share_flag, other_preferential_way, pay_print_num, pay_callback_page, ws_print_flag, print_setting from station_pay
+        select pay_id, pay_mode, station_id, station_name, image_photos_flag, card_enabled_flag, activity_pic, preferential_way_share_flag, other_preferential_way, pay_print_num, pay_callback_page, ws_print_flag, print_setting, discount_setting from station_pay
     </sql>
 
     <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
@@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payCallbackPage != null  and payCallbackPage != ''"> and pay_callback_page = #{payCallbackPage}</if>
             <if test="wsPrintFlag != null  and wsPrintFlag != ''"> and ws_print_flag = #{wsPrintFlag}</if>
             <if test="printSetting != null  and printSetting != ''"> and print_setting = #{printSetting}</if>
+            <if test="discountSetting != null  and discountSetting != ''"> and discount_setting = #{discountSetting}</if>
         </where>
     </select>
     
@@ -62,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payCallbackPage != null">pay_callback_page,</if>
             <if test="wsPrintFlag != null">ws_print_flag,</if>
             <if test="printSetting != null">print_setting,</if>
+            <if test="discountSetting != null">discount_setting,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="payMode != null">#{payMode},</if>
@@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payCallbackPage != null">#{payCallbackPage},</if>
             <if test="wsPrintFlag != null">#{wsPrintFlag},</if>
             <if test="printSetting != null">#{printSetting},</if>
+            <if test="discountSetting != null">#{discountSetting},</if>
          </trim>
     </insert>
 
@@ -94,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payCallbackPage != null">pay_callback_page = #{payCallbackPage},</if>
             <if test="wsPrintFlag != null">ws_print_flag = #{wsPrintFlag},</if>
             <if test="printSetting != null">print_setting = #{printSetting},</if>
+            <if test="discountSetting != null">discount_setting = #{discountSetting},</if>
         </trim>
         where pay_id = #{payId}
     </update>

Yijia-SaaS/yijia-station/yijia-station.iml

@@ -92,5 +92,6 @@
     <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="module" module-name="yijia-system" />
   </component>
 </module>