修改油站信息管理

yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -924,17 +924,14 @@ public class StationClassStructureController extends BaseController
                     content += "优惠总额： "+coupon+" 元<BR>";
                     content += "实际支付： "+sumAmt+" 元<BR>";
                     content += "到款金额： "+dzAmt+"元<BR>";
-                    if(pay.getIsNoOil()!=null &&pay.getIsNoOil()!=null&& pay.getIsNoOil().equals("0")){
-                        content += "--------------------------------<BR>";
-                        if(search!=null){
-                            if( search.getAmt()==null){
-                                search.setAmt(BigDecimal.valueOf(0));
-                            }
-                            content +="非油总额： "+search.getAmt()+"元<BR>";
-                        }else{
-                            content +="非油总额： 0  元<BR>";
+                    content += "--------------------------------<BR>";
+                    if(search!=null){
+                        if( search.getAmt()==null){
+                            search.setAmt(BigDecimal.valueOf(0));
                         }
-
+                        content +="非油总额： "+search.getAmt()+"元<BR>";
+                    }else{
+                        content +="非油总额： 0  元<BR>";
                     }
                     content += "班结人： "+list.get(0).getClassStructureMan()+"<BR>";
                     content += "<BR>";

yijia-station/src/main/java/com/yijia/station/controller/StationPayController.java

@@ -127,18 +127,14 @@ public class StationPayController extends BaseController
         StationPay pay=new StationPay();
        if(list!=null&&list.size()==1){
            pay.setPayId(list.get(0).getPayId());
-           pay.setPayMode(list.get(0).getPayMode());
            pay.setStationId(list.get(0).getStationId());
            pay.setStationName(list.get(0).getStationName());
-           pay.setImagePhotosFlag(list.get(0).getImagePhotosFlag());
            pay.setCardEnabledFlag(list.get(0).getCardEnabledFlag());
-           pay.setActivityPic(list.get(0).getActivityPic());
-           pay.setPreferentialWayShareFlag(list.get(0).getPreferentialWayShareFlag());
-           pay.setOtherPreferentialWay(list.get(0).getOtherPreferentialWay());
-           pay.setPayCallbackPage(list.get(0).getPayCallbackPage());
-           pay.setPayPrintNum(list.get(0).getPayPrintNum());
-           pay.setPayCallbackPage(list.get(0).getPayCallbackPage());
            pay.setWsPrintFlag(list.get(0).getWsPrintFlag());
+           pay.setPrintSetting(list.get(0).getPrintSetting());
+           pay.setIntegralFlag(list.get(0).getIntegralFlag());
+           pay.setIntegralPrintFlag(list.get(0).getIntegralPrintFlag());
+           pay.setNotice(list.get(0).getNotice());
        }
         return AjaxResult.success(pay);
     }
@@ -152,7 +148,21 @@ public class StationPayController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         stationPay.setStationId(currentUser.getUser().getDeptId());
-        stationPay.setStationName(currentUser.getUser().getDept().getDeptName());
+        if(stationPay.getIntegralFlag()==null ||stationPay.getIntegralFlag()==""){
+            stationPay.setIntegralFlag("0");//默认积分功能关闭 1是开启0是关闭
+        }
+        if(stationPay.getIntegralPrintFlag()==null ||stationPay.getIntegralPrintFlag()==""){
+            stationPay.setIntegralPrintFlag("0");//默认积分小票是否打印 1是开启0是关闭
+        }
+        if(stationPay.getCardEnabledFlag()==null ||stationPay.getCardEnabledFlag()==""){
+            stationPay.setCardEnabledFlag("0");//默认电子卡功能关闭 1是开启0是关闭
+        }
+        if(stationPay.getWsPrintFlag()==null ||stationPay.getWsPrintFlag()==""){
+            stationPay.setWsPrintFlag("0");//班结是否打印1是开启0是关闭
+        }
+        if(stationPay.getDiscountSetting()==null ||stationPay.getDiscountSetting()==""){
+            stationPay.setDiscountSetting("0");//默认电子卡功能关闭 1是开启0是关闭
+        }
         return toAjax(stationPayService.insertStationPay(stationPay));
     }
 
@@ -165,7 +175,6 @@ public class StationPayController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         stationPay.setStationId(currentUser.getUser().getDeptId());
-        stationPay.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPayService.updateStationPay(stationPay));
     }
 

yijia-station/src/main/java/com/yijia/station/controller/StationPersonnelController.java

@@ -100,7 +100,6 @@ public class StationPersonnelController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         stationPersonnel.setStationId(currentUser.getUser().getDeptId());
-        stationPersonnel.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPersonnelService.insertStationPersonnel(stationPersonnel));
     }
 
@@ -113,7 +112,7 @@ public class StationPersonnelController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         stationPersonnel.setStationId(currentUser.getUser().getDeptId());
-        stationPersonnel.setStationName(currentUser.getUser().getDept().getDeptName());
+
         return toAjax(stationPersonnelService.updateStationPersonnel(stationPersonnel));
     }
 

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

@@ -9,74 +9,32 @@ import java.util.List;
 
 /**
  * 油站支付设置对象 station_pay
- * 
+ *
  * @author yijia
  * @date 2021-02-22
  */
 public class StationPay extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
-
     /** 主键自增id */
     private Long payId;
-
-    /** 支付模板 */
-    @Excel(name = "支付模板")
-    private String payMode;
-
     /** 油站id */
-    @Excel(name = "油站id")
     private Long stationId;
-
     /** 油站名称 */
-    @Excel(name = "油站名称")
     private String stationName;
 
-    /** 支付页面形象照是否展示  (1、是2、否) */
-    @Excel(name = "支付页面形象照是否展示  (1、是2、否)")
-    private String imagePhotosFlag;
-
-    /** 会员卡启用标识 （1、启动 2，停用） */
-    @Excel(name = "会员卡启用标识 ", readConverterExp = "1=、启动,2=，停用")
+    /** 会员卡启用标识 （1、启动 0，停用） */
     private String cardEnabledFlag;
-
-    /** 宣传活动照片 */
-    @Excel(name = "宣传活动照片")
-    private String activityPic;
-
-    /** 优惠方式共享是否启用 */
-    @Excel(name = "优惠方式共享是否启用")
-    private String preferentialWayShareFlag;
-
-    /** 其他优惠方式 */
-    @Excel(name = "其他优惠方式")
-    private String otherPreferentialWay;
-
-    /** 支付小票打印张数 */
-    @Excel(name = "支付小票打印张数")
-    private Long payPrintNum;
-
-    /** 支付回调页面配置 */
-    @Excel(name = "支付回调页面配置")
-    private String payCallbackPage;
-
-    /** 班结是否打印(1,是 2 否) */
-    @Excel(name = "班结是否打印(1,是 2 否)")
+    /** 班结是否打印(1是 0否) */
     private String wsPrintFlag;
-
     /** 打印小票（1 客户联，2商户联，3客户和商户联） */
-    @Excel(name = "打印小票", readConverterExp = "1=,客=户联，2商户联，3客户和商户联")
     private String printSetting;
-
     /** 优惠方案设置（1直降，2，满减，3 立减） */
-    @Excel(name = "优惠方案设置", readConverterExp = "1=直降，2，满减，3,立=减")
     private String discountSetting;
-
-    /** 班结是否打印(1,是 2 否) */
-    @Excel(name = "班结是否打印(1,是 2 否)")
+    /** 积分是否打印小票(1,是，0否) */
     private String integralPrintFlag;
+    /*积分是否开启 1开启 0关闭 */
     private String integralFlag;
-
     /**公告*/
     private String notice;
 
@@ -114,9 +72,6 @@ public class StationPay extends BaseEntity
         this.stationIdList = stationIdList;
     }
 
-    /** 是否开启非油品（1是，2否） */
-    @Excel(name = "是否开启非油品", readConverterExp = "1=是，2否")
-    private String isNoOil;
 
     private List<StationPic> imgFileList;
 
@@ -129,160 +84,82 @@ public class StationPay extends BaseEntity
     }
 
 
-    public void setPayId(Long payId) 
+    public void setPayId(Long payId)
     {
         this.payId = payId;
     }
 
-    public Long getPayId() 
+    public Long getPayId()
     {
         return payId;
     }
-    public void setPayMode(String payMode) 
-    {
-        this.payMode = payMode;
-    }
 
-    public String getPayMode() 
-    {
-        return payMode;
-    }
-    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 setImagePhotosFlag(String imagePhotosFlag) 
-    {
-        this.imagePhotosFlag = imagePhotosFlag;
-    }
-
-    public String getImagePhotosFlag() 
-    {
-        return imagePhotosFlag;
-    }
-    public void setCardEnabledFlag(String cardEnabledFlag) 
+    public void setCardEnabledFlag(String cardEnabledFlag)
     {
         this.cardEnabledFlag = cardEnabledFlag;
     }
 
-    public String getCardEnabledFlag() 
+    public String getCardEnabledFlag()
     {
         return cardEnabledFlag;
     }
 
-    public void setPreferentialWayShareFlag(String preferentialWayShareFlag) 
-    {
-        this.preferentialWayShareFlag = preferentialWayShareFlag;
-    }
 
-    public String getPreferentialWayShareFlag() 
-    {
-        return preferentialWayShareFlag;
-    }
-    public void setOtherPreferentialWay(String otherPreferentialWay) 
-    {
-        this.otherPreferentialWay = otherPreferentialWay;
-    }
-
-    public String getOtherPreferentialWay() 
-    {
-        return otherPreferentialWay;
-    }
-    public void setPayPrintNum(Long payPrintNum) 
-    {
-        this.payPrintNum = payPrintNum;
-    }
-
-    public Long getPayPrintNum() 
-    {
-        return payPrintNum;
-    }
-    public void setPayCallbackPage(String payCallbackPage) 
-    {
-        this.payCallbackPage = payCallbackPage;
-    }
-
-    public String getPayCallbackPage() 
-    {
-        return payCallbackPage;
-    }
-    public void setWsPrintFlag(String wsPrintFlag) 
+    public void setWsPrintFlag(String wsPrintFlag)
     {
         this.wsPrintFlag = wsPrintFlag;
     }
 
-    public String getWsPrintFlag() 
+    public String getWsPrintFlag()
     {
         return wsPrintFlag;
     }
-    public void setPrintSetting(String printSetting) 
+    public void setPrintSetting(String printSetting)
     {
         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) 
+    public void setDiscountSetting(String discountSetting)
     {
         this.discountSetting = discountSetting;
     }
 
-    public String getDiscountSetting() 
+    public String getDiscountSetting()
     {
         return discountSetting;
     }
-    public void setIsNoOil(String isNoOil) 
-    {
-        this.isNoOil = isNoOil;
-    }
-
-    public String getIsNoOil() 
-    {
-        return isNoOil;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("payId", getPayId())
-            .append("payMode", getPayMode())
             .append("stationId", getStationId())
             .append("stationName", getStationName())
-            .append("imagePhotosFlag", getImagePhotosFlag())
             .append("cardEnabledFlag", getCardEnabledFlag())
-            .append("activityPic", getActivityPic())
-            .append("preferentialWayShareFlag", getPreferentialWayShareFlag())
-            .append("otherPreferentialWay", getOtherPreferentialWay())
-            .append("payPrintNum", getPayPrintNum())
-            .append("payCallbackPage", getPayCallbackPage())
             .append("wsPrintFlag", getWsPrintFlag())
             .append("printSetting", getPrintSetting())
             .append("discountSetting", getDiscountSetting())
-            .append("isNoOil", getIsNoOil())
             .toString();
     }
 }

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

@@ -134,26 +134,18 @@ public class StationPayServiceImpl implements IStationPayService
             pay.setPayId(list.get(0).getPayId());
             pay.setStationId(list.get(0).getStationId());
             pay.setStationName(list.get(0).getStationName());
-            pay.setImagePhotosFlag(list.get(0).getImagePhotosFlag());
             pay.setCardEnabledFlag(list.get(0).getCardEnabledFlag());
-            pay.setActivityPic(list.get(0).getActivityPic());
-            pay.setPreferentialWayShareFlag(list.get(0).getPreferentialWayShareFlag());
-            pay.setOtherPreferentialWay(list.get(0).getOtherPreferentialWay());
-            pay.setPayPrintNum(list.get(0).getPayPrintNum());
-            pay.setPayCallbackPage(list.get(0).getPayCallbackPage());
             pay.setWsPrintFlag(list.get(0).getWsPrintFlag());
             pay.setPrintSetting(list.get(0).getPrintSetting());
             pay.setDiscountSetting(list.get(0).getDiscountSetting());
-            pay.setIsNoOil(list.get(0).getIsNoOil());
             pay.setNotice(list.get(0).getNotice());
             pay.setIntegralPrintFlag(list.get(0).getIntegralPrintFlag());
             pay.setIntegralFlag(list.get(0).getIntegralFlag());
             StationPic stationPic =new StationPic();
             stationPic.setStationId(pay.getStationId());
             stationPic.setParentId(pay.getPayId());
-            List<StationPic> stationPicList = new ArrayList<>();
+             List<StationPic> stationPicList =stationPicMapper.selectStationPicList(stationPic);
             if(stationPicList!=null && stationPicList.size()>0){
-                stationPicList =stationPicMapper.selectStationPicList(stationPic);
                 pay.setImgFileList(stationPicList);
             }else{
                 pay.setImgFileList(stationPicList);

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

@@ -3,49 +3,33 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.station.mapper.StationPayMapper">
-    
+
     <resultMap type="StationPay" id="StationPayResult">
         <result property="payId"    column="pay_id"    />
-        <result property="payMode"    column="pay_mode"    />
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
-        <result property="imagePhotosFlag"    column="image_photos_flag"    />
         <result property="cardEnabledFlag"    column="card_enabled_flag"    />
-        <result property="activityPic"    column="activity_pic"    />
-        <result property="preferentialWayShareFlag"    column="preferential_way_share_flag"    />
-        <result property="otherPreferentialWay"    column="other_preferential_way"    />
-        <result property="payPrintNum"    column="pay_print_num"    />
-        <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"    />
-        <result property="isNoOil"    column="is_no_oil"    />
         <result property="notice"    column="notice"    />
         <result property="integralPrintFlag"    column="integral_print_flag"    />
         <result property="integralFlag"    column="integral_flag"    />
     </resultMap>
 
     <sql id="selectStationPayVo">
-        select integral_flag,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, is_no_oil,notice,integral_print_flag from station_pay
+        select integral_flag,pay_id, station_id, station_name, card_enabled_flag,  ws_print_flag, print_setting, discount_setting, notice,integral_print_flag from station_pay
     </sql>
 
     <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
-        <include refid="selectStationPayVo"/>
-        <where>  
-            <if test="payMode != null  and payMode != ''"> and pay_mode = #{payMode}</if>
+        select p.integral_flag,p.pay_id, p.station_id, s.dept_name as station_name,  p.card_enabled_flag,   p.ws_print_flag,  p.print_setting,  p.discount_setting,  p.notice, p.integral_print_flag
+        from station_pay p join sys_dept s on p.station_id = s.dept_id
+        <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
-            <if test="imagePhotosFlag != null  and imagePhotosFlag != ''"> and image_photos_flag = #{imagePhotosFlag}</if>
             <if test="cardEnabledFlag != null  and cardEnabledFlag != ''"> and card_enabled_flag = #{cardEnabledFlag}</if>
-            <if test="activityPic != null  and activityPic != ''"> and activity_pic = #{activityPic}</if>
-            <if test="preferentialWayShareFlag != null  and preferentialWayShareFlag != ''"> and preferential_way_share_flag = #{preferentialWayShareFlag}</if>
-            <if test="otherPreferentialWay != null  and otherPreferentialWay != ''"> and other_preferential_way = #{otherPreferentialWay}</if>
-            <if test="payPrintNum != null "> and pay_print_num = #{payPrintNum}</if>
-            <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>
-            <if test="isNoOil != null  and isNoOil != ''"> and is_no_oil = #{isNoOil}</if>
             <if test="notice != null  and notice != ''"> and notice = #{notice}</if>
             <if test="integralPrintFlag != null  and integralPrintFlag != ''"> and integral_print_flag = #{integralPrintFlag}</if>
             <if test="integralFlag != null  and integralFlag != ''"> and integral_flag = #{integralFlag}</if>
@@ -59,48 +43,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by  pay_id desc
     </select>
-    
+
     <select id="selectStationPayById" parameterType="Long" resultMap="StationPayResult">
-        <include refid="selectStationPayVo"/>
+        select p.integral_flag,p.pay_id, p.station_id, s.dept_name as station_name,  p.card_enabled_flag,   p.ws_print_flag,  p.print_setting,  p.discount_setting,  p.notice, p.integral_print_flag
+        from station_pay p join sys_dept s on p.station_id = s.dept_id
         where pay_id = #{payId}
     </select>
-        
+
     <insert id="insertStationPay" parameterType="StationPay" useGeneratedKeys="true" keyProperty="payId">
         insert into station_pay
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="payMode != null">pay_mode,</if>
             <if test="stationId != null">station_id,</if>
-            <if test="stationName != null">station_name,</if>
-            <if test="imagePhotosFlag != null">image_photos_flag,</if>
             <if test="cardEnabledFlag != null">card_enabled_flag,</if>
-            <if test="activityPic != null">activity_pic,</if>
-            <if test="preferentialWayShareFlag != null">preferential_way_share_flag,</if>
-            <if test="otherPreferentialWay != null">other_preferential_way,</if>
-            <if test="payPrintNum != null">pay_print_num,</if>
-            <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>
-            <if test="isNoOil != null">is_no_oil,</if>
             <if test="notice != null">notice,</if>
             <if test="integralPrintFlag != null">integral_print_flag,</if>
             <if test="integralFlag != null">integral_flag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="payMode != null">#{payMode},</if>
             <if test="stationId != null">#{stationId},</if>
-            <if test="stationName != null">#{stationName},</if>
-            <if test="imagePhotosFlag != null">#{imagePhotosFlag},</if>
             <if test="cardEnabledFlag != null">#{cardEnabledFlag},</if>
-            <if test="activityPic != null">#{activityPic},</if>
-            <if test="preferentialWayShareFlag != null">#{preferentialWayShareFlag},</if>
-            <if test="otherPreferentialWay != null">#{otherPreferentialWay},</if>
-            <if test="payPrintNum != null">#{payPrintNum},</if>
-            <if test="payCallbackPage != null">#{payCallbackPage},</if>
             <if test="wsPrintFlag != null">#{wsPrintFlag},</if>
             <if test="printSetting != null">#{printSetting},</if>
             <if test="discountSetting != null">#{discountSetting},</if>
-            <if test="isNoOil != null">#{isNoOil},</if>
             <if test="notice != null">#{notice},</if>
             <if test="integralPrintFlag != null">#{integralPrintFlag},</if>
             <if test="integralFlag != null">#{integralFlag},</if>
@@ -110,20 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateStationPay" parameterType="StationPay">
         update station_pay
         <trim prefix="SET" suffixOverrides=",">
-            <if test="payMode != null">pay_mode = #{payMode},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
-            <if test="stationName != null">station_name = #{stationName},</if>
-            <if test="imagePhotosFlag != null">image_photos_flag = #{imagePhotosFlag},</if>
             <if test="cardEnabledFlag != null">card_enabled_flag = #{cardEnabledFlag},</if>
-            <if test="activityPic != null">activity_pic = #{activityPic},</if>
-            <if test="preferentialWayShareFlag != null">preferential_way_share_flag = #{preferentialWayShareFlag},</if>
-            <if test="otherPreferentialWay != null">other_preferential_way = #{otherPreferentialWay},</if>
-            <if test="payPrintNum != null">pay_print_num = #{payPrintNum},</if>
-            <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>
-            <if test="isNoOil != null">is_no_oil = #{isNoOil},</if>
             <if test="notice != null">notice = #{notice},</if>
             <if test="integralPrintFlag != null">  integral_print_flag = #{integralPrintFlag},</if>
             <if test="integralFlag != null">  integral_flag = #{integralFlag},</if>
@@ -136,10 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteStationPayByIds" parameterType="String">
-        delete from station_pay where pay_id in 
+        delete from station_pay where pay_id in
         <foreach item="payId" collection="array" open="(" separator="," close=")">
             #{payId}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>