支付设置管理

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

@@ -1,33 +1,22 @@
 package com.yijia.station.controller;
 
-import java.util.Arrays;
-import java.util.List;
-
-import com.yijia.common.core.domain.entity.SysDept;
-import com.yijia.common.core.domain.model.LoginUser;
-import com.yijia.common.utils.SecurityUtils;
-import com.yijia.station.domain.StationPic;
-import com.yijia.station.service.IStationPicService;
-import com.yijia.system.service.ISysDeptService;
-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;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.yijia.common.annotation.Log;
 import com.yijia.common.core.controller.BaseController;
 import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.core.page.TableDataInfo;
 import com.yijia.common.enums.BusinessType;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.common.utils.poi.ExcelUtil;
 import com.yijia.station.domain.StationPay;
 import com.yijia.station.service.IStationPayService;
-import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.common.core.page.TableDataInfo;
+import com.yijia.system.service.ISysDeptService;
+import com.yijia.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 油站支付设置Controller
@@ -40,57 +29,15 @@ import com.yijia.common.core.page.TableDataInfo;
 public class StationPayController extends BaseController
 {
     @Autowired
-    private IStationPayService stationPayService;
-    @Autowired
-    private ISysUserService sysUserService;
-    @Autowired
     private ISysDeptService sysDeptService;
-    /**
-     * 查询油站支付设置列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(StationPay stationPay)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = sysDeptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            stationPay.setStationIdList(list);
-            stationPay.setStationId(null);
-        }
-        startPage();
-        List<StationPay> stationPayList = stationPayService.selectStationPayList(stationPay);
-        return getDataTable(stationPayList);
-    }
-
-    /**
-     * 导出油站支付设置列表
-     */
-    @Log(title = "油站支付设置", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(StationPay stationPay)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = sysDeptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            stationPay.setStationIdList(list);
-            stationPay.setStationId(null);
-        }
-        List<StationPay> stationPayList = stationPayService.selectStationPayList(stationPay);
-        ExcelUtil<StationPay> util = new ExcelUtil<StationPay>(StationPay.class);
-        return util.exportExcel(stationPayList, "pay");
-    }
 
     /**
-     * 获取油站支付设置详细信息
+     * 获取油站设置详细信息
      */
     @GetMapping(value = "/{payId}")
     public AjaxResult getInfo(@PathVariable("payId") Long payId)
     {
-        return AjaxResult.success(stationPayService.selectStationPayById(payId));
+        return AjaxResult.success(sysDeptService.selectDeptById(payId));
     }
 
     /**
@@ -99,93 +46,28 @@ public class StationPayController extends BaseController
      * @return
      */
     @GetMapping(value = "/queryOne")
-    public AjaxResult queryOne(StationPay stationPay)
+    public AjaxResult queryOne(SysDept sysDept)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = sysDeptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            stationPay.setStationIdList(list);
-            stationPay.setStationId(null);
-        }
-        return AjaxResult.success(stationPayService.selectStationPayOne(stationPay));
+        return AjaxResult.success(sysDeptService.selectDeptById(currentUser.getUser().getDeptId()));
     }
-
     /***
-     * 根据油站id 查询出pay信息
+     * 根据油站id 查询出油站信息
      * @param
      * @return
      */
     @GetMapping(value = "/{stationId}")
     public AjaxResult getPayInfo(@PathVariable("stationId") Long stationId)
     {
-        StationPay stationPay=new StationPay();
-        stationPay.setStationId(stationId);
-        int i=0;
-       List<StationPay> list=stationPayService.selectStationPayList(stationPay);
-        StationPay pay=new StationPay();
-       if(list!=null&&list.size()==1){
-           pay.setPayId(list.get(0).getPayId());
-           pay.setStationId(list.get(0).getStationId());
-           pay.setStationName(list.get(0).getStationName());
-           pay.setCardEnabledFlag(list.get(0).getCardEnabledFlag());
-           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);
-    }
-
-    /**
-     * 新增油站支付设置
-     */
-    @Log(title = "油站支付设置", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody StationPay stationPay)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        stationPay.setStationId(currentUser.getUser().getDeptId());
-        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));
+        return AjaxResult.success(sysDeptService.selectDeptById(stationId));
     }
-
     /**
      * 修改油站支付设置
      */
-    @Log(title = "油站支付设置", businessType = BusinessType.UPDATE)
+    @Log(title = "油站设置", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody StationPay stationPay)
-    {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        stationPay.setStationId(currentUser.getUser().getDeptId());
-        return toAjax(stationPayService.updateStationPay(stationPay));
-    }
-
-    /**
-     * 删除油站支付设置
-     */
-    @Log(title = "油站支付设置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{payIds}")
-    public AjaxResult remove(@PathVariable Long[] payIds)
+    public AjaxResult edit(@RequestBody SysDept sysDept)
     {
-        return toAjax(stationPayService.deleteStationPayByIds(payIds));
+        return toAjax(sysDeptService.updateDept(sysDept));
     }
-
 }

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

@@ -62,13 +62,12 @@
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
             <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
             <if test="oilPirce != null "> and oil_pirce = #{oilPirce}</if>
             <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
             <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
-            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer like concat('%', #{consumer}, '%')</if>
             <if test="amt != null "> and amt = #{amt}</if>
             <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
             <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
@@ -465,4 +464,4 @@
         </foreach>
     </delete>
 
-</mapper>
+</mapper>

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

@@ -30,11 +30,10 @@
     <select id="selectStationClassesSummaryList" parameterType="StationClassesSummary" resultMap="StationClassesSummaryResult">
         <include refid="selectStationClassesSummaryVo"/>
         <where>
-            <if test="classesNo != null  and classesNo != ''"> and classes_no = #{classesNo}</if>
+            <if test="classesNo != null  and classesNo != ''"> and classes_no like concat('%', #{classesNo}, '%')</if>
             <if test="startDate != null "> and start_date = #{startDate}</if>
             <if test="endDate != null "> and end_date = #{endDate}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="orderNum != null "> and order_num = #{orderNum}</if>
             <if test="printNum != null "> and print_num = #{printNum}</if>
             <if test="saleLiters != null "> and sale_liters = #{saleLiters}</if>
@@ -44,7 +43,7 @@
             <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
             <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
-            <if test="classesMan != null  and classesMan != ''"> and classes_man = #{classesMan}</if>
+            <if test="classesMan != null  and classesMan != ''"> and classes_man like concat('%', #{classesMan}, '%')</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -70,7 +69,7 @@
     <select id="selectStationClassesSummary" parameterType="StationClassesSummary" resultMap="StationClassesSummaryResult">
         <include refid="selectStationClassesSummaryVo"/>
         <where>
-            <if test="classesNo != null  and classesNo != ''"> and classes_no = #{classesNo}</if>
+            <if test="classesNo != null  and classesNo != ''"> and classes_no like concat('%', #{classesNo}, '%')</if>
             <if test="startDate != null "> and start_date = #{startDate}</if>
             <if test="endDate != null "> and end_date = #{endDate}</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
@@ -84,7 +83,7 @@
             <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
             <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
-            <if test="classesMan != null  and classesMan != ''"> and classes_man = #{classesMan}</if>
+            <if test="classesMan != null  and classesMan != ''"> and classes_man like concat('%', #{classesMan}, '%') </if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -185,4 +184,4 @@
         </foreach>
     </delete>
 
-</mapper>
+</mapper>