支付信息查询，只查询已支付的，油站支付设置，设置油站打印小票联，商户联，客户联

Yijia-SaaS/yijia-station/pom.xml

@@ -39,6 +39,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-system</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -1,6 +1,10 @@
 package com.yijia.station.controller;
 
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +36,8 @@ public class PayOrderController extends BaseController
 {
     @Autowired
     private IPayOrderService payOrderService;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询订单支付列表
      */
@@ -40,7 +45,13 @@ public class PayOrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(PayOrder payOrder)
     {
+       /* LoginUser currentUser = SecurityUtils.getLoginUser();
+        boolean flag= sysUserService.getUserRole(currentUser);
+        if(!flag){
+            payOrder.setStationId(currentUser.getUser().getDeptId());
+        }*/
         startPage();
+        payOrder.setStatus("1");
         List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
         return getDataTable(list);
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationOilGunController.java

@@ -5,9 +5,11 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import com.yijia.common.core.domain.entity.SysRole;
 import com.yijia.common.core.domain.entity.SysUser;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.utils.SecurityUtils;
+import com.yijia.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +41,8 @@ public class StationOilGunController extends BaseController
 {
     @Autowired
     private IStationOilGunService stationOilGunService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 查询油枪管理列表
@@ -47,6 +51,11 @@ public class StationOilGunController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(StationOilGun stationOilGun)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        boolean flag= sysUserService.getUserRole(currentUser);
+        if(!flag){
+            stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        }
         startPage();
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         return getDataTable(list);
@@ -60,6 +69,11 @@ public class StationOilGunController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationOilGun stationOilGun)
     {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        boolean flag= sysUserService.getUserRole(currentUser);
+        if(!flag){
+            stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        }
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         ExcelUtil<StationOilGun> util = new ExcelUtil<StationOilGun>(StationOilGun.class);
         return util.exportExcel(list, "gun");
@@ -72,9 +86,11 @@ public class StationOilGunController extends BaseController
     @GetMapping(value = "/selectGun")
     public TableDataInfo selectGun(StationOilGun stationOilGun)
     {
-//        LoginUser currentUser = SecurityUtils.getLoginUser();
-//        String userName = currentUser.getStation();
-        //SysUser sysUser = ShiroUtils.getSysUser();
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        boolean flag= sysUserService.getUserRole(currentUser);
+        if(!flag){
+            stationOilGun.setStationId(currentUser.getUser().getDeptId());
+        }
         List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
         return getTable(list);
     }

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 2020-12-10
+ * @date 2021-01-25
  */
 public class StationPay extends BaseEntity
 {
@@ -62,6 +62,10 @@ public class StationPay extends BaseEntity
     @Excel(name = "班结是否打印(1,是 2 否)")
     private String wsPrintFlag;
 
+    /** 打印小票（1 客户联，2商户联，3客户和商户联） */
+    @Excel(name = "打印小票", readConverterExp = "1=,客=户联，2商户联，3客户和商户联")
+    private String printSetting;
+
     public void setPayId(Long payId) 
     {
         this.payId = payId;
@@ -170,6 +174,15 @@ public class StationPay extends BaseEntity
     {
         return wsPrintFlag;
     }
+    public void setPrintSetting(String printSetting) 
+    {
+        this.printSetting = printSetting;
+    }
+
+    public String getPrintSetting() 
+    {
+        return printSetting;
+    }
 
     @Override
     public String toString() {
@@ -186,6 +199,7 @@ public class StationPay extends BaseEntity
             .append("payPrintNum", getPayPrintNum())
             .append("payCallbackPage", getPayCallbackPage())
             .append("wsPrintFlag", getWsPrintFlag())
+            .append("printSetting", getPrintSetting())
             .toString();
     }
 }

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

@@ -106,6 +106,9 @@ public class StationPayServiceImpl implements IStationPayService
             pay.setImagePhotosFlag(list.get(0).getImagePhotosFlag());
             pay.setCardEnabledFlag(list.get(0).getCardEnabledFlag());
             pay.setActivityPic(list.get(0).getActivityPic());
+            pay.setPrintSetting(list.get(0).getPrintSetting());
+            pay.setStationId(list.get(0).getStationId());
+            pay.setStationName(list.get(0).getStationName());
         }
         return pay;
     }

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

@@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"    />
     </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 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 from station_pay
     </sql>
 
     <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         </where>
     </select>
     
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="payMode != null">#{payMode},</if>
@@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payPrintNum != null">#{payPrintNum},</if>
             <if test="payCallbackPage != null">#{payCallbackPage},</if>
             <if test="wsPrintFlag != null">#{wsPrintFlag},</if>
+            <if test="printSetting != null">#{printSetting},</if>
          </trim>
     </insert>
 
@@ -89,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         </trim>
         where pay_id = #{payId}
     </update>

Yijia-SaaS/yijia-system/src/main/java/com/yijia/system/service/ISysUserService.java

@@ -2,6 +2,7 @@ package com.yijia.system.service;
 
 import java.util.List;
 import com.yijia.common.core.domain.entity.SysUser;
+import com.yijia.common.core.domain.model.LoginUser;
 
 /**
  * 用户 业务层
@@ -164,4 +165,11 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 根据用用户查询出对应的角色。是否是超级管理员权限
+     * @param currentUser
+     * @return
+     */
+    public boolean getUserRole(LoginUser currentUser);
 }

Yijia-SaaS/yijia-system/src/main/java/com/yijia/system/service/impl/SysUserServiceImpl.java

@@ -2,6 +2,8 @@ package com.yijia.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.yijia.common.core.domain.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -454,4 +456,16 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return successMsg.toString();
     }
+
+    @Override
+    public boolean getUserRole(LoginUser currentUser) {
+        List<SysRole> roleList = currentUser.getUser().getRoles();
+        boolean flag=false;
+        for(SysRole role : roleList){
+            if(role.getRoleId()==1){
+                flag = true;
+            }
+        }
+        return flag;
+    }
 }

Yijia-SaaS/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -82,8 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where dept_name=#{deptName} and parent_id = #{parentId} limit 1
 	</select>
     <!--调用存储过程-->
-	<select id="selectDeptListTree" resultMap="SysDeptResult">
-		call deptinfo();
+	<select id="selectDeptListTree" statementType="CALLABLE" useCache="false">
+		{call deptinfo()};
 	</select>
     <insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(