修改客户等级设置

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/controller/CustomerGradeSettingController.java

@@ -118,4 +118,15 @@ public class CustomerGradeSettingController extends BaseController
     {
         return toAjax(customerGradeSettingService.deleteCustomerGradeSettingByIds(ids));
     }
+
+    /**
+     * 查询等级名称
+     */
+    @PreAuthorize("@ss.hasPermi('customer:setting:gradeList')")
+    @GetMapping("/gradeList")
+    public TableDataInfo gradeList(CustomerGradeSetting customerGradeSetting)
+    {
+        List<CustomerGradeSetting> list = customerGradeSettingService.selectCustomerGradeSettingList(customerGradeSetting);
+        return getTable(list);
+    }
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/mapper/CustomerGradeSettingMapper.java

@@ -58,4 +58,5 @@ public interface CustomerGradeSettingMapper
      * @return 结果
      */
     public int deleteCustomerGradeSettingByIds(Long[] ids);
+
 }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/ICustomerGradeSettingService.java

@@ -58,4 +58,4 @@ public interface ICustomerGradeSettingService
      * @return 结果
      */
     public int deleteCustomerGradeSettingById(Long id);
-}
+   }

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/service/impl/CustomerGradeSettingServiceImpl.java

@@ -90,4 +90,5 @@ public class CustomerGradeSettingServiceImpl implements ICustomerGradeSettingSer
     {
         return customerGradeSettingMapper.deleteCustomerGradeSettingById(id);
     }
+
 }

Yijia-SaaS/yijia-customer/src/main/resources/mapper/customer/CustomerGradeSettingMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCustomerGradeSettingList" parameterType="CustomerGradeSetting" resultMap="CustomerGradeSettingResult">
         <include refid="selectCustomerGradeSettingVo"/>
-        <where>  
+        <where>
             <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
             <if test="discountWay != null  and discountWay != ''"> and discount_way = #{discountWay}</if>
             <if test="gasoilDiscountLitre != null  and gasoilDiscountLitre != ''"> and gasoil_discount_litre = #{gasoilDiscountLitre}</if>
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-    
+
     <select id="selectCustomerGradeSettingById" parameterType="Long" resultMap="CustomerGradeSettingResult">
         <include refid="selectCustomerGradeSettingVo"/>
         where id = #{id}

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

@@ -71,6 +71,16 @@ public class StationPay extends BaseEntity
     /** 优惠方案设置（1直降，2，满减，3 立减） */
     @Excel(name = "优惠方案设置", readConverterExp = "1=直降，2，满减，3,立=减")
     private String discountSetting;
+    /**公告*/
+    private String notice;
+
+    public String getNotice() {
+        return notice;
+    }
+
+    public void setNotice(String notice) {
+        this.notice = notice;
+    }
 
     private List<String> stationIdList;
 

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

@@ -2,6 +2,7 @@ package com.yijia.station.service.impl;
 
 import java.util.List;
 
+import com.alibaba.fastjson.JSON;
 import com.yijia.station.domain.StationPic;
 import com.yijia.station.mapper.StationPicMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,7 +81,7 @@ public class StationPayServiceImpl implements IStationPayService
     @Override
     public int updateStationPay(StationPay stationPay)
     {
-
+        System.out.println("打印支付对象"+ JSON.toJSONString(stationPay));
         int i=0;
         List<StationPic> list= stationPay.getImgFileList();
         i =stationPayMapper.updateStationPay(stationPay);
@@ -94,6 +95,7 @@ public class StationPayServiceImpl implements IStationPayService
                 pic.setStationId(stationPay.getStationId());
                 pic.setStationName(stationPay.getStationName());
                 stationPicMapper.insertStationPic(pic);
+                System.out.println("打印上传图片对象"+ JSON.toJSONString(pic));
             }
         }
         return i;

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/task/SaticScheduleTask.java

@@ -29,42 +29,42 @@ public class SaticScheduleTask {
     //3.添加定时任务
    // @Scheduled(cron = "0/5 * * * * ?")
     //或直接指定时间间隔，例如：5秒 5000
-   // @Scheduled(fixedRate=5000)
-//    private void configureTasks() throws ParseException {
-//        //获取当前时间 yyyy-MM-dd HH:mm:ss
-//        String newdate = DateUtils.getTime();
-//        System.err.println("执行静态定时任务时间: " + newdate);
-//        //查询油品调价列表 查询出未调价的信息
-//        StationOilPriceAdjust stationOilPriceAdjust =new StationOilPriceAdjust();
-//        stationOilPriceAdjust.setStatus("1");
-//        stationOilPriceAdjust.setTakeEffectStatus("2");
-//        stationOilPriceAdjust.setEndTime(newdate);
-//        List<StationOilPriceAdjust>  oilPriceAdjustList=stationOilPriceAdjustService.selectStationOilPriceAdjustList(stationOilPriceAdjust);
-//        //循环查看 调价的生效时间是否和当前时间相符
-//        for(StationOilPriceAdjust adjust: oilPriceAdjustList ){
-//            //修改油品价格根据油品价格id
-//            StationOilPrice oilPrice=new StationOilPrice();
-//            oilPrice.setOilPriceId(adjust.getOilPriceId());
-//            oilPrice.setOilPrice(adjust.getOilAdjustPrice());
-//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            Date sdate = sdf.parse(newdate);
-//            oilPrice.setDate(sdate);
-//            stationOilPriceService.updateStationOilPrice(oilPrice);
-//            //修改油枪信息中的价格
-//            StationOilGun gun =new StationOilGun();
-//            gun.setStationId(adjust.getStationId());
-//            gun.setOilName(adjust.getOilName());
-//            List<StationOilGun> listGun = stationOilGunService.selectStationOilGunList(gun);
-//            for(StationOilGun oilGun: listGun ){
-//                StationOilGun stationOilGun =new StationOilGun();
-//                stationOilGun.setOilPrice(adjust.getOilAdjustPrice());
-//                stationOilGun.setOilGunId(oilGun.getOilGunId());
-//                stationOilGunService.updateStationOilGun(stationOilGun);
-//            }
-//            StationOilPriceAdjust priceAdjust=new StationOilPriceAdjust();
-//            priceAdjust.setStatus("2");
-//            priceAdjust.setAdjustPriceId(adjust.getAdjustPriceId());
-//            stationOilPriceAdjustService.updateStationOilPriceAdjust(priceAdjust);
-//        }
-//    }
+    @Scheduled(fixedRate=5000)
+    private void configureTasks() throws ParseException {
+        //获取当前时间 yyyy-MM-dd HH:mm:ss
+        String newdate = DateUtils.getTime();
+        System.err.println("执行静态定时任务时间: " + newdate);
+        //查询油品调价列表 查询出未调价的信息
+        StationOilPriceAdjust stationOilPriceAdjust =new StationOilPriceAdjust();
+        stationOilPriceAdjust.setStatus("1");
+        stationOilPriceAdjust.setTakeEffectStatus("2");
+        stationOilPriceAdjust.setEndTime(newdate);
+        List<StationOilPriceAdjust>  oilPriceAdjustList=stationOilPriceAdjustService.selectStationOilPriceAdjustList(stationOilPriceAdjust);
+        //循环查看 调价的生效时间是否和当前时间相符
+        for(StationOilPriceAdjust adjust: oilPriceAdjustList ){
+            //修改油品价格根据油品价格id
+            StationOilPrice oilPrice=new StationOilPrice();
+            oilPrice.setOilPriceId(adjust.getOilPriceId());
+            oilPrice.setOilPrice(adjust.getOilAdjustPrice());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date sdate = sdf.parse(newdate);
+            oilPrice.setDate(sdate);
+            stationOilPriceService.updateStationOilPrice(oilPrice);
+            //修改油枪信息中的价格
+            StationOilGun gun =new StationOilGun();
+            gun.setStationId(adjust.getStationId());
+            gun.setOilName(adjust.getOilName());
+            List<StationOilGun> listGun = stationOilGunService.selectStationOilGunList(gun);
+            for(StationOilGun oilGun: listGun ){
+                StationOilGun stationOilGun =new StationOilGun();
+                stationOilGun.setOilPrice(adjust.getOilAdjustPrice());
+                stationOilGun.setOilGunId(oilGun.getOilGunId());
+                stationOilGunService.updateStationOilGun(stationOilGun);
+            }
+            StationOilPriceAdjust priceAdjust=new StationOilPriceAdjust();
+            priceAdjust.setStatus("2");
+            priceAdjust.setAdjustPriceId(adjust.getAdjustPriceId());
+            stationOilPriceAdjustService.updateStationOilPriceAdjust(priceAdjust);
+        }
+    }
 }

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

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="printSetting"    column="print_setting"    />
         <result property="discountSetting"    column="discount_setting"    />
         <result property="isNoOil"    column="is_no_oil"    />
+        <result property="notice"    column="notice"    />
     </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, discount_setting, is_no_oil 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, is_no_oil,notice from station_pay
     </sql>
 
     <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         </where>
     </select>
     
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="payMode != null">#{payMode},</if>
@@ -84,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="printSetting != null">#{printSetting},</if>
             <if test="discountSetting != null">#{discountSetting},</if>
             <if test="isNoOil != null">#{isNoOil},</if>
+            <if test="notice != null">#{notice},</if>
          </trim>
     </insert>
 
@@ -104,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         </trim>
         where pay_id = #{payId}
     </update>