油站信息管理

Yijia-SaaS/yijia-station/pom.xml

@@ -21,7 +21,11 @@
             <groupId>com.yijia</groupId>
             <artifactId>yijia-common</artifactId>
         </dependency>
-
+        <!--定时任务-->
+        <dependency>
+            <groupId>com.yijia</groupId>
+            <artifactId>yijia-quartz</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -0,0 +1,103 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+import com.yijia.station.domain.PayOrder;
+import com.yijia.station.service.IPayOrderService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 订单支付Controller
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+@RestController
+@RequestMapping("/station/order")
+public class PayOrderController extends BaseController
+{
+    @Autowired
+    private IPayOrderService payOrderService;
+
+    /**
+     * 查询订单支付列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PayOrder payOrder)
+    {
+        startPage();
+        List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单支付列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:export')")
+    @Log(title = "订单支付", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(PayOrder payOrder)
+    {
+        List<PayOrder> list = payOrderService.selectPayOrderList(payOrder);
+        ExcelUtil<PayOrder> util = new ExcelUtil<PayOrder>(PayOrder.class);
+        return util.exportExcel(list, "order");
+    }
+
+    /**
+     * 获取订单支付详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:query')")
+    @GetMapping(value = "/{orderId}")
+    public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
+    {
+        return AjaxResult.success(payOrderService.selectPayOrderById(orderId));
+    }
+
+    /**
+     * 新增订单支付
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:add')")
+    @Log(title = "订单支付", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PayOrder payOrder)
+    {
+        return toAjax(payOrderService.insertPayOrder(payOrder));
+    }
+
+    /**
+     * 修改订单支付
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:edit')")
+    @Log(title = "订单支付", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PayOrder payOrder)
+    {
+        return toAjax(payOrderService.updatePayOrder(payOrder));
+    }
+
+    /**
+     * 删除订单支付
+     */
+    @PreAuthorize("@ss.hasPermi('station:order:remove')")
+    @Log(title = "订单支付", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{orderIds}")
+    public AjaxResult remove(@PathVariable Long[] orderIds)
+    {
+        return toAjax(payOrderService.deletePayOrderByIds(orderIds));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+import com.yijia.station.domain.StationClassStructure;
+import com.yijia.station.service.IStationClassStructureService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 班结管理Controller
+ * 
+ * @author yijia
+ * @date 2020-12-14
+ */
+@RestController
+@RequestMapping("/station/structure")
+public class StationClassStructureController extends BaseController
+{
+    @Autowired
+    private IStationClassStructureService stationClassStructureService;
+
+    /**
+     * 查询班结管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:structure:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationClassStructure stationClassStructure)
+    {
+        startPage();
+        List<StationClassStructure> list = stationClassStructureService.selectStationClassStructureList(stationClassStructure);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出班结管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:structure:export')")
+    @Log(title = "班结管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationClassStructure stationClassStructure)
+    {
+        List<StationClassStructure> list = stationClassStructureService.selectStationClassStructureList(stationClassStructure);
+        ExcelUtil<StationClassStructure> util = new ExcelUtil<StationClassStructure>(StationClassStructure.class);
+        return util.exportExcel(list, "structure");
+    }
+
+    /**
+     * 获取班结管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:structure:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(stationClassStructureService.selectStationClassStructureById(id));
+    }
+
+    /**
+     * 新增班结管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:structure:add')")
+    @Log(title = "班结管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationClassStructure stationClassStructure)
+    {
+        return toAjax(stationClassStructureService.insertStationClassStructure(stationClassStructure));
+    }
+
+    /**
+     * 修改班结管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:structure:edit')")
+    @Log(title = "班结管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationClassStructure stationClassStructure)
+    {
+        return toAjax(stationClassStructureService.updateStationClassStructure(stationClassStructure));
+    }
+
+    /**
+     * 删除班结管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:structure:remove')")
+    @Log(title = "班结管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(stationClassStructureService.deleteStationClassStructureByIds(ids));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+import com.yijia.station.domain.StationDeviceManage;
+import com.yijia.station.service.IStationDeviceManageService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 油站设备管理Controller
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@RestController
+@RequestMapping("/station/manage")
+public class StationDeviceManageController extends BaseController
+{
+    @Autowired
+    private IStationDeviceManageService stationDeviceManageService;
+
+    /**
+     * 查询油站设备管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:manage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationDeviceManage stationDeviceManage)
+    {
+        startPage();
+        List<StationDeviceManage> list = stationDeviceManageService.selectStationDeviceManageList(stationDeviceManage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出油站设备管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:manage:export')")
+    @Log(title = "油站设备管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationDeviceManage stationDeviceManage)
+    {
+        List<StationDeviceManage> list = stationDeviceManageService.selectStationDeviceManageList(stationDeviceManage);
+        ExcelUtil<StationDeviceManage> util = new ExcelUtil<StationDeviceManage>(StationDeviceManage.class);
+        return util.exportExcel(list, "manage");
+    }
+
+    /**
+     * 获取油站设备管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:manage:query')")
+    @GetMapping(value = "/{deviceId}")
+    public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId)
+    {
+        return AjaxResult.success(stationDeviceManageService.selectStationDeviceManageById(deviceId));
+    }
+
+    /**
+     * 新增油站设备管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:manage:add')")
+    @Log(title = "油站设备管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationDeviceManage stationDeviceManage)
+    {
+        return toAjax(stationDeviceManageService.insertStationDeviceManage(stationDeviceManage));
+    }
+
+    /**
+     * 修改油站设备管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:manage:edit')")
+    @Log(title = "油站设备管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationDeviceManage stationDeviceManage)
+    {
+        return toAjax(stationDeviceManageService.updateStationDeviceManage(stationDeviceManage));
+    }
+
+    /**
+     * 删除油站设备管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:manage:remove')")
+    @Log(title = "油站设备管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deviceIds}")
+    public AjaxResult remove(@PathVariable Long[] deviceIds)
+    {
+        return toAjax(stationDeviceManageService.deleteStationDeviceManageByIds(deviceIds));
+    }
+}

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

@@ -24,7 +24,7 @@ import com.yijia.common.core.page.TableDataInfo;
  * 油站信息Controller
  * 
  * @author yijia
- * @date 2020-11-30
+ * @date 2020-12-08
  */
 @RestController
 @RequestMapping("/station/info")
@@ -45,6 +45,14 @@ public class StationInfoController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('station:info:selectStationInfo')")
+    @GetMapping("/selectStationInfo")
+    public TableDataInfo selectStationInfo(StationInfo stationInfo)
+    {
+        List<StationInfo> list = stationInfoService.selectStationInfoList(stationInfo);
+        return getDataTable(list);
+    }
+
     /**
      * 导出油站信息列表
      */

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

@@ -0,0 +1,103 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+import com.yijia.station.domain.StationNotice;
+import com.yijia.station.service.IStationNoticeService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 油站通知管理Controller
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+@RestController
+@RequestMapping("/station/notice")
+public class StationNoticeController extends BaseController
+{
+    @Autowired
+    private IStationNoticeService stationNoticeService;
+
+    /**
+     * 查询油站通知管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationNotice stationNotice)
+    {
+        startPage();
+        List<StationNotice> list = stationNoticeService.selectStationNoticeList(stationNotice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出油站通知管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:notice:export')")
+    @Log(title = "油站通知管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationNotice stationNotice)
+    {
+        List<StationNotice> list = stationNoticeService.selectStationNoticeList(stationNotice);
+        ExcelUtil<StationNotice> util = new ExcelUtil<StationNotice>(StationNotice.class);
+        return util.exportExcel(list, "notice");
+    }
+
+    /**
+     * 获取油站通知管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable("noticeId") Long noticeId)
+    {
+        return AjaxResult.success(stationNoticeService.selectStationNoticeById(noticeId));
+    }
+
+    /**
+     * 新增油站通知管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:notice:add')")
+    @Log(title = "油站通知管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationNotice stationNotice)
+    {
+        return toAjax(stationNoticeService.insertStationNotice(stationNotice));
+    }
+
+    /**
+     * 修改油站通知管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:notice:edit')")
+    @Log(title = "油站通知管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationNotice stationNotice)
+    {
+        return toAjax(stationNoticeService.updateStationNotice(stationNotice));
+    }
+
+    /**
+     * 删除油站通知管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:notice:remove')")
+    @Log(title = "油站通知管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    {
+        return toAjax(stationNoticeService.deleteStationNoticeByIds(noticeIds));
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+import com.yijia.station.domain.StationOilGun;
+import com.yijia.station.service.IStationOilGunService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 油枪管理Controller
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@RestController
+@RequestMapping("/station/gun")
+public class StationOilGunController extends BaseController
+{
+    @Autowired
+    private IStationOilGunService stationOilGunService;
+
+    /**
+     * 查询油枪管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:gun:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationOilGun stationOilGun)
+    {
+        startPage();
+        List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出油枪管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:gun:export')")
+    @Log(title = "油枪管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationOilGun stationOilGun)
+    {
+        List<StationOilGun> list = stationOilGunService.selectStationOilGunList(stationOilGun);
+        ExcelUtil<StationOilGun> util = new ExcelUtil<StationOilGun>(StationOilGun.class);
+        return util.exportExcel(list, "gun");
+    }
+
+    /**
+     * 获取油枪管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:gun:query')")
+    @GetMapping(value = "/{oilGunId}")
+    public AjaxResult getInfo(@PathVariable("oilGunId") Long oilGunId)
+    {
+        return AjaxResult.success(stationOilGunService.selectStationOilGunById(oilGunId));
+    }
+
+    /**
+     * 新增油枪管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:gun:add')")
+    @Log(title = "油枪管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationOilGun stationOilGun)
+    {
+        return toAjax(stationOilGunService.insertStationOilGun(stationOilGun));
+    }
+
+    /**
+     * 修改油枪管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:gun:edit')")
+    @Log(title = "油枪管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationOilGun stationOilGun)
+    {
+        return toAjax(stationOilGunService.updateStationOilGun(stationOilGun));
+    }
+
+    /**
+     * 删除油枪管理
+     */
+    @PreAuthorize("@ss.hasPermi('station:gun:remove')")
+    @Log(title = "油枪管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{oilGunIds}")
+    public AjaxResult remove(@PathVariable Long[] oilGunIds)
+    {
+        return toAjax(stationOilGunService.deleteStationOilGunByIds(oilGunIds));
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+import com.yijia.station.domain.StationOilPriceAdjust;
+import com.yijia.station.service.IStationOilPriceAdjustService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 油品调价信息Controller
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@RestController
+@RequestMapping("/station/adjust")
+public class StationOilPriceAdjustController extends BaseController
+{
+    @Autowired
+    private IStationOilPriceAdjustService stationOilPriceAdjustService;
+
+    /**
+     * 查询油品调价信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:adjust:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationOilPriceAdjust stationOilPriceAdjust)
+    {
+        startPage();
+        List<StationOilPriceAdjust> list = stationOilPriceAdjustService.selectStationOilPriceAdjustList(stationOilPriceAdjust);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出油品调价信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:adjust:export')")
+    @Log(title = "油品调价信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationOilPriceAdjust stationOilPriceAdjust)
+    {
+        List<StationOilPriceAdjust> list = stationOilPriceAdjustService.selectStationOilPriceAdjustList(stationOilPriceAdjust);
+        ExcelUtil<StationOilPriceAdjust> util = new ExcelUtil<StationOilPriceAdjust>(StationOilPriceAdjust.class);
+        return util.exportExcel(list, "adjust");
+    }
+
+    /**
+     * 获取油品调价信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:adjust:query')")
+    @GetMapping(value = "/{adjustPriceId}")
+    public AjaxResult getInfo(@PathVariable("adjustPriceId") Long adjustPriceId)
+    {
+        return AjaxResult.success(stationOilPriceAdjustService.selectStationOilPriceAdjustById(adjustPriceId));
+    }
+
+    /**
+     * 新增油品调价信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:adjust:add')")
+    @Log(title = "油品调价信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationOilPriceAdjust stationOilPriceAdjust)
+    {
+        return toAjax(stationOilPriceAdjustService.insertStationOilPriceAdjust(stationOilPriceAdjust));
+    }
+
+    /**
+     * 修改油品调价信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:adjust:edit')")
+    @Log(title = "油品调价信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationOilPriceAdjust stationOilPriceAdjust)
+    {
+        return toAjax(stationOilPriceAdjustService.updateStationOilPriceAdjust(stationOilPriceAdjust));
+    }
+
+    /**
+     * 删除油品调价信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:adjust:remove')")
+    @Log(title = "油品调价信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{adjustPriceIds}")
+    public AjaxResult remove(@PathVariable Long[] adjustPriceIds)
+    {
+        return toAjax(stationOilPriceAdjustService.deleteStationOilPriceAdjustByIds(adjustPriceIds));
+    }
+
+
+}

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

@@ -0,0 +1,106 @@
+package com.yijia.station.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import com.yijia.station.domain.StationOilPriceAdjust;
+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.enums.BusinessType;
+import com.yijia.station.domain.StationOilPrice;
+import com.yijia.station.service.IStationOilPriceService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 油品价格Controller
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+@RestController
+@RequestMapping("/station/price")
+public class StationOilPriceController extends BaseController
+{
+    @Autowired
+    private IStationOilPriceService stationOilPriceService;
+
+    /**
+     * 查询油品价格列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:price:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationOilPrice stationOilPrice)
+    {
+        startPage();
+        List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(stationOilPrice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出油品价格列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:price:export')")
+    @Log(title = "油品价格", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationOilPrice stationOilPrice)
+    {
+        List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(stationOilPrice);
+        ExcelUtil<StationOilPrice> util = new ExcelUtil<StationOilPrice>(StationOilPrice.class);
+        return util.exportExcel(list, "price");
+    }
+
+    /**
+     * 获取油品价格详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:price:query')")
+    @GetMapping(value = "/{oilPriceId}")
+    public AjaxResult getInfo(@PathVariable("oilPriceId") Long oilPriceId)
+    {
+        return AjaxResult.success(stationOilPriceService.selectStationOilPriceById(oilPriceId));
+    }
+
+    /**
+     * 新增油品价格
+     */
+    @PreAuthorize("@ss.hasPermi('station:price:add')")
+    @Log(title = "油品价格", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationOilPrice stationOilPrice)
+    {
+        return toAjax(stationOilPriceService.insertStationOilPrice(stationOilPrice));
+    }
+
+    /**
+     * 修改油品价格
+     */
+    @PreAuthorize("@ss.hasPermi('station:price:edit')")
+    @Log(title = "油品价格", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationOilPrice stationOilPrice)
+    {
+        return toAjax(stationOilPriceService.updateStationOilPrice(stationOilPrice));
+    }
+
+    /**
+     * 删除油品价格
+     */
+    @PreAuthorize("@ss.hasPermi('station:price:remove')")
+    @Log(title = "油品价格", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{oilPriceIds}")
+    public AjaxResult remove(@PathVariable Long[] oilPriceIds)
+    {
+        return toAjax(stationOilPriceService.deleteStationOilPriceByIds(oilPriceIds));
+    }
+}

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

@@ -0,0 +1,148 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+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;
+
+/**
+ * 油站支付设置Controller
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+@RestController
+@RequestMapping("/station/pay")
+public class StationPayController extends BaseController
+{
+    @Autowired
+    private IStationPayService stationPayService;
+
+    /**
+     * 查询油站支付设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationPay stationPay)
+    {
+        startPage();
+        List<StationPay> list = stationPayService.selectStationPayList(stationPay);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出油站支付设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:export')")
+    @Log(title = "油站支付设置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationPay stationPay)
+    {
+        List<StationPay> list = stationPayService.selectStationPayList(stationPay);
+        ExcelUtil<StationPay> util = new ExcelUtil<StationPay>(StationPay.class);
+        return util.exportExcel(list, "pay");
+    }
+
+    /**
+     * 获取油站支付设置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:query')")
+    @GetMapping(value = "/{payId}")
+    public AjaxResult getInfo(@PathVariable("payId") Long payId)
+    {
+        return AjaxResult.success(stationPayService.selectStationPayById(payId));
+    }
+
+    /**
+     * 查询油站支付设置信息
+     * @param
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:queryOne')")
+    @GetMapping(value = "/queryOne")
+    public AjaxResult queryOne(StationPay stationPay)
+    {
+        return AjaxResult.success(stationPayService.selectStationPayOne(stationPay));
+    }
+
+    /***
+     * 根据油站id 查询出pay信息
+     * @param
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:query')")
+    @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.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());
+       }
+        return AjaxResult.success(pay);
+    }
+
+    /**
+     * 新增油站支付设置
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:add')")
+    @Log(title = "油站支付设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationPay stationPay)
+    {
+        return toAjax(stationPayService.insertStationPay(stationPay));
+    }
+
+    /**
+     * 修改油站支付设置
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:edit')")
+    @Log(title = "油站支付设置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationPay stationPay)
+    {
+        return toAjax(stationPayService.updateStationPay(stationPay));
+    }
+
+    /**
+     * 删除油站支付设置
+     */
+    @PreAuthorize("@ss.hasPermi('station:pay:remove')")
+    @Log(title = "油站支付设置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{payIds}")
+    public AjaxResult remove(@PathVariable Long[] payIds)
+    {
+        return toAjax(stationPayService.deleteStationPayByIds(payIds));
+    }
+
+}

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

@@ -0,0 +1,103 @@
+package com.yijia.station.controller;
+
+import java.util.List;
+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.enums.BusinessType;
+import com.yijia.station.domain.StationPersonnel;
+import com.yijia.station.service.IStationPersonnelService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 油站员工信息Controller
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@RestController
+@RequestMapping("/station/personnel")
+public class StationPersonnelController extends BaseController
+{
+    @Autowired
+    private IStationPersonnelService stationPersonnelService;
+
+    /**
+     * 查询油站员工信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:personnel:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StationPersonnel stationPersonnel)
+    {
+        startPage();
+        List<StationPersonnel> list = stationPersonnelService.selectStationPersonnelList(stationPersonnel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出油站员工信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('station:personnel:export')")
+    @Log(title = "油站员工信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationPersonnel stationPersonnel)
+    {
+        List<StationPersonnel> list = stationPersonnelService.selectStationPersonnelList(stationPersonnel);
+        ExcelUtil<StationPersonnel> util = new ExcelUtil<StationPersonnel>(StationPersonnel.class);
+        return util.exportExcel(list, "personnel");
+    }
+
+    /**
+     * 获取油站员工信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:personnel:query')")
+    @GetMapping(value = "/{personnelId}")
+    public AjaxResult getInfo(@PathVariable("personnelId") Long personnelId)
+    {
+        return AjaxResult.success(stationPersonnelService.selectStationPersonnelById(personnelId));
+    }
+
+    /**
+     * 新增油站员工信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:personnel:add')")
+    @Log(title = "油站员工信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationPersonnel stationPersonnel)
+    {
+        return toAjax(stationPersonnelService.insertStationPersonnel(stationPersonnel));
+    }
+
+    /**
+     * 修改油站员工信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:personnel:edit')")
+    @Log(title = "油站员工信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationPersonnel stationPersonnel)
+    {
+        return toAjax(stationPersonnelService.updateStationPersonnel(stationPersonnel));
+    }
+
+    /**
+     * 删除油站员工信息
+     */
+    @PreAuthorize("@ss.hasPermi('station:personnel:remove')")
+    @Log(title = "油站员工信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{personnelIds}")
+    public AjaxResult remove(@PathVariable Long[] personnelIds)
+    {
+        return toAjax(stationPersonnelService.deleteStationPersonnelByIds(personnelIds));
+    }
+}

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

@@ -0,0 +1,251 @@
+package com.yijia.station.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 订单支付对象 pay_order
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+public class PayOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long orderId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNo;
+
+    /** 加油枪号 */
+    @Excel(name = "加油枪号")
+    private String oilGun;
+
+    /** 油品名称 */
+    @Excel(name = "油品名称")
+    private String oilName;
+
+    /** 用户id(消费者) */
+    @Excel(name = "用户id(消费者)")
+    private Long consumerId;
+
+    /** 消费者 */
+    @Excel(name = "消费者")
+    private String consumer;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private String amt;
+
+    /** 油站id */
+    @Excel(name = "油站id")
+    private Long stationId;
+
+    /** 状态(0未支付，1，已支付) */
+    @Excel(name = "状态(0未支付，1，已支付)")
+    private String status;
+
+    /** 加油升数 */
+    @Excel(name = "加油升数")
+    private String orderLiters;
+
+    /** 支付类型：随行付：sxf */
+    @Excel(name = "支付类型：随行付：sxf")
+    private String payType;
+
+    /** 支付方式：02公众号，03小程序 */
+    @Excel(name = "支付方式：02公众号，03小程序")
+    private String payWay;
+
+    /** 支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payDate;
+
+    /** 加油员 */
+    @Excel(name = "加油员")
+    private String oilPersonnel;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdDate;
+
+    /** 订单类型（1.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分） */
+    @Excel(name = "订单类型", readConverterExp = "1=.柴油，2.汽油，积分：3.现金+积分4.现金，5.积分")
+    private String orderType;
+
+    public void setOrderId(Long orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public Long getOrderId() 
+    {
+        return orderId;
+    }
+    public void setOrderNo(String orderNo) 
+    {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderNo() 
+    {
+        return orderNo;
+    }
+    public void setOilGun(String oilGun) 
+    {
+        this.oilGun = oilGun;
+    }
+
+    public String getOilGun() 
+    {
+        return oilGun;
+    }
+    public void setOilName(String oilName) 
+    {
+        this.oilName = oilName;
+    }
+
+    public String getOilName() 
+    {
+        return oilName;
+    }
+    public void setConsumerId(Long consumerId) 
+    {
+        this.consumerId = consumerId;
+    }
+
+    public Long getConsumerId() 
+    {
+        return consumerId;
+    }
+    public void setConsumer(String consumer) 
+    {
+        this.consumer = consumer;
+    }
+
+    public String getConsumer() 
+    {
+        return consumer;
+    }
+    public void setAmt(String amt) 
+    {
+        this.amt = amt;
+    }
+
+    public String getAmt() 
+    {
+        return amt;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setOrderLiters(String orderLiters) 
+    {
+        this.orderLiters = orderLiters;
+    }
+
+    public String getOrderLiters() 
+    {
+        return orderLiters;
+    }
+    public void setPayType(String payType) 
+    {
+        this.payType = payType;
+    }
+
+    public String getPayType() 
+    {
+        return payType;
+    }
+    public void setPayWay(String payWay) 
+    {
+        this.payWay = payWay;
+    }
+
+    public String getPayWay() 
+    {
+        return payWay;
+    }
+    public void setPayDate(Date payDate) 
+    {
+        this.payDate = payDate;
+    }
+
+    public Date getPayDate() 
+    {
+        return payDate;
+    }
+    public void setOilPersonnel(String oilPersonnel) 
+    {
+        this.oilPersonnel = oilPersonnel;
+    }
+
+    public String getOilPersonnel() 
+    {
+        return oilPersonnel;
+    }
+    public void setCreatedDate(Date createdDate) 
+    {
+        this.createdDate = createdDate;
+    }
+
+    public Date getCreatedDate() 
+    {
+        return createdDate;
+    }
+    public void setOrderType(String orderType) 
+    {
+        this.orderType = orderType;
+    }
+
+    public String getOrderType() 
+    {
+        return orderType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("orderId", getOrderId())
+            .append("orderNo", getOrderNo())
+            .append("oilGun", getOilGun())
+            .append("oilName", getOilName())
+            .append("consumerId", getConsumerId())
+            .append("consumer", getConsumer())
+            .append("amt", getAmt())
+            .append("stationId", getStationId())
+            .append("status", getStatus())
+            .append("orderLiters", getOrderLiters())
+            .append("payType", getPayType())
+            .append("payWay", getPayWay())
+            .append("payDate", getPayDate())
+            .append("oilPersonnel", getOilPersonnel())
+            .append("createdDate", getCreatedDate())
+            .append("orderType", getOrderType())
+            .toString();
+    }
+}

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

@@ -0,0 +1,236 @@
+package com.yijia.station.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 班结管理对象 station_class_structure
+ * 
+ * @author yijia
+ * @date 2020-12-14
+ */
+public class StationClassStructure extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    /** 员工姓名 */
+    @Excel(name = "员工姓名")
+    private String person;
+
+    /** 负责枪号 */
+    @Excel(name = "负责枪号")
+    private String gunNo;
+
+    /** 销量 */
+    @Excel(name = "销量")
+    private String salesVolume;
+
+    /** 销额 */
+    @Excel(name = "销额")
+    private String salesAmount;
+
+    /** 优惠 */
+    @Excel(name = "优惠")
+    private String discount;
+
+    /** 优惠券 */
+    @Excel(name = "优惠券")
+    private String coupon;
+
+    /** 实收 */
+    @Excel(name = "实收")
+    private String netReceipts;
+
+    /** 销售笔数 */
+    @Excel(name = "销售笔数")
+    private Long salesNum;
+
+    /** 打印小票数（含重复） */
+    @Excel(name = "打印小票数", readConverterExp = "含=重复")
+    private Long printNum;
+
+    /** 班次号 */
+    @Excel(name = "班次号")
+    private String classStructureNo;
+
+    /** 班结时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "班结时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date classStructureDate;
+
+    /** 班结人 */
+    @Excel(name = "班结人")
+    private String classStructureMan;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setPerson(String person) 
+    {
+        this.person = person;
+    }
+
+    public String getPerson() 
+    {
+        return person;
+    }
+    public void setGunNo(String gunNo) 
+    {
+        this.gunNo = gunNo;
+    }
+
+    public String getGunNo() 
+    {
+        return gunNo;
+    }
+    public void setSalesVolume(String salesVolume) 
+    {
+        this.salesVolume = salesVolume;
+    }
+
+    public String getSalesVolume() 
+    {
+        return salesVolume;
+    }
+    public void setSalesAmount(String salesAmount) 
+    {
+        this.salesAmount = salesAmount;
+    }
+
+    public String getSalesAmount() 
+    {
+        return salesAmount;
+    }
+    public void setDiscount(String discount) 
+    {
+        this.discount = discount;
+    }
+
+    public String getDiscount() 
+    {
+        return discount;
+    }
+    public void setCoupon(String coupon) 
+    {
+        this.coupon = coupon;
+    }
+
+    public String getCoupon() 
+    {
+        return coupon;
+    }
+    public void setNetReceipts(String netReceipts) 
+    {
+        this.netReceipts = netReceipts;
+    }
+
+    public String getNetReceipts() 
+    {
+        return netReceipts;
+    }
+    public void setSalesNum(Long salesNum) 
+    {
+        this.salesNum = salesNum;
+    }
+
+    public Long getSalesNum() 
+    {
+        return salesNum;
+    }
+    public void setPrintNum(Long printNum) 
+    {
+        this.printNum = printNum;
+    }
+
+    public Long getPrintNum() 
+    {
+        return printNum;
+    }
+    public void setClassStructureNo(String classStructureNo) 
+    {
+        this.classStructureNo = classStructureNo;
+    }
+
+    public String getClassStructureNo() 
+    {
+        return classStructureNo;
+    }
+    public void setClassStructureDate(Date classStructureDate) 
+    {
+        this.classStructureDate = classStructureDate;
+    }
+
+    public Date getClassStructureDate() 
+    {
+        return classStructureDate;
+    }
+    public void setClassStructureMan(String classStructureMan) 
+    {
+        this.classStructureMan = classStructureMan;
+    }
+
+    public String getClassStructureMan() 
+    {
+        return classStructureMan;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("person", getPerson())
+            .append("gunNo", getGunNo())
+            .append("salesVolume", getSalesVolume())
+            .append("salesAmount", getSalesAmount())
+            .append("discount", getDiscount())
+            .append("coupon", getCoupon())
+            .append("netReceipts", getNetReceipts())
+            .append("salesNum", getSalesNum())
+            .append("printNum", getPrintNum())
+            .append("classStructureNo", getClassStructureNo())
+            .append("classStructureDate", getClassStructureDate())
+            .append("classStructureMan", getClassStructureMan())
+            .toString();
+    }
+}

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

@@ -0,0 +1,163 @@
+package com.yijia.station.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 油站设备管理对象 station_device_manage
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public class StationDeviceManage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键自增id */
+    private Long deviceId;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String deviceNo;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** $column.columnComment */
+    @Excel(name = "设备名称")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    /** 设备类型 */
+    @Excel(name = "设备类型")
+    private String deviceType;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceSerialNum;
+
+    /** 绑定油枪号 */
+    @Excel(name = "绑定油枪号")
+    private String gunNo;
+
+    /** 设备状态：1：在用，2：停用，3：维修、保养 */
+    @Excel(name = "设备状态：1：在用，2：停用，3：维修、保养")
+    private String deviceStatus;
+
+    /** 设备厂家 */
+    @Excel(name = "设备厂家")
+    private String deviceFactory;
+
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setDeviceNo(String deviceNo) 
+    {
+        this.deviceNo = deviceNo;
+    }
+
+    public String getDeviceNo() 
+    {
+        return deviceNo;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setDeviceType(String deviceType) 
+    {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceType() 
+    {
+        return deviceType;
+    }
+    public void setDeviceSerialNum(String deviceSerialNum) 
+    {
+        this.deviceSerialNum = deviceSerialNum;
+    }
+
+    public String getDeviceSerialNum() 
+    {
+        return deviceSerialNum;
+    }
+    public void setGunNo(String gunNo) 
+    {
+        this.gunNo = gunNo;
+    }
+
+    public String getGunNo() 
+    {
+        return gunNo;
+    }
+    public void setDeviceStatus(String deviceStatus) 
+    {
+        this.deviceStatus = deviceStatus;
+    }
+
+    public String getDeviceStatus() 
+    {
+        return deviceStatus;
+    }
+    public void setDeviceFactory(String deviceFactory) 
+    {
+        this.deviceFactory = deviceFactory;
+    }
+
+    public String getDeviceFactory() 
+    {
+        return deviceFactory;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceId", getDeviceId())
+            .append("deviceNo", getDeviceNo())
+            .append("deviceName", getDeviceName())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("deviceType", getDeviceType())
+            .append("deviceSerialNum", getDeviceSerialNum())
+            .append("gunNo", getGunNo())
+            .append("deviceStatus", getDeviceStatus())
+            .append("deviceFactory", getDeviceFactory())
+            .toString();
+    }
+}

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

@@ -7,9 +7,9 @@ import com.yijia.common.core.domain.BaseEntity;
 
 /**
  * 油站信息对象 station_info
- *
+ * 
  * @author yijia
- * @date 2020-11-30
+ * @date 2020-12-08
  */
 public class StationInfo extends BaseEntity
 {
@@ -22,10 +22,6 @@ public class StationInfo extends BaseEntity
     @Excel(name = "油站名称")
     private String stationName;
 
-    /** 油站号 */
-    @Excel(name = "油站号")
-    private String stationNo;
-
     /** 油站地址 */
     @Excel(name = "油站地址")
     private String stationAddress;
@@ -52,7 +48,7 @@ public class StationInfo extends BaseEntity
 
     /** 油站照片 */
     @Excel(name = "油站照片")
-    private byte[] stationPic;
+    private String stationPic;
 
     /** 油站经度 */
     @Excel(name = "油站经度")
@@ -62,121 +58,124 @@ public class StationInfo extends BaseEntity
     @Excel(name = "油站纬度")
     private String stationLatitude;
 
-    public void setStationId(Long stationId)
+    /** 商户编码（随行付商户码） */
+    @Excel(name = "商户编码", readConverterExp = "随=行付商户码")
+    private Long mno;
+
+    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 setStationNo(String stationNo)
-    {
-        this.stationNo = stationNo;
-    }
-
-    public String getStationNo()
-    {
-        return stationNo;
-    }
-    public void setStationAddress(String stationAddress)
+    public void setStationAddress(String stationAddress) 
     {
         this.stationAddress = stationAddress;
     }
 
-    public String getStationAddress()
+    public String getStationAddress() 
     {
         return stationAddress;
     }
-    public void setOilGunNum(Long oilGunNum)
+    public void setOilGunNum(Long oilGunNum) 
     {
         this.oilGunNum = oilGunNum;
     }
 
-    public Long getOilGunNum()
+    public Long getOilGunNum() 
     {
         return oilGunNum;
     }
-    public void setContacts(String contacts)
+    public void setContacts(String contacts) 
     {
         this.contacts = contacts;
     }
 
-    public String getContacts()
+    public String getContacts() 
     {
         return contacts;
     }
-    public void setPhone(String phone)
+    public void setPhone(String phone) 
     {
         this.phone = phone;
     }
 
-    public String getPhone()
+    public String getPhone() 
     {
         return phone;
     }
-    public void setStationGroupId(Long stationGroupId)
+    public void setStationGroupId(Long stationGroupId) 
     {
         this.stationGroupId = stationGroupId;
     }
 
-    public Long getStationGroupId()
+    public Long getStationGroupId() 
     {
         return stationGroupId;
     }
-    public void setStationGroupName(String stationGroupName)
+    public void setStationGroupName(String stationGroupName) 
     {
         this.stationGroupName = stationGroupName;
     }
 
-    public String getStationGroupName()
+    public String getStationGroupName() 
     {
         return stationGroupName;
     }
-    public void setStationPic(byte[] stationPic)
-    {
-        this.stationPic = stationPic;
-    }
 
-    public byte[] getStationPic()
-    {
+    public String getStationPic() {
         return stationPic;
     }
+
+    public void setStationPic(String stationPic) {
+        this.stationPic = stationPic;
+    }
+
     public void setStationLongitude(String stationLongitude)
     {
         this.stationLongitude = stationLongitude;
     }
 
-    public String getStationLongitude()
+    public String getStationLongitude() 
     {
         return stationLongitude;
     }
-    public void setStationLatitude(String stationLatitude)
+    public void setStationLatitude(String stationLatitude) 
     {
         this.stationLatitude = stationLatitude;
     }
 
-    public String getStationLatitude()
+    public String getStationLatitude() 
     {
         return stationLatitude;
     }
+    public void setMno(Long mno) 
+    {
+        this.mno = mno;
+    }
+
+    public Long getMno() 
+    {
+        return mno;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("stationId", getStationId())
             .append("stationName", getStationName())
-            .append("stationNo", getStationNo())
             .append("stationAddress", getStationAddress())
             .append("oilGunNum", getOilGunNum())
             .append("contacts", getContacts())
@@ -186,6 +185,7 @@ public class StationInfo extends BaseEntity
             .append("stationPic", getStationPic())
             .append("stationLongitude", getStationLongitude())
             .append("stationLatitude", getStationLatitude())
+            .append("mno", getMno())
             .toString();
     }
 }

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

@@ -0,0 +1,138 @@
+package com.yijia.station.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 油站通知管理对象 station_notice
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+public class StationNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 通知id 自增主键id */
+    private Long noticeId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String fullName;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String phone;
+
+    /** 绑定时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绑定时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date bindDate;
+
+    /** 绑定状态：1.已绑定， */
+    @Excel(name = "绑定状态：1.已绑定，")
+    private String bindStatus;
+
+    /** 微信昵称 */
+    @Excel(name = "微信昵称")
+    private String wxFullName;
+
+    /** 油站id */
+    @Excel(name = "油站id")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    public void setNoticeId(Long noticeId) 
+    {
+        this.noticeId = noticeId;
+    }
+
+    public Long getNoticeId() 
+    {
+        return noticeId;
+    }
+    public void setFullName(String fullName) 
+    {
+        this.fullName = fullName;
+    }
+
+    public String getFullName() 
+    {
+        return fullName;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setBindDate(Date bindDate) 
+    {
+        this.bindDate = bindDate;
+    }
+
+    public Date getBindDate() 
+    {
+        return bindDate;
+    }
+    public void setBindStatus(String bindStatus) 
+    {
+        this.bindStatus = bindStatus;
+    }
+
+    public String getBindStatus() 
+    {
+        return bindStatus;
+    }
+    public void setWxFullName(String wxFullName) 
+    {
+        this.wxFullName = wxFullName;
+    }
+
+    public String getWxFullName() 
+    {
+        return wxFullName;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("noticeId", getNoticeId())
+            .append("fullName", getFullName())
+            .append("phone", getPhone())
+            .append("bindDate", getBindDate())
+            .append("bindStatus", getBindStatus())
+            .append("wxFullName", getWxFullName())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .toString();
+    }
+}

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

@@ -0,0 +1,124 @@
+package com.yijia.station.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 油枪管理对象 station_oil_gun
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public class StationOilGun extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 油枪主键自增id */
+    private Long oilGunId;
+
+    /** 油枪号 */
+    @Excel(name = "油枪号")
+    private String oilGunNo;
+
+    /** 油品名称 */
+    @Excel(name = "油品名称")
+    private String oilName;
+
+    /** 油站id */
+    @Excel(name = "油站id")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date date;
+
+    /** 油枪状态（） */
+    @Excel(name = "油枪状态", readConverterExp = "油枪状态（）")
+    private String status;
+
+    public void setOilGunId(Long oilGunId) 
+    {
+        this.oilGunId = oilGunId;
+    }
+
+    public Long getOilGunId() 
+    {
+        return oilGunId;
+    }
+    public void setOilGunNo(String oilGunNo) 
+    {
+        this.oilGunNo = oilGunNo;
+    }
+
+    public String getOilGunNo() 
+    {
+        return oilGunNo;
+    }
+    public void setOilName(String oilName) 
+    {
+        this.oilName = oilName;
+    }
+
+    public String getOilName() 
+    {
+        return oilName;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setDate(Date date) 
+    {
+        this.date = date;
+    }
+
+    public Date getDate() 
+    {
+        return date;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("oilGunId", getOilGunId())
+            .append("oilGunNo", getOilGunNo())
+            .append("oilName", getOilName())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("date", getDate())
+            .append("status", getStatus())
+            .toString();
+    }
+}

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

@@ -0,0 +1,110 @@
+package com.yijia.station.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 油品价格对象 station_oil_price
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+public class StationOilPrice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 油品价格id */
+    private Long oilPriceId;
+
+    /** 油品名称 */
+    @Excel(name = "油品名称")
+    private String oilName;
+
+    /** 油品价格 */
+    @Excel(name = "油品价格")
+    private String oilPrice;
+
+    /** 油站id */
+    @Excel(name = "油站id")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationNanme;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date date;
+
+    public void setOilPriceId(Long oilPriceId) 
+    {
+        this.oilPriceId = oilPriceId;
+    }
+
+    public Long getOilPriceId() 
+    {
+        return oilPriceId;
+    }
+    public void setOilName(String oilName) 
+    {
+        this.oilName = oilName;
+    }
+
+    public String getOilName() 
+    {
+        return oilName;
+    }
+    public void setOilPrice(String oilPrice) 
+    {
+        this.oilPrice = oilPrice;
+    }
+
+    public String getOilPrice() 
+    {
+        return oilPrice;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationNanme(String stationNanme) 
+    {
+        this.stationNanme = stationNanme;
+    }
+
+    public String getStationNanme() 
+    {
+        return stationNanme;
+    }
+    public void setDate(Date date) 
+    {
+        this.date = date;
+    }
+
+    public Date getDate() 
+    {
+        return date;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("oilPriceId", getOilPriceId())
+            .append("oilName", getOilName())
+            .append("oilPrice", getOilPrice())
+            .append("stationId", getStationId())
+            .append("stationNanme", getStationNanme())
+            .append("date", getDate())
+            .toString();
+    }
+}

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

@@ -0,0 +1,153 @@
+package com.yijia.station.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 油品调价信息对象 station_oil_price_adjust
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public class StationOilPriceAdjust extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 调价自增主键id */
+    private Long adjustPriceId;
+
+    /** 油品名称 */
+    @Excel(name = "油品名称")
+    private String oilName;
+
+    /** 油品调整价格 */
+    @Excel(name = "油品调整价格")
+    private String oilAdjustPrice;
+
+    /** 生效状态（1，立即生效，2指定时间生效） */
+    @Excel(name = "生效状态", readConverterExp = "1=，立即生效，2指定时间生效")
+    private String takeEffectStatus;
+
+    /** 生效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date takeEffectDate;
+
+    /** 调价时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调价时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date adjustDate;
+
+    /** 油站id */
+    @Excel(name = "油站id")
+    private Long stationId;
+
+    /** 油站名称 */
+    @Excel(name = "油站名称")
+    private String stationName;
+
+    /** 操作员 */
+    @Excel(name = "操作员")
+    private String operator;
+
+    public void setAdjustPriceId(Long adjustPriceId) 
+    {
+        this.adjustPriceId = adjustPriceId;
+    }
+
+    public Long getAdjustPriceId() 
+    {
+        return adjustPriceId;
+    }
+    public void setOilName(String oilName) 
+    {
+        this.oilName = oilName;
+    }
+
+    public String getOilName() 
+    {
+        return oilName;
+    }
+    public void setOilAdjustPrice(String oilAdjustPrice) 
+    {
+        this.oilAdjustPrice = oilAdjustPrice;
+    }
+
+    public String getOilAdjustPrice() 
+    {
+        return oilAdjustPrice;
+    }
+    public void setTakeEffectStatus(String takeEffectStatus) 
+    {
+        this.takeEffectStatus = takeEffectStatus;
+    }
+
+    public String getTakeEffectStatus() 
+    {
+        return takeEffectStatus;
+    }
+    public void setTakeEffectDate(Date takeEffectDate) 
+    {
+        this.takeEffectDate = takeEffectDate;
+    }
+
+    public Date getTakeEffectDate() 
+    {
+        return takeEffectDate;
+    }
+    public void setAdjustDate(Date adjustDate) 
+    {
+        this.adjustDate = adjustDate;
+    }
+
+    public Date getAdjustDate() 
+    {
+        return adjustDate;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setOperator(String operator) 
+    {
+        this.operator = operator;
+    }
+
+    public String getOperator() 
+    {
+        return operator;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("adjustPriceId", getAdjustPriceId())
+            .append("oilName", getOilName())
+            .append("oilAdjustPrice", getOilAdjustPrice())
+            .append("takeEffectStatus", getTakeEffectStatus())
+            .append("takeEffectDate", getTakeEffectDate())
+            .append("adjustDate", getAdjustDate())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("operator", getOperator())
+            .toString();
+    }
+}

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

@@ -0,0 +1,191 @@
+package com.yijia.station.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 油站支付设置对象 station_pay
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+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=，停用")
+    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 否)")
+    private String wsPrintFlag;
+
+    public void setPayId(Long payId) 
+    {
+        this.payId = payId;
+    }
+
+    public Long getPayId() 
+    {
+        return payId;
+    }
+    public void setPayMode(String payMode) 
+    {
+        this.payMode = payMode;
+    }
+
+    public String getPayMode() 
+    {
+        return payMode;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setImagePhotosFlag(String imagePhotosFlag) 
+    {
+        this.imagePhotosFlag = imagePhotosFlag;
+    }
+
+    public String getImagePhotosFlag() 
+    {
+        return imagePhotosFlag;
+    }
+    public void setCardEnabledFlag(String cardEnabledFlag) 
+    {
+        this.cardEnabledFlag = cardEnabledFlag;
+    }
+
+    public String getCardEnabledFlag() 
+    {
+        return cardEnabledFlag;
+    }
+
+    public String getActivityPic() {
+        return activityPic;
+    }
+
+    public void setActivityPic(String activityPic) {
+        this.activityPic = activityPic;
+    }
+
+    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) 
+    {
+        this.wsPrintFlag = wsPrintFlag;
+    }
+
+    public String getWsPrintFlag() 
+    {
+        return wsPrintFlag;
+    }
+
+    @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())
+            .toString();
+    }
+}

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

@@ -0,0 +1,121 @@
+package com.yijia.station.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.core.domain.BaseEntity;
+
+/**
+ * 油站员工信息对象 station_personnel
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public class StationPersonnel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 油站员工主键id */
+    private Long personnelId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String personnelName;
+
+    /** 员工负责枪号 */
+    @Excel(name = "员工负责枪号")
+    private String gunNo;
+
+    /** 加油站id */
+    @Excel(name = "加油站id")
+    private Long stationId;
+
+    /** 加油站名称 */
+    @Excel(name = "加油站名称")
+    private String stationName;
+
+    /** 二维码 */
+    @Excel(name = "二维码")
+    private String qrCode;
+
+    /** 员工手机号 */
+    @Excel(name = "员工手机号")
+    private String personnelPhone;
+
+    public void setPersonnelId(Long personnelId) 
+    {
+        this.personnelId = personnelId;
+    }
+
+    public Long getPersonnelId() 
+    {
+        return personnelId;
+    }
+    public void setPersonnelName(String personnelName) 
+    {
+        this.personnelName = personnelName;
+    }
+
+    public String getPersonnelName() 
+    {
+        return personnelName;
+    }
+    public void setGunNo(String gunNo) 
+    {
+        this.gunNo = gunNo;
+    }
+
+    public String getGunNo() 
+    {
+        return gunNo;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setQrCode(String qrCode) 
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode() 
+    {
+        return qrCode;
+    }
+    public void setPersonnelPhone(String personnelPhone) 
+    {
+        this.personnelPhone = personnelPhone;
+    }
+
+    public String getPersonnelPhone() 
+    {
+        return personnelPhone;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("personnelId", getPersonnelId())
+            .append("personnelName", getPersonnelName())
+            .append("gunNo", getGunNo())
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("qrCode", getQrCode())
+            .append("personnelPhone", getPersonnelPhone())
+            .toString();
+    }
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.PayOrder;
+
+/**
+ * 订单支付Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+public interface PayOrderMapper 
+{
+    /**
+     * 查询订单支付
+     * 
+     * @param orderId 订单支付ID
+     * @return 订单支付
+     */
+    public PayOrder selectPayOrderById(Long orderId);
+
+    /**
+     * 查询订单支付列表
+     * 
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> selectPayOrderList(PayOrder payOrder);
+
+    /**
+     * 新增订单支付
+     * 
+     * @param payOrder 订单支付
+     * @return 结果
+     */
+    public int insertPayOrder(PayOrder payOrder);
+
+    /**
+     * 修改订单支付
+     * 
+     * @param payOrder 订单支付
+     * @return 结果
+     */
+    public int updatePayOrder(PayOrder payOrder);
+
+    /**
+     * 删除订单支付
+     * 
+     * @param orderId 订单支付ID
+     * @return 结果
+     */
+    public int deletePayOrderById(Long orderId);
+
+    /**
+     * 批量删除订单支付
+     * 
+     * @param orderIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deletePayOrderByIds(Long[] orderIds);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationClassStructureMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationClassStructure;
+
+/**
+ * 班结管理Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-14
+ */
+public interface StationClassStructureMapper 
+{
+    /**
+     * 查询班结管理
+     * 
+     * @param id 班结管理ID
+     * @return 班结管理
+     */
+    public StationClassStructure selectStationClassStructureById(Long id);
+
+    /**
+     * 查询班结管理列表
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 班结管理集合
+     */
+    public List<StationClassStructure> selectStationClassStructureList(StationClassStructure stationClassStructure);
+
+    /**
+     * 新增班结管理
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int insertStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 修改班结管理
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int updateStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 删除班结管理
+     * 
+     * @param id 班结管理ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureById(Long id);
+
+    /**
+     * 批量删除班结管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureByIds(Long[] ids);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationDeviceManageMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationDeviceManage;
+
+/**
+ * 油站设备管理Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface StationDeviceManageMapper 
+{
+    /**
+     * 查询油站设备管理
+     * 
+     * @param deviceId 油站设备管理ID
+     * @return 油站设备管理
+     */
+    public StationDeviceManage selectStationDeviceManageById(Long deviceId);
+
+    /**
+     * 查询油站设备管理列表
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 油站设备管理集合
+     */
+    public List<StationDeviceManage> selectStationDeviceManageList(StationDeviceManage stationDeviceManage);
+
+    /**
+     * 新增油站设备管理
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 结果
+     */
+    public int insertStationDeviceManage(StationDeviceManage stationDeviceManage);
+
+    /**
+     * 修改油站设备管理
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 结果
+     */
+    public int updateStationDeviceManage(StationDeviceManage stationDeviceManage);
+
+    /**
+     * 删除油站设备管理
+     * 
+     * @param deviceId 油站设备管理ID
+     * @return 结果
+     */
+    public int deleteStationDeviceManageById(Long deviceId);
+
+    /**
+     * 批量删除油站设备管理
+     * 
+     * @param deviceIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationDeviceManageByIds(Long[] deviceIds);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationInfoMapper.java

@@ -7,7 +7,7 @@ import com.yijia.station.domain.StationInfo;
  * 油站信息Mapper接口
  * 
  * @author yijia
- * @date 2020-11-30
+ * @date 2020-12-08
  */
 public interface StationInfoMapper 
 {

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationNoticeMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationNotice;
+
+/**
+ * 油站通知管理Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+public interface StationNoticeMapper 
+{
+    /**
+     * 查询油站通知管理
+     * 
+     * @param noticeId 油站通知管理ID
+     * @return 油站通知管理
+     */
+    public StationNotice selectStationNoticeById(Long noticeId);
+
+    /**
+     * 查询油站通知管理列表
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 油站通知管理集合
+     */
+    public List<StationNotice> selectStationNoticeList(StationNotice stationNotice);
+
+    /**
+     * 新增油站通知管理
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 结果
+     */
+    public int insertStationNotice(StationNotice stationNotice);
+
+    /**
+     * 修改油站通知管理
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 结果
+     */
+    public int updateStationNotice(StationNotice stationNotice);
+
+    /**
+     * 删除油站通知管理
+     * 
+     * @param noticeId 油站通知管理ID
+     * @return 结果
+     */
+    public int deleteStationNoticeById(Long noticeId);
+
+    /**
+     * 批量删除油站通知管理
+     * 
+     * @param noticeIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationNoticeByIds(Long[] noticeIds);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationOilGunMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationOilGun;
+
+/**
+ * 油枪管理Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface StationOilGunMapper 
+{
+    /**
+     * 查询油枪管理
+     * 
+     * @param oilGunId 油枪管理ID
+     * @return 油枪管理
+     */
+    public StationOilGun selectStationOilGunById(Long oilGunId);
+
+    /**
+     * 查询油枪管理列表
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 油枪管理集合
+     */
+    public List<StationOilGun> selectStationOilGunList(StationOilGun stationOilGun);
+
+    /**
+     * 新增油枪管理
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 结果
+     */
+    public int insertStationOilGun(StationOilGun stationOilGun);
+
+    /**
+     * 修改油枪管理
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 结果
+     */
+    public int updateStationOilGun(StationOilGun stationOilGun);
+
+    /**
+     * 删除油枪管理
+     * 
+     * @param oilGunId 油枪管理ID
+     * @return 结果
+     */
+    public int deleteStationOilGunById(Long oilGunId);
+
+    /**
+     * 批量删除油枪管理
+     * 
+     * @param oilGunIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationOilGunByIds(Long[] oilGunIds);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationOilPriceAdjustMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationOilPriceAdjust;
+
+/**
+ * 油品调价信息Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface StationOilPriceAdjustMapper 
+{
+    /**
+     * 查询油品调价信息
+     * 
+     * @param adjustPriceId 油品调价信息ID
+     * @return 油品调价信息
+     */
+    public StationOilPriceAdjust selectStationOilPriceAdjustById(Long adjustPriceId);
+
+    /**
+     * 查询油品调价信息列表
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 油品调价信息集合
+     */
+    public List<StationOilPriceAdjust> selectStationOilPriceAdjustList(StationOilPriceAdjust stationOilPriceAdjust);
+
+    /**
+     * 新增油品调价信息
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 结果
+     */
+    public int insertStationOilPriceAdjust(StationOilPriceAdjust stationOilPriceAdjust);
+
+    /**
+     * 修改油品调价信息
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 结果
+     */
+    public int updateStationOilPriceAdjust(StationOilPriceAdjust stationOilPriceAdjust);
+
+    /**
+     * 删除油品调价信息
+     * 
+     * @param adjustPriceId 油品调价信息ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceAdjustById(Long adjustPriceId);
+
+    /**
+     * 批量删除油品调价信息
+     * 
+     * @param adjustPriceIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceAdjustByIds(Long[] adjustPriceIds);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationOilPriceMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationOilPrice;
+
+/**
+ * 油品价格Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+public interface StationOilPriceMapper 
+{
+    /**
+     * 查询油品价格
+     * 
+     * @param oilPriceId 油品价格ID
+     * @return 油品价格
+     */
+    public StationOilPrice selectStationOilPriceById(Long oilPriceId);
+
+    /**
+     * 查询油品价格列表
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 油品价格集合
+     */
+    public List<StationOilPrice> selectStationOilPriceList(StationOilPrice stationOilPrice);
+
+    /**
+     * 新增油品价格
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 结果
+     */
+    public int insertStationOilPrice(StationOilPrice stationOilPrice);
+
+    /**
+     * 修改油品价格
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 结果
+     */
+    public int updateStationOilPrice(StationOilPrice stationOilPrice);
+
+    /**
+     * 删除油品价格
+     * 
+     * @param oilPriceId 油品价格ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceById(Long oilPriceId);
+
+    /**
+     * 批量删除油品价格
+     * 
+     * @param oilPriceIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceByIds(Long[] oilPriceIds);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationPayMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationPay;
+
+/**
+ * 油站支付设置Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+public interface StationPayMapper 
+{
+    /**
+     * 查询油站支付设置
+     * 
+     * @param payId 油站支付设置ID
+     * @return 油站支付设置
+     */
+    public StationPay selectStationPayById(Long payId);
+
+    /**
+     * 查询油站支付设置列表
+     * 
+     * @param stationPay 油站支付设置
+     * @return 油站支付设置集合
+     */
+    public List<StationPay> selectStationPayList(StationPay stationPay);
+
+    /**
+     * 新增油站支付设置
+     * 
+     * @param stationPay 油站支付设置
+     * @return 结果
+     */
+    public int insertStationPay(StationPay stationPay);
+
+    /**
+     * 修改油站支付设置
+     * 
+     * @param stationPay 油站支付设置
+     * @return 结果
+     */
+    public int updateStationPay(StationPay stationPay);
+
+    /**
+     * 删除油站支付设置
+     * 
+     * @param payId 油站支付设置ID
+     * @return 结果
+     */
+    public int deleteStationPayById(Long payId);
+
+    /**
+     * 批量删除油站支付设置
+     * 
+     * @param payIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationPayByIds(Long[] payIds);
+}

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationPersonnelMapper.java

@@ -0,0 +1,61 @@
+package com.yijia.station.mapper;
+
+import java.util.List;
+import com.yijia.station.domain.StationPersonnel;
+
+/**
+ * 油站员工信息Mapper接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface StationPersonnelMapper 
+{
+    /**
+     * 查询油站员工信息
+     * 
+     * @param personnelId 油站员工信息ID
+     * @return 油站员工信息
+     */
+    public StationPersonnel selectStationPersonnelById(Long personnelId);
+
+    /**
+     * 查询油站员工信息列表
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 油站员工信息集合
+     */
+    public List<StationPersonnel> selectStationPersonnelList(StationPersonnel stationPersonnel);
+
+    /**
+     * 新增油站员工信息
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 结果
+     */
+    public int insertStationPersonnel(StationPersonnel stationPersonnel);
+
+    /**
+     * 修改油站员工信息
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 结果
+     */
+    public int updateStationPersonnel(StationPersonnel stationPersonnel);
+
+    /**
+     * 删除油站员工信息
+     * 
+     * @param personnelId 油站员工信息ID
+     * @return 结果
+     */
+    public int deleteStationPersonnelById(Long personnelId);
+
+    /**
+     * 批量删除油站员工信息
+     * 
+     * @param personnelIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationPersonnelByIds(Long[] personnelIds);
+}

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.PayOrder;
+
+/**
+ * 订单支付Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+public interface IPayOrderService 
+{
+    /**
+     * 查询订单支付
+     * 
+     * @param orderId 订单支付ID
+     * @return 订单支付
+     */
+    public PayOrder selectPayOrderById(Long orderId);
+
+    /**
+     * 查询订单支付列表
+     * 
+     * @param payOrder 订单支付
+     * @return 订单支付集合
+     */
+    public List<PayOrder> selectPayOrderList(PayOrder payOrder);
+
+    /**
+     * 新增订单支付
+     * 
+     * @param payOrder 订单支付
+     * @return 结果
+     */
+    public int insertPayOrder(PayOrder payOrder);
+
+    /**
+     * 修改订单支付
+     * 
+     * @param payOrder 订单支付
+     * @return 结果
+     */
+    public int updatePayOrder(PayOrder payOrder);
+
+    /**
+     * 批量删除订单支付
+     * 
+     * @param orderIds 需要删除的订单支付ID
+     * @return 结果
+     */
+    public int deletePayOrderByIds(Long[] orderIds);
+
+    /**
+     * 删除订单支付信息
+     * 
+     * @param orderId 订单支付ID
+     * @return 结果
+     */
+    public int deletePayOrderById(Long orderId);
+}

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationClassStructure;
+
+/**
+ * 班结管理Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-14
+ */
+public interface IStationClassStructureService 
+{
+    /**
+     * 查询班结管理
+     * 
+     * @param id 班结管理ID
+     * @return 班结管理
+     */
+    public StationClassStructure selectStationClassStructureById(Long id);
+
+    /**
+     * 查询班结管理列表
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 班结管理集合
+     */
+    public List<StationClassStructure> selectStationClassStructureList(StationClassStructure stationClassStructure);
+
+    /**
+     * 新增班结管理
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int insertStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 修改班结管理
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int updateStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 批量删除班结管理
+     * 
+     * @param ids 需要删除的班结管理ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureByIds(Long[] ids);
+
+    /**
+     * 删除班结管理信息
+     * 
+     * @param id 班结管理ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationDeviceManage;
+
+/**
+ * 油站设备管理Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface IStationDeviceManageService 
+{
+    /**
+     * 查询油站设备管理
+     * 
+     * @param deviceId 油站设备管理ID
+     * @return 油站设备管理
+     */
+    public StationDeviceManage selectStationDeviceManageById(Long deviceId);
+
+    /**
+     * 查询油站设备管理列表
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 油站设备管理集合
+     */
+    public List<StationDeviceManage> selectStationDeviceManageList(StationDeviceManage stationDeviceManage);
+
+    /**
+     * 新增油站设备管理
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 结果
+     */
+    public int insertStationDeviceManage(StationDeviceManage stationDeviceManage);
+
+    /**
+     * 修改油站设备管理
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 结果
+     */
+    public int updateStationDeviceManage(StationDeviceManage stationDeviceManage);
+
+    /**
+     * 批量删除油站设备管理
+     * 
+     * @param deviceIds 需要删除的油站设备管理ID
+     * @return 结果
+     */
+    public int deleteStationDeviceManageByIds(Long[] deviceIds);
+
+    /**
+     * 删除油站设备管理信息
+     * 
+     * @param deviceId 油站设备管理ID
+     * @return 结果
+     */
+    public int deleteStationDeviceManageById(Long deviceId);
+}

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

@@ -7,7 +7,7 @@ import com.yijia.station.domain.StationInfo;
  * 油站信息Service接口
  * 
  * @author yijia
- * @date 2020-11-30
+ * @date 2020-12-08
  */
 public interface IStationInfoService 
 {

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationNotice;
+
+/**
+ * 油站通知管理Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+public interface IStationNoticeService 
+{
+    /**
+     * 查询油站通知管理
+     * 
+     * @param noticeId 油站通知管理ID
+     * @return 油站通知管理
+     */
+    public StationNotice selectStationNoticeById(Long noticeId);
+
+    /**
+     * 查询油站通知管理列表
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 油站通知管理集合
+     */
+    public List<StationNotice> selectStationNoticeList(StationNotice stationNotice);
+
+    /**
+     * 新增油站通知管理
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 结果
+     */
+    public int insertStationNotice(StationNotice stationNotice);
+
+    /**
+     * 修改油站通知管理
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 结果
+     */
+    public int updateStationNotice(StationNotice stationNotice);
+
+    /**
+     * 批量删除油站通知管理
+     * 
+     * @param noticeIds 需要删除的油站通知管理ID
+     * @return 结果
+     */
+    public int deleteStationNoticeByIds(Long[] noticeIds);
+
+    /**
+     * 删除油站通知管理信息
+     * 
+     * @param noticeId 油站通知管理ID
+     * @return 结果
+     */
+    public int deleteStationNoticeById(Long noticeId);
+}

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationOilGun;
+
+/**
+ * 油枪管理Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface IStationOilGunService 
+{
+    /**
+     * 查询油枪管理
+     * 
+     * @param oilGunId 油枪管理ID
+     * @return 油枪管理
+     */
+    public StationOilGun selectStationOilGunById(Long oilGunId);
+
+    /**
+     * 查询油枪管理列表
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 油枪管理集合
+     */
+    public List<StationOilGun> selectStationOilGunList(StationOilGun stationOilGun);
+
+    /**
+     * 新增油枪管理
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 结果
+     */
+    public int insertStationOilGun(StationOilGun stationOilGun);
+
+    /**
+     * 修改油枪管理
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 结果
+     */
+    public int updateStationOilGun(StationOilGun stationOilGun);
+
+    /**
+     * 批量删除油枪管理
+     * 
+     * @param oilGunIds 需要删除的油枪管理ID
+     * @return 结果
+     */
+    public int deleteStationOilGunByIds(Long[] oilGunIds);
+
+    /**
+     * 删除油枪管理信息
+     * 
+     * @param oilGunId 油枪管理ID
+     * @return 结果
+     */
+    public int deleteStationOilGunById(Long oilGunId);
+}

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationOilPriceAdjust;
+
+/**
+ * 油品调价信息Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface IStationOilPriceAdjustService 
+{
+    /**
+     * 查询油品调价信息
+     * 
+     * @param adjustPriceId 油品调价信息ID
+     * @return 油品调价信息
+     */
+    public StationOilPriceAdjust selectStationOilPriceAdjustById(Long adjustPriceId);
+
+    /**
+     * 查询油品调价信息列表
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 油品调价信息集合
+     */
+    public List<StationOilPriceAdjust> selectStationOilPriceAdjustList(StationOilPriceAdjust stationOilPriceAdjust);
+
+    /**
+     * 新增油品调价信息
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 结果
+     */
+    public int insertStationOilPriceAdjust(StationOilPriceAdjust stationOilPriceAdjust);
+
+    /**
+     * 修改油品调价信息
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 结果
+     */
+    public int updateStationOilPriceAdjust(StationOilPriceAdjust stationOilPriceAdjust);
+
+    /**
+     * 批量删除油品调价信息
+     * 
+     * @param adjustPriceIds 需要删除的油品调价信息ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceAdjustByIds(Long[] adjustPriceIds);
+
+    /**
+     * 删除油品调价信息信息
+     * 
+     * @param adjustPriceId 油品调价信息ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceAdjustById(Long adjustPriceId);
+}

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationOilPrice;
+
+/**
+ * 油品价格Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+public interface IStationOilPriceService 
+{
+    /**
+     * 查询油品价格
+     * 
+     * @param oilPriceId 油品价格ID
+     * @return 油品价格
+     */
+    public StationOilPrice selectStationOilPriceById(Long oilPriceId);
+
+    /**
+     * 查询油品价格列表
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 油品价格集合
+     */
+    public List<StationOilPrice> selectStationOilPriceList(StationOilPrice stationOilPrice);
+
+    /**
+     * 新增油品价格
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 结果
+     */
+    public int insertStationOilPrice(StationOilPrice stationOilPrice);
+
+    /**
+     * 修改油品价格
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 结果
+     */
+    public int updateStationOilPrice(StationOilPrice stationOilPrice);
+
+    /**
+     * 批量删除油品价格
+     * 
+     * @param oilPriceIds 需要删除的油品价格ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceByIds(Long[] oilPriceIds);
+
+    /**
+     * 删除油品价格信息
+     * 
+     * @param oilPriceId 油品价格ID
+     * @return 结果
+     */
+    public int deleteStationOilPriceById(Long oilPriceId);
+}

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

@@ -0,0 +1,68 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationPay;
+
+/**
+ * 油站支付设置Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+public interface IStationPayService 
+{
+    /**
+     * 查询油站支付设置
+     * 
+     * @param payId 油站支付设置ID
+     * @return 油站支付设置
+     */
+    public StationPay selectStationPayById(Long payId);
+
+    /**
+     * 查询油站支付设置列表
+     * 
+     * @param stationPay 油站支付设置
+     * @return 油站支付设置集合
+     */
+    public List<StationPay> selectStationPayList(StationPay stationPay);
+
+    /**
+     * 新增油站支付设置
+     * 
+     * @param stationPay 油站支付设置
+     * @return 结果
+     */
+    public int insertStationPay(StationPay stationPay);
+
+    /**
+     * 修改油站支付设置
+     * 
+     * @param stationPay 油站支付设置
+     * @return 结果
+     */
+    public int updateStationPay(StationPay stationPay);
+
+    /**
+     * 批量删除油站支付设置
+     * 
+     * @param payIds 需要删除的油站支付设置ID
+     * @return 结果
+     */
+    public int deleteStationPayByIds(Long[] payIds);
+
+    /**
+     * 删除油站支付设置信息
+     * 
+     * @param payId 油站支付设置ID
+     * @return 结果
+     */
+    public int deleteStationPayById(Long payId);
+
+    /**
+     * 查询支付设置信息
+     * @param stationPay
+     * @return
+     */
+    public StationPay selectStationPayOne(StationPay stationPay);
+}

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

@@ -0,0 +1,61 @@
+package com.yijia.station.service;
+
+import java.util.List;
+import com.yijia.station.domain.StationPersonnel;
+
+/**
+ * 油站员工信息Service接口
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+public interface IStationPersonnelService 
+{
+    /**
+     * 查询油站员工信息
+     * 
+     * @param personnelId 油站员工信息ID
+     * @return 油站员工信息
+     */
+    public StationPersonnel selectStationPersonnelById(Long personnelId);
+
+    /**
+     * 查询油站员工信息列表
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 油站员工信息集合
+     */
+    public List<StationPersonnel> selectStationPersonnelList(StationPersonnel stationPersonnel);
+
+    /**
+     * 新增油站员工信息
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 结果
+     */
+    public int insertStationPersonnel(StationPersonnel stationPersonnel);
+
+    /**
+     * 修改油站员工信息
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 结果
+     */
+    public int updateStationPersonnel(StationPersonnel stationPersonnel);
+
+    /**
+     * 批量删除油站员工信息
+     * 
+     * @param personnelIds 需要删除的油站员工信息ID
+     * @return 结果
+     */
+    public int deleteStationPersonnelByIds(Long[] personnelIds);
+
+    /**
+     * 删除油站员工信息信息
+     * 
+     * @param personnelId 油站员工信息ID
+     * @return 结果
+     */
+    public int deleteStationPersonnelById(Long personnelId);
+}

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.PayOrderMapper;
+import com.yijia.station.domain.PayOrder;
+import com.yijia.station.service.IPayOrderService;
+
+/**
+ * 订单支付Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+@Service
+public class PayOrderServiceImpl implements IPayOrderService 
+{
+    @Autowired
+    private PayOrderMapper payOrderMapper;
+
+    /**
+     * 查询订单支付
+     * 
+     * @param orderId 订单支付ID
+     * @return 订单支付
+     */
+    @Override
+    public PayOrder selectPayOrderById(Long orderId)
+    {
+        return payOrderMapper.selectPayOrderById(orderId);
+    }
+
+    /**
+     * 查询订单支付列表
+     * 
+     * @param payOrder 订单支付
+     * @return 订单支付
+     */
+    @Override
+    public List<PayOrder> selectPayOrderList(PayOrder payOrder)
+    {
+        return payOrderMapper.selectPayOrderList(payOrder);
+    }
+
+    /**
+     * 新增订单支付
+     * 
+     * @param payOrder 订单支付
+     * @return 结果
+     */
+    @Override
+    public int insertPayOrder(PayOrder payOrder)
+    {
+        return payOrderMapper.insertPayOrder(payOrder);
+    }
+
+    /**
+     * 修改订单支付
+     * 
+     * @param payOrder 订单支付
+     * @return 结果
+     */
+    @Override
+    public int updatePayOrder(PayOrder payOrder)
+    {
+        return payOrderMapper.updatePayOrder(payOrder);
+    }
+
+    /**
+     * 批量删除订单支付
+     * 
+     * @param orderIds 需要删除的订单支付ID
+     * @return 结果
+     */
+    @Override
+    public int deletePayOrderByIds(Long[] orderIds)
+    {
+        return payOrderMapper.deletePayOrderByIds(orderIds);
+    }
+
+    /**
+     * 删除订单支付信息
+     * 
+     * @param orderId 订单支付ID
+     * @return 结果
+     */
+    @Override
+    public int deletePayOrderById(Long orderId)
+    {
+        return payOrderMapper.deletePayOrderById(orderId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationClassStructureMapper;
+import com.yijia.station.domain.StationClassStructure;
+import com.yijia.station.service.IStationClassStructureService;
+
+/**
+ * 班结管理Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-14
+ */
+@Service
+public class StationClassStructureServiceImpl implements IStationClassStructureService 
+{
+    @Autowired
+    private StationClassStructureMapper stationClassStructureMapper;
+
+    /**
+     * 查询班结管理
+     * 
+     * @param id 班结管理ID
+     * @return 班结管理
+     */
+    @Override
+    public StationClassStructure selectStationClassStructureById(Long id)
+    {
+        return stationClassStructureMapper.selectStationClassStructureById(id);
+    }
+
+    /**
+     * 查询班结管理列表
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 班结管理
+     */
+    @Override
+    public List<StationClassStructure> selectStationClassStructureList(StationClassStructure stationClassStructure)
+    {
+        return stationClassStructureMapper.selectStationClassStructureList(stationClassStructure);
+    }
+
+    /**
+     * 新增班结管理
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    @Override
+    public int insertStationClassStructure(StationClassStructure stationClassStructure)
+    {
+        return stationClassStructureMapper.insertStationClassStructure(stationClassStructure);
+    }
+
+    /**
+     * 修改班结管理
+     * 
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    @Override
+    public int updateStationClassStructure(StationClassStructure stationClassStructure)
+    {
+        return stationClassStructureMapper.updateStationClassStructure(stationClassStructure);
+    }
+
+    /**
+     * 批量删除班结管理
+     * 
+     * @param ids 需要删除的班结管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationClassStructureByIds(Long[] ids)
+    {
+        return stationClassStructureMapper.deleteStationClassStructureByIds(ids);
+    }
+
+    /**
+     * 删除班结管理信息
+     * 
+     * @param id 班结管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationClassStructureById(Long id)
+    {
+        return stationClassStructureMapper.deleteStationClassStructureById(id);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationDeviceManageMapper;
+import com.yijia.station.domain.StationDeviceManage;
+import com.yijia.station.service.IStationDeviceManageService;
+
+/**
+ * 油站设备管理Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@Service
+public class StationDeviceManageServiceImpl implements IStationDeviceManageService 
+{
+    @Autowired
+    private StationDeviceManageMapper stationDeviceManageMapper;
+
+    /**
+     * 查询油站设备管理
+     * 
+     * @param deviceId 油站设备管理ID
+     * @return 油站设备管理
+     */
+    @Override
+    public StationDeviceManage selectStationDeviceManageById(Long deviceId)
+    {
+        return stationDeviceManageMapper.selectStationDeviceManageById(deviceId);
+    }
+
+    /**
+     * 查询油站设备管理列表
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 油站设备管理
+     */
+    @Override
+    public List<StationDeviceManage> selectStationDeviceManageList(StationDeviceManage stationDeviceManage)
+    {
+        return stationDeviceManageMapper.selectStationDeviceManageList(stationDeviceManage);
+    }
+
+    /**
+     * 新增油站设备管理
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 结果
+     */
+    @Override
+    public int insertStationDeviceManage(StationDeviceManage stationDeviceManage)
+    {
+        return stationDeviceManageMapper.insertStationDeviceManage(stationDeviceManage);
+    }
+
+    /**
+     * 修改油站设备管理
+     * 
+     * @param stationDeviceManage 油站设备管理
+     * @return 结果
+     */
+    @Override
+    public int updateStationDeviceManage(StationDeviceManage stationDeviceManage)
+    {
+        return stationDeviceManageMapper.updateStationDeviceManage(stationDeviceManage);
+    }
+
+    /**
+     * 批量删除油站设备管理
+     * 
+     * @param deviceIds 需要删除的油站设备管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationDeviceManageByIds(Long[] deviceIds)
+    {
+        return stationDeviceManageMapper.deleteStationDeviceManageByIds(deviceIds);
+    }
+
+    /**
+     * 删除油站设备管理信息
+     * 
+     * @param deviceId 油站设备管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationDeviceManageById(Long deviceId)
+    {
+        return stationDeviceManageMapper.deleteStationDeviceManageById(deviceId);
+    }
+}

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

@@ -11,7 +11,7 @@ import com.yijia.station.service.IStationInfoService;
  * 油站信息Service业务层处理
  * 
  * @author yijia
- * @date 2020-11-30
+ * @date 2020-12-08
  */
 @Service
 public class StationInfoServiceImpl implements IStationInfoService 

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationNoticeMapper;
+import com.yijia.station.domain.StationNotice;
+import com.yijia.station.service.IStationNoticeService;
+
+/**
+ * 油站通知管理Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+@Service
+public class StationNoticeServiceImpl implements IStationNoticeService 
+{
+    @Autowired
+    private StationNoticeMapper stationNoticeMapper;
+
+    /**
+     * 查询油站通知管理
+     * 
+     * @param noticeId 油站通知管理ID
+     * @return 油站通知管理
+     */
+    @Override
+    public StationNotice selectStationNoticeById(Long noticeId)
+    {
+        return stationNoticeMapper.selectStationNoticeById(noticeId);
+    }
+
+    /**
+     * 查询油站通知管理列表
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 油站通知管理
+     */
+    @Override
+    public List<StationNotice> selectStationNoticeList(StationNotice stationNotice)
+    {
+        return stationNoticeMapper.selectStationNoticeList(stationNotice);
+    }
+
+    /**
+     * 新增油站通知管理
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 结果
+     */
+    @Override
+    public int insertStationNotice(StationNotice stationNotice)
+    {
+        return stationNoticeMapper.insertStationNotice(stationNotice);
+    }
+
+    /**
+     * 修改油站通知管理
+     * 
+     * @param stationNotice 油站通知管理
+     * @return 结果
+     */
+    @Override
+    public int updateStationNotice(StationNotice stationNotice)
+    {
+        return stationNoticeMapper.updateStationNotice(stationNotice);
+    }
+
+    /**
+     * 批量删除油站通知管理
+     * 
+     * @param noticeIds 需要删除的油站通知管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationNoticeByIds(Long[] noticeIds)
+    {
+        return stationNoticeMapper.deleteStationNoticeByIds(noticeIds);
+    }
+
+    /**
+     * 删除油站通知管理信息
+     * 
+     * @param noticeId 油站通知管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationNoticeById(Long noticeId)
+    {
+        return stationNoticeMapper.deleteStationNoticeById(noticeId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationOilGunMapper;
+import com.yijia.station.domain.StationOilGun;
+import com.yijia.station.service.IStationOilGunService;
+
+/**
+ * 油枪管理Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@Service
+public class StationOilGunServiceImpl implements IStationOilGunService 
+{
+    @Autowired
+    private StationOilGunMapper stationOilGunMapper;
+
+    /**
+     * 查询油枪管理
+     * 
+     * @param oilGunId 油枪管理ID
+     * @return 油枪管理
+     */
+    @Override
+    public StationOilGun selectStationOilGunById(Long oilGunId)
+    {
+        return stationOilGunMapper.selectStationOilGunById(oilGunId);
+    }
+
+    /**
+     * 查询油枪管理列表
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 油枪管理
+     */
+    @Override
+    public List<StationOilGun> selectStationOilGunList(StationOilGun stationOilGun)
+    {
+        return stationOilGunMapper.selectStationOilGunList(stationOilGun);
+    }
+
+    /**
+     * 新增油枪管理
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 结果
+     */
+    @Override
+    public int insertStationOilGun(StationOilGun stationOilGun)
+    {
+        return stationOilGunMapper.insertStationOilGun(stationOilGun);
+    }
+
+    /**
+     * 修改油枪管理
+     * 
+     * @param stationOilGun 油枪管理
+     * @return 结果
+     */
+    @Override
+    public int updateStationOilGun(StationOilGun stationOilGun)
+    {
+        return stationOilGunMapper.updateStationOilGun(stationOilGun);
+    }
+
+    /**
+     * 批量删除油枪管理
+     * 
+     * @param oilGunIds 需要删除的油枪管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationOilGunByIds(Long[] oilGunIds)
+    {
+        return stationOilGunMapper.deleteStationOilGunByIds(oilGunIds);
+    }
+
+    /**
+     * 删除油枪管理信息
+     * 
+     * @param oilGunId 油枪管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationOilGunById(Long oilGunId)
+    {
+        return stationOilGunMapper.deleteStationOilGunById(oilGunId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationOilPriceAdjustMapper;
+import com.yijia.station.domain.StationOilPriceAdjust;
+import com.yijia.station.service.IStationOilPriceAdjustService;
+
+/**
+ * 油品调价信息Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@Service
+public class StationOilPriceAdjustServiceImpl implements IStationOilPriceAdjustService 
+{
+    @Autowired
+    private StationOilPriceAdjustMapper stationOilPriceAdjustMapper;
+
+    /**
+     * 查询油品调价信息
+     * 
+     * @param adjustPriceId 油品调价信息ID
+     * @return 油品调价信息
+     */
+    @Override
+    public StationOilPriceAdjust selectStationOilPriceAdjustById(Long adjustPriceId)
+    {
+        return stationOilPriceAdjustMapper.selectStationOilPriceAdjustById(adjustPriceId);
+    }
+
+    /**
+     * 查询油品调价信息列表
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 油品调价信息
+     */
+    @Override
+    public List<StationOilPriceAdjust> selectStationOilPriceAdjustList(StationOilPriceAdjust stationOilPriceAdjust)
+    {
+        return stationOilPriceAdjustMapper.selectStationOilPriceAdjustList(stationOilPriceAdjust);
+    }
+
+    /**
+     * 新增油品调价信息
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 结果
+     */
+    @Override
+    public int insertStationOilPriceAdjust(StationOilPriceAdjust stationOilPriceAdjust)
+    {
+        return stationOilPriceAdjustMapper.insertStationOilPriceAdjust(stationOilPriceAdjust);
+    }
+
+    /**
+     * 修改油品调价信息
+     * 
+     * @param stationOilPriceAdjust 油品调价信息
+     * @return 结果
+     */
+    @Override
+    public int updateStationOilPriceAdjust(StationOilPriceAdjust stationOilPriceAdjust)
+    {
+        return stationOilPriceAdjustMapper.updateStationOilPriceAdjust(stationOilPriceAdjust);
+    }
+
+    /**
+     * 批量删除油品调价信息
+     * 
+     * @param adjustPriceIds 需要删除的油品调价信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationOilPriceAdjustByIds(Long[] adjustPriceIds)
+    {
+        return stationOilPriceAdjustMapper.deleteStationOilPriceAdjustByIds(adjustPriceIds);
+    }
+
+    /**
+     * 删除油品调价信息信息
+     * 
+     * @param adjustPriceId 油品调价信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationOilPriceAdjustById(Long adjustPriceId)
+    {
+        return stationOilPriceAdjustMapper.deleteStationOilPriceAdjustById(adjustPriceId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationOilPriceMapper;
+import com.yijia.station.domain.StationOilPrice;
+import com.yijia.station.service.IStationOilPriceService;
+
+/**
+ * 油品价格Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-08
+ */
+@Service
+public class StationOilPriceServiceImpl implements IStationOilPriceService 
+{
+    @Autowired
+    private StationOilPriceMapper stationOilPriceMapper;
+
+    /**
+     * 查询油品价格
+     * 
+     * @param oilPriceId 油品价格ID
+     * @return 油品价格
+     */
+    @Override
+    public StationOilPrice selectStationOilPriceById(Long oilPriceId)
+    {
+        return stationOilPriceMapper.selectStationOilPriceById(oilPriceId);
+    }
+
+    /**
+     * 查询油品价格列表
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 油品价格
+     */
+    @Override
+    public List<StationOilPrice> selectStationOilPriceList(StationOilPrice stationOilPrice)
+    {
+        return stationOilPriceMapper.selectStationOilPriceList(stationOilPrice);
+    }
+
+    /**
+     * 新增油品价格
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 结果
+     */
+    @Override
+    public int insertStationOilPrice(StationOilPrice stationOilPrice)
+    {
+        return stationOilPriceMapper.insertStationOilPrice(stationOilPrice);
+    }
+
+    /**
+     * 修改油品价格
+     * 
+     * @param stationOilPrice 油品价格
+     * @return 结果
+     */
+    @Override
+    public int updateStationOilPrice(StationOilPrice stationOilPrice)
+    {
+        return stationOilPriceMapper.updateStationOilPrice(stationOilPrice);
+    }
+
+    /**
+     * 批量删除油品价格
+     * 
+     * @param oilPriceIds 需要删除的油品价格ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationOilPriceByIds(Long[] oilPriceIds)
+    {
+        return stationOilPriceMapper.deleteStationOilPriceByIds(oilPriceIds);
+    }
+
+    /**
+     * 删除油品价格信息
+     * 
+     * @param oilPriceId 油品价格ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationOilPriceById(Long oilPriceId)
+    {
+        return stationOilPriceMapper.deleteStationOilPriceById(oilPriceId);
+    }
+}

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

@@ -0,0 +1,111 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationPayMapper;
+import com.yijia.station.domain.StationPay;
+import com.yijia.station.service.IStationPayService;
+
+/**
+ * 油站支付设置Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-10
+ */
+@Service
+public class StationPayServiceImpl implements IStationPayService 
+{
+    @Autowired
+    private StationPayMapper stationPayMapper;
+
+    /**
+     * 查询油站支付设置
+     * 
+     * @param payId 油站支付设置ID
+     * @return 油站支付设置
+     */
+    @Override
+    public StationPay selectStationPayById(Long payId)
+    {
+        return stationPayMapper.selectStationPayById(payId);
+    }
+
+    /**
+     * 查询油站支付设置列表
+     * 
+     * @param stationPay 油站支付设置
+     * @return 油站支付设置
+     */
+    @Override
+    public List<StationPay> selectStationPayList(StationPay stationPay)
+    {
+        return stationPayMapper.selectStationPayList(stationPay);
+    }
+
+    /**
+     * 新增油站支付设置
+     * 
+     * @param stationPay 油站支付设置
+     * @return 结果
+     */
+    @Override
+    public int insertStationPay(StationPay stationPay)
+    {
+        return stationPayMapper.insertStationPay(stationPay);
+    }
+
+    /**
+     * 修改油站支付设置
+     * 
+     * @param stationPay 油站支付设置
+     * @return 结果
+     */
+    @Override
+    public int updateStationPay(StationPay stationPay)
+    {
+        return stationPayMapper.updateStationPay(stationPay);
+    }
+
+    /**
+     * 批量删除油站支付设置
+     * 
+     * @param payIds 需要删除的油站支付设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationPayByIds(Long[] payIds)
+    {
+        return stationPayMapper.deleteStationPayByIds(payIds);
+    }
+
+    /**
+     * 删除油站支付设置信息
+     * 
+     * @param payId 油站支付设置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationPayById(Long payId)
+    {
+        return stationPayMapper.deleteStationPayById(payId);
+    }
+
+    @Override
+    public StationPay selectStationPayOne(StationPay stationPay) {
+        StationPay pay=new StationPay();
+        List<StationPay>  list= stationPayMapper.selectStationPayList(stationPay);
+        if(list!=null && list.size()>0){
+            pay.setWsPrintFlag(list.get(0).getWsPrintFlag());
+            pay.setPayCallbackPage(list.get(0).getPayCallbackPage());
+            pay.setPreferentialWayShareFlag(list.get(0).getPreferentialWayShareFlag());
+            pay.setPayPrintNum(list.get(0).getPayPrintNum());
+            pay.setPayMode(list.get(0).getPayMode());
+            pay.setOtherPreferentialWay(list.get(0).getOtherPreferentialWay());
+            pay.setImagePhotosFlag(list.get(0).getImagePhotosFlag());
+            pay.setCardEnabledFlag(list.get(0).getCardEnabledFlag());
+            pay.setActivityPic(list.get(0).getActivityPic());
+        }
+        return pay;
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.yijia.station.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yijia.station.mapper.StationPersonnelMapper;
+import com.yijia.station.domain.StationPersonnel;
+import com.yijia.station.service.IStationPersonnelService;
+
+/**
+ * 油站员工信息Service业务层处理
+ * 
+ * @author yijia
+ * @date 2020-12-09
+ */
+@Service
+public class StationPersonnelServiceImpl implements IStationPersonnelService 
+{
+    @Autowired
+    private StationPersonnelMapper stationPersonnelMapper;
+
+    /**
+     * 查询油站员工信息
+     * 
+     * @param personnelId 油站员工信息ID
+     * @return 油站员工信息
+     */
+    @Override
+    public StationPersonnel selectStationPersonnelById(Long personnelId)
+    {
+        return stationPersonnelMapper.selectStationPersonnelById(personnelId);
+    }
+
+    /**
+     * 查询油站员工信息列表
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 油站员工信息
+     */
+    @Override
+    public List<StationPersonnel> selectStationPersonnelList(StationPersonnel stationPersonnel)
+    {
+        return stationPersonnelMapper.selectStationPersonnelList(stationPersonnel);
+    }
+
+    /**
+     * 新增油站员工信息
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 结果
+     */
+    @Override
+    public int insertStationPersonnel(StationPersonnel stationPersonnel)
+    {
+        return stationPersonnelMapper.insertStationPersonnel(stationPersonnel);
+    }
+
+    /**
+     * 修改油站员工信息
+     * 
+     * @param stationPersonnel 油站员工信息
+     * @return 结果
+     */
+    @Override
+    public int updateStationPersonnel(StationPersonnel stationPersonnel)
+    {
+        return stationPersonnelMapper.updateStationPersonnel(stationPersonnel);
+    }
+
+    /**
+     * 批量删除油站员工信息
+     * 
+     * @param personnelIds 需要删除的油站员工信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationPersonnelByIds(Long[] personnelIds)
+    {
+        return stationPersonnelMapper.deleteStationPersonnelByIds(personnelIds);
+    }
+
+    /**
+     * 删除油站员工信息信息
+     * 
+     * @param personnelId 油站员工信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationPersonnelById(Long personnelId)
+    {
+        return stationPersonnelMapper.deleteStationPersonnelById(personnelId);
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.yijia.station.task;
+
+
+import com.yijia.station.domain.StationOilPrice;
+import com.yijia.station.domain.StationOilPriceAdjust;
+import com.yijia.station.service.IStationOilPriceAdjustService;
+import com.yijia.station.service.IStationOilPriceService;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务
+public class SaticScheduleTask {
+
+//    private IStationOilPriceAdjustService stationOilPriceAdjustService;
+//    private IStationOilPriceService stationOilPriceService;
+//    //3.添加定时任务
+//    @Scheduled(cron = "0/5 * * * * ?")
+//    //或直接指定时间间隔，例如：5秒
+//    //@Scheduled(fixedRate=5000)
+//    private void configureTasks() {
+//        System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
+//        //查询油品调价列表 查询出未调价的信息
+////        StationOilPriceAdjust stationOilPriceAdjust =new StationOilPriceAdjust();
+////        stationOilPriceAdjust.setTakeEffectStatus("1");
+////        List<StationOilPriceAdjust>  oilPriceAdjustList=stationOilPriceAdjustService.selectStationOilPriceAdjustList(stationOilPriceAdjust);
+////        //循环查看 调价的生效时间是否和当前时间相符
+////        for(StationOilPriceAdjust adjust: oilPriceAdjustList ){
+////            //判断当前时间是否符合调价生效时间
+////            if(adjust.getAdjustDate().equals(new Date()) ){
+////                //根据查询油品价格id
+////                StationOilPrice oilPrice=new StationOilPrice();
+////                oilPrice.setOilName(adjust.getOilName());
+////                oilPrice.setStationId(adjust.getStationId());
+////               List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(oilPrice);
+////               if(list!=null && list.size()==1){
+////                   //修改调价状态
+////                   adjust.setTakeEffectStatus("2");
+////                   stationOilPriceAdjustService.updateStationOilPriceAdjust(adjust);
+////                   //修改油站对应的价格
+////                   StationOilPrice stationOilPrice=new StationOilPrice();
+////                   stationOilPrice.setOilPriceId(list.get(0).getOilPriceId());
+////                   stationOilPrice.setOilPrice(adjust.getOilAdjustPrice());
+////                   stationOilPriceService.updateStationOilPrice(stationOilPrice);
+////               }
+////            }
+//      //  }
+//    }
+}

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

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.PayOrderMapper">
+    
+    <resultMap type="PayOrder" id="PayOrderResult">
+        <result property="orderId"    column="order_id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="oilGun"    column="oil_gun"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="consumerId"    column="consumer_id"    />
+        <result property="consumer"    column="consumer"    />
+        <result property="amt"    column="amt"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="status"    column="status"    />
+        <result property="orderLiters"    column="order_liters"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="payWay"    column="pay_way"    />
+        <result property="payDate"    column="pay_date"    />
+        <result property="oilPersonnel"    column="oil_personnel"    />
+        <result property="createdDate"    column="created_date"    />
+        <result property="orderType"    column="order_type"    />
+    </resultMap>
+
+    <sql id="selectPayOrderVo">
+        select order_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_id, status, order_liters, pay_type, pay_way, pay_date, oil_personnel, created_date, order_type from pay_order
+    </sql>
+
+    <select id="selectPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
+        <include refid="selectPayOrderVo"/>
+        <where>  
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</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="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="amt != null  and amt != ''"> and amt = #{amt}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="orderLiters != null  and orderLiters != ''"> and order_liters = #{orderLiters}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
+            <if test="payDate != null "> and pay_date = #{payDate}</if>
+            <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
+            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+        </where>
+    </select>
+    
+    <select id="selectPayOrderById" parameterType="Long" resultMap="PayOrderResult">
+        <include refid="selectPayOrderVo"/>
+        where order_id = #{orderId}
+    </select>
+        
+    <insert id="insertPayOrder" parameterType="PayOrder" useGeneratedKeys="true" keyProperty="orderId">
+        insert into pay_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">order_no,</if>
+            <if test="oilGun != null">oil_gun,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="consumerId != null">consumer_id,</if>
+            <if test="consumer != null">consumer,</if>
+            <if test="amt != null">amt,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="status != null">status,</if>
+            <if test="orderLiters != null">order_liters,</if>
+            <if test="payType != null">pay_type,</if>
+            <if test="payWay != null">pay_way,</if>
+            <if test="payDate != null">pay_date,</if>
+            <if test="oilPersonnel != null">oil_personnel,</if>
+            <if test="createdDate != null">created_date,</if>
+            <if test="orderType != null">order_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="oilGun != null">#{oilGun},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="consumerId != null">#{consumerId},</if>
+            <if test="consumer != null">#{consumer},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="status != null">#{status},</if>
+            <if test="orderLiters != null">#{orderLiters},</if>
+            <if test="payType != null">#{payType},</if>
+            <if test="payWay != null">#{payWay},</if>
+            <if test="payDate != null">#{payDate},</if>
+            <if test="oilPersonnel != null">#{oilPersonnel},</if>
+            <if test="createdDate != null">#{createdDate},</if>
+            <if test="orderType != null">#{orderType},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePayOrder" parameterType="PayOrder">
+        update pay_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="oilGun != null">oil_gun = #{oilGun},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="consumerId != null">consumer_id = #{consumerId},</if>
+            <if test="consumer != null">consumer = #{consumer},</if>
+            <if test="amt != null">amt = #{amt},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="orderLiters != null">order_liters = #{orderLiters},</if>
+            <if test="payType != null">pay_type = #{payType},</if>
+            <if test="payWay != null">pay_way = #{payWay},</if>
+            <if test="payDate != null">pay_date = #{payDate},</if>
+            <if test="oilPersonnel != null">oil_personnel = #{oilPersonnel},</if>
+            <if test="createdDate != null">created_date = #{createdDate},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+        </trim>
+        where order_id = #{orderId}
+    </update>
+
+    <delete id="deletePayOrderById" parameterType="Long">
+        delete from pay_order where order_id = #{orderId}
+    </delete>
+
+    <delete id="deletePayOrderByIds" parameterType="String">
+        delete from pay_order where order_id in 
+        <foreach item="orderId" collection="array" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationClassStructureMapper">
+    
+    <resultMap type="StationClassStructure" id="StationClassStructureResult">
+        <result property="id"    column="id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="person"    column="person"    />
+        <result property="gunNo"    column="gun_no"    />
+        <result property="salesVolume"    column="sales_volume"    />
+        <result property="salesAmount"    column="sales_amount"    />
+        <result property="discount"    column="discount"    />
+        <result property="coupon"    column="coupon"    />
+        <result property="netReceipts"    column="net_receipts"    />
+        <result property="salesNum"    column="sales_num"    />
+        <result property="printNum"    column="print_num"    />
+        <result property="classStructureNo"    column="class_structure_no"    />
+        <result property="classStructureDate"    column="class_structure_date"    />
+        <result property="classStructureMan"    column="class_structure_man"    />
+    </resultMap>
+
+    <sql id="selectStationClassStructureVo">
+        select id, station_id, station_name, person, gun_no, sales_volume, sales_amount, discount, coupon, net_receipts, sales_num, print_num, class_structure_no, class_structure_date, class_structure_man from station_class_structure
+    </sql>
+
+    <select id="selectStationClassStructureList" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        <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="person != null  and person != ''"> and person = #{person}</if>
+            <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
+            <if test="salesVolume != null  and salesVolume != ''"> and sales_volume = #{salesVolume}</if>
+            <if test="salesAmount != null  and salesAmount != ''"> and sales_amount = #{salesAmount}</if>
+            <if test="discount != null  and discount != ''"> and discount = #{discount}</if>
+            <if test="coupon != null  and coupon != ''"> and coupon = #{coupon}</if>
+            <if test="netReceipts != null  and netReceipts != ''"> and net_receipts = #{netReceipts}</if>
+            <if test="salesNum != null "> and sales_num = #{salesNum}</if>
+            <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            <if test="classStructureDate != null "> and class_structure_date = #{classStructureDate}</if>
+            <if test="classStructureMan != null  and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationClassStructureById" parameterType="Long" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertStationClassStructure" parameterType="StationClassStructure" useGeneratedKeys="true" keyProperty="id">
+        insert into station_class_structure
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="person != null">person,</if>
+            <if test="gunNo != null">gun_no,</if>
+            <if test="salesVolume != null">sales_volume,</if>
+            <if test="salesAmount != null">sales_amount,</if>
+            <if test="discount != null">discount,</if>
+            <if test="coupon != null">coupon,</if>
+            <if test="netReceipts != null">net_receipts,</if>
+            <if test="salesNum != null">sales_num,</if>
+            <if test="printNum != null">print_num,</if>
+            <if test="classStructureNo != null">class_structure_no,</if>
+            <if test="classStructureDate != null">class_structure_date,</if>
+            <if test="classStructureMan != null">class_structure_man,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="person != null">#{person},</if>
+            <if test="gunNo != null">#{gunNo},</if>
+            <if test="salesVolume != null">#{salesVolume},</if>
+            <if test="salesAmount != null">#{salesAmount},</if>
+            <if test="discount != null">#{discount},</if>
+            <if test="coupon != null">#{coupon},</if>
+            <if test="netReceipts != null">#{netReceipts},</if>
+            <if test="salesNum != null">#{salesNum},</if>
+            <if test="printNum != null">#{printNum},</if>
+            <if test="classStructureNo != null">#{classStructureNo},</if>
+            <if test="classStructureDate != null">#{classStructureDate},</if>
+            <if test="classStructureMan != null">#{classStructureMan},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationClassStructure" parameterType="StationClassStructure">
+        update station_class_structure
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="person != null">person = #{person},</if>
+            <if test="gunNo != null">gun_no = #{gunNo},</if>
+            <if test="salesVolume != null">sales_volume = #{salesVolume},</if>
+            <if test="salesAmount != null">sales_amount = #{salesAmount},</if>
+            <if test="discount != null">discount = #{discount},</if>
+            <if test="coupon != null">coupon = #{coupon},</if>
+            <if test="netReceipts != null">net_receipts = #{netReceipts},</if>
+            <if test="salesNum != null">sales_num = #{salesNum},</if>
+            <if test="printNum != null">print_num = #{printNum},</if>
+            <if test="classStructureNo != null">class_structure_no = #{classStructureNo},</if>
+            <if test="classStructureDate != null">class_structure_date = #{classStructureDate},</if>
+            <if test="classStructureMan != null">class_structure_man = #{classStructureMan},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteStationClassStructureById" parameterType="Long">
+        delete from station_class_structure where id = #{id}
+    </delete>
+
+    <delete id="deleteStationClassStructureByIds" parameterType="String">
+        delete from station_class_structure where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationDeviceManageMapper">
+    
+    <resultMap type="StationDeviceManage" id="StationDeviceManageResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceNo"    column="device_no"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="deviceType"    column="device_type"    />
+        <result property="deviceSerialNum"    column="device_serial_num"    />
+        <result property="gunNo"    column="gun_no"    />
+        <result property="deviceStatus"    column="device_status"    />
+        <result property="deviceFactory"    column="device_factory"    />
+    </resultMap>
+
+    <sql id="selectStationDeviceManageVo">
+        select device_id, device_no, device_name, station_id, station_name, device_type, device_serial_num, gun_no, device_status, device_factory from station_device_manage
+    </sql>
+
+    <select id="selectStationDeviceManageList" parameterType="StationDeviceManage" resultMap="StationDeviceManageResult">
+        <include refid="selectStationDeviceManageVo"/>
+        <where>  
+            <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</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="deviceType != null  and deviceType != ''"> and device_type = #{deviceType}</if>
+            <if test="deviceSerialNum != null  and deviceSerialNum != ''"> and device_serial_num = #{deviceSerialNum}</if>
+            <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
+            <if test="deviceStatus != null  and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
+            <if test="deviceFactory != null  and deviceFactory != ''"> and device_factory = #{deviceFactory}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationDeviceManageById" parameterType="Long" resultMap="StationDeviceManageResult">
+        <include refid="selectStationDeviceManageVo"/>
+        where device_id = #{deviceId}
+    </select>
+        
+    <insert id="insertStationDeviceManage" parameterType="StationDeviceManage">
+        insert into station_device_manage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">device_id,</if>
+            <if test="deviceNo != null">device_no,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="deviceType != null">device_type,</if>
+            <if test="deviceSerialNum != null">device_serial_num,</if>
+            <if test="gunNo != null">gun_no,</if>
+            <if test="deviceStatus != null">device_status,</if>
+            <if test="deviceFactory != null">device_factory,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="deviceNo != null">#{deviceNo},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="deviceType != null">#{deviceType},</if>
+            <if test="deviceSerialNum != null">#{deviceSerialNum},</if>
+            <if test="gunNo != null">#{gunNo},</if>
+            <if test="deviceStatus != null">#{deviceStatus},</if>
+            <if test="deviceFactory != null">#{deviceFactory},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationDeviceManage" parameterType="StationDeviceManage">
+        update station_device_manage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceNo != null">device_no = #{deviceNo},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="deviceSerialNum != null">device_serial_num = #{deviceSerialNum},</if>
+            <if test="gunNo != null">gun_no = #{gunNo},</if>
+            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
+            <if test="deviceFactory != null">device_factory = #{deviceFactory},</if>
+        </trim>
+        where device_id = #{deviceId}
+    </update>
+
+    <delete id="deleteStationDeviceManageById" parameterType="Long">
+        delete from station_device_manage where device_id = #{deviceId}
+    </delete>
+
+    <delete id="deleteStationDeviceManageByIds" parameterType="String">
+        delete from station_device_manage where device_id in 
+        <foreach item="deviceId" collection="array" open="(" separator="," close=")">
+            #{deviceId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="StationInfo" id="StationInfoResult">
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
-        <result property="stationNo"    column="station_no"    />
         <result property="stationAddress"    column="station_address"    />
         <result property="oilGunNum"    column="oil_gun_num"    />
         <result property="contacts"    column="contacts"    />
@@ -17,17 +16,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stationPic"    column="station_pic"    />
         <result property="stationLongitude"    column="station_longitude"    />
         <result property="stationLatitude"    column="station_latitude"    />
+        <result property="mno"    column="mno"    />
     </resultMap>
 
     <sql id="selectStationInfoVo">
-        select station_id, station_name, station_no, station_address, oil_gun_num, contacts, phone, station_group_id, station_group_name, station_pic, station_longitude, station_latitude from station_info
+        select station_id, station_name, station_address, oil_gun_num, contacts, phone, station_group_id, station_group_name, station_pic, station_longitude, station_latitude, mno from station_info
     </sql>
 
     <select id="selectStationInfoList" parameterType="StationInfo" resultMap="StationInfoResult">
         <include refid="selectStationInfoVo"/>
         <where>  
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
-            <if test="stationNo != null  and stationNo != ''"> and station_no = #{stationNo}</if>
             <if test="stationAddress != null  and stationAddress != ''"> and station_address = #{stationAddress}</if>
             <if test="oilGunNum != null "> and oil_gun_num = #{oilGunNum}</if>
             <if test="contacts != null  and contacts != ''"> and contacts = #{contacts}</if>
@@ -37,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null  and stationPic != ''"> and station_pic = #{stationPic}</if>
             <if test="stationLongitude != null  and stationLongitude != ''"> and station_longitude = #{stationLongitude}</if>
             <if test="stationLatitude != null  and stationLatitude != ''"> and station_latitude = #{stationLatitude}</if>
+            <if test="mno != null "> and mno = #{mno}</if>
         </where>
     </select>
     
@@ -50,7 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stationId != null">station_id,</if>
             <if test="stationName != null">station_name,</if>
-            <if test="stationNo != null">station_no,</if>
             <if test="stationAddress != null">station_address,</if>
             <if test="oilGunNum != null">oil_gun_num,</if>
             <if test="contacts != null">contacts,</if>
@@ -60,11 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null">station_pic,</if>
             <if test="stationLongitude != null">station_longitude,</if>
             <if test="stationLatitude != null">station_latitude,</if>
+            <if test="mno != null">mno,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stationId != null">#{stationId},</if>
             <if test="stationName != null">#{stationName},</if>
-            <if test="stationNo != null">#{stationNo},</if>
             <if test="stationAddress != null">#{stationAddress},</if>
             <if test="oilGunNum != null">#{oilGunNum},</if>
             <if test="contacts != null">#{contacts},</if>
@@ -74,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null">#{stationPic},</if>
             <if test="stationLongitude != null">#{stationLongitude},</if>
             <if test="stationLatitude != null">#{stationLatitude},</if>
+            <if test="mno != null">#{mno},</if>
          </trim>
     </insert>
 
@@ -81,7 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update station_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="stationName != null">station_name = #{stationName},</if>
-            <if test="stationNo != null">station_no = #{stationNo},</if>
             <if test="stationAddress != null">station_address = #{stationAddress},</if>
             <if test="oilGunNum != null">oil_gun_num = #{oilGunNum},</if>
             <if test="contacts != null">contacts = #{contacts},</if>
@@ -91,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationPic != null">station_pic = #{stationPic},</if>
             <if test="stationLongitude != null">station_longitude = #{stationLongitude},</if>
             <if test="stationLatitude != null">station_latitude = #{stationLatitude},</if>
+            <if test="mno != null">mno = #{mno},</if>
         </trim>
         where station_id = #{stationId}
     </update>

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationNoticeMapper">
+    
+    <resultMap type="StationNotice" id="StationNoticeResult">
+        <result property="noticeId"    column="notice_id"    />
+        <result property="fullName"    column="full_name"    />
+        <result property="phone"    column="phone"    />
+        <result property="bindDate"    column="bind_date"    />
+        <result property="bindStatus"    column="bind_status"    />
+        <result property="wxFullName"    column="wx_full_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+    </resultMap>
+
+    <sql id="selectStationNoticeVo">
+        select notice_id, full_name, phone, bind_date, bind_status, wx_full_name, station_id, station_name from station_notice
+    </sql>
+
+    <select id="selectStationNoticeList" parameterType="StationNotice" resultMap="StationNoticeResult">
+        <include refid="selectStationNoticeVo"/>
+        <where>  
+            <if test="fullName != null  and fullName != ''"> and full_name like concat('%', #{fullName}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="bindDate != null "> and bind_date = #{bindDate}</if>
+            <if test="bindStatus != null  and bindStatus != ''"> and bind_status = #{bindStatus}</if>
+            <if test="wxFullName != null  and wxFullName != ''"> and wx_full_name like concat('%', #{wxFullName}, '%')</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectStationNoticeById" parameterType="Long" resultMap="StationNoticeResult">
+        <include refid="selectStationNoticeVo"/>
+        where notice_id = #{noticeId}
+    </select>
+        
+    <insert id="insertStationNotice" parameterType="StationNotice" useGeneratedKeys="true" keyProperty="noticeId">
+        insert into station_notice
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fullName != null">full_name,</if>
+            <if test="phone != null">phone,</if>
+            <if test="bindDate != null">bind_date,</if>
+            <if test="bindStatus != null">bind_status,</if>
+            <if test="wxFullName != null">wx_full_name,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fullName != null">#{fullName},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="bindDate != null">#{bindDate},</if>
+            <if test="bindStatus != null">#{bindStatus},</if>
+            <if test="wxFullName != null">#{wxFullName},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationNotice" parameterType="StationNotice">
+        update station_notice
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fullName != null">full_name = #{fullName},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="bindDate != null">bind_date = #{bindDate},</if>
+            <if test="bindStatus != null">bind_status = #{bindStatus},</if>
+            <if test="wxFullName != null">wx_full_name = #{wxFullName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+        </trim>
+        where notice_id = #{noticeId}
+    </update>
+
+    <delete id="deleteStationNoticeById" parameterType="Long">
+        delete from station_notice where notice_id = #{noticeId}
+    </delete>
+
+    <delete id="deleteStationNoticeByIds" parameterType="String">
+        delete from station_notice where notice_id in 
+        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
+            #{noticeId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationOilGunMapper">
+    
+    <resultMap type="StationOilGun" id="StationOilGunResult">
+        <result property="oilGunId"    column="oil_gun_id"    />
+        <result property="oilGunNo"    column="oil_gun_no"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="date"    column="date"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectStationOilGunVo">
+        select oil_gun_id, oil_gun_no, oil_name, station_id, station_name, date, status from station_oil_gun
+    </sql>
+
+    <select id="selectStationOilGunList" parameterType="StationOilGun" resultMap="StationOilGunResult">
+        <include refid="selectStationOilGunVo"/>
+        <where>  
+            <if test="oilGunNo != null  and oilGunNo != ''"> and oil_gun_no = #{oilGunNo}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</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="date != null "> and date = #{date}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationOilGunById" parameterType="Long" resultMap="StationOilGunResult">
+        <include refid="selectStationOilGunVo"/>
+        where oil_gun_id = #{oilGunId}
+    </select>
+        
+    <insert id="insertStationOilGun" parameterType="StationOilGun" useGeneratedKeys="true" keyProperty="oilGunId">
+        insert into station_oil_gun
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilGunNo != null">oil_gun_no,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="date != null">date,</if>
+            <if test="status != null">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilGunNo != null">#{oilGunNo},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="date != null">#{date},</if>
+            <if test="status != null">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationOilGun" parameterType="StationOilGun">
+        update station_oil_gun
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilGunNo != null">oil_gun_no = #{oilGunNo},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="date != null">date = #{date},</if>
+            <if test="status != null">status = #{status},</if>
+        </trim>
+        where oil_gun_id = #{oilGunId}
+    </update>
+
+    <delete id="deleteStationOilGunById" parameterType="Long">
+        delete from station_oil_gun where oil_gun_id = #{oilGunId}
+    </delete>
+
+    <delete id="deleteStationOilGunByIds" parameterType="String">
+        delete from station_oil_gun where oil_gun_id in 
+        <foreach item="oilGunId" collection="array" open="(" separator="," close=")">
+            #{oilGunId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationOilPriceAdjustMapper">
+    
+    <resultMap type="StationOilPriceAdjust" id="StationOilPriceAdjustResult">
+        <result property="adjustPriceId"    column="adjust_price_id"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="oilAdjustPrice"    column="oil_adjust_price"    />
+        <result property="takeEffectStatus"    column="take_effect_status"    />
+        <result property="takeEffectDate"    column="take_effect_date"    />
+        <result property="adjustDate"    column="adjust_date"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="operator"    column="operator"    />
+    </resultMap>
+
+    <sql id="selectStationOilPriceAdjustVo">
+        select adjust_price_id, oil_name, oil_adjust_price, take_effect_status, take_effect_date, adjust_date, station_id, station_name, operator from station_oil_price_adjust
+    </sql>
+
+    <select id="selectStationOilPriceAdjustList" parameterType="StationOilPriceAdjust" resultMap="StationOilPriceAdjustResult">
+        <include refid="selectStationOilPriceAdjustVo"/>
+        <where>  
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilAdjustPrice != null  and oilAdjustPrice != ''"> and oil_adjust_price = #{oilAdjustPrice}</if>
+            <if test="takeEffectStatus != null  and takeEffectStatus != ''"> and take_effect_status = #{takeEffectStatus}</if>
+            <if test="takeEffectDate != null "> and take_effect_date = #{takeEffectDate}</if>
+            <if test="adjustDate != null "> and adjust_date = #{adjustDate}</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="operator != null  and operator != ''"> and operator = #{operator}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationOilPriceAdjustById" parameterType="Long" resultMap="StationOilPriceAdjustResult">
+        <include refid="selectStationOilPriceAdjustVo"/>
+        where adjust_price_id = #{adjustPriceId}
+    </select>
+        
+    <insert id="insertStationOilPriceAdjust" parameterType="StationOilPriceAdjust" useGeneratedKeys="true" keyProperty="adjustPriceId">
+        insert into station_oil_price_adjust
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">oil_name,</if>
+            <if test="oilAdjustPrice != null">oil_adjust_price,</if>
+            <if test="takeEffectStatus != null">take_effect_status,</if>
+            <if test="takeEffectDate != null">take_effect_date,</if>
+            <if test="adjustDate != null">adjust_date,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="operator != null">operator,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">#{oilName},</if>
+            <if test="oilAdjustPrice != null">#{oilAdjustPrice},</if>
+            <if test="takeEffectStatus != null">#{takeEffectStatus},</if>
+            <if test="takeEffectDate != null">#{takeEffectDate},</if>
+            <if test="adjustDate != null">#{adjustDate},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="operator != null">#{operator},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationOilPriceAdjust" parameterType="StationOilPriceAdjust">
+        update station_oil_price_adjust
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="oilAdjustPrice != null">oil_adjust_price = #{oilAdjustPrice},</if>
+            <if test="takeEffectStatus != null">take_effect_status = #{takeEffectStatus},</if>
+            <if test="takeEffectDate != null">take_effect_date = #{takeEffectDate},</if>
+            <if test="adjustDate != null">adjust_date = #{adjustDate},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="operator != null">operator = #{operator},</if>
+        </trim>
+        where adjust_price_id = #{adjustPriceId}
+    </update>
+
+    <delete id="deleteStationOilPriceAdjustById" parameterType="Long">
+        delete from station_oil_price_adjust where adjust_price_id = #{adjustPriceId}
+    </delete>
+
+    <delete id="deleteStationOilPriceAdjustByIds" parameterType="String">
+        delete from station_oil_price_adjust where adjust_price_id in 
+        <foreach item="adjustPriceId" collection="array" open="(" separator="," close=")">
+            #{adjustPriceId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationOilPriceMapper">
+    
+    <resultMap type="StationOilPrice" id="StationOilPriceResult">
+        <result property="oilPriceId"    column="oil_price_id"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="oilPrice"    column="oil_price"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationNanme"    column="station_nanme"    />
+        <result property="date"    column="date"    />
+    </resultMap>
+
+    <sql id="selectStationOilPriceVo">
+        select oil_price_id, oil_name, oil_price, station_id, station_nanme, date from station_oil_price
+    </sql>
+
+    <select id="selectStationOilPriceList" parameterType="StationOilPrice" resultMap="StationOilPriceResult">
+        <include refid="selectStationOilPriceVo"/>
+        <where>  
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPrice != null  and oilPrice != ''"> and oil_price = #{oilPrice}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationNanme != null  and stationNanme != ''"> and station_nanme = #{stationNanme}</if>
+            <if test="date != null "> and date = #{date}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationOilPriceById" parameterType="Long" resultMap="StationOilPriceResult">
+        <include refid="selectStationOilPriceVo"/>
+        where oil_price_id = #{oilPriceId}
+    </select>
+        
+    <insert id="insertStationOilPrice" parameterType="StationOilPrice" useGeneratedKeys="true" keyProperty="oilPriceId">
+        insert into station_oil_price
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">oil_name,</if>
+            <if test="oilPrice != null">oil_price,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationNanme != null">station_nanme,</if>
+            <if test="date != null">date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilName != null">#{oilName},</if>
+            <if test="oilPrice != null">#{oilPrice},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationNanme != null">#{stationNanme},</if>
+            <if test="date != null">#{date},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationOilPrice" parameterType="StationOilPrice">
+        update station_oil_price
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="oilPrice != null">oil_price = #{oilPrice},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationNanme != null">station_nanme = #{stationNanme},</if>
+            <if test="date != null">date = #{date},</if>
+        </trim>
+        where oil_price_id = #{oilPriceId}
+    </update>
+
+    <delete id="deleteStationOilPriceById" parameterType="Long">
+        delete from station_oil_price where oil_price_id = #{oilPriceId}
+    </delete>
+
+    <delete id="deleteStationOilPriceByIds" parameterType="String">
+        delete from station_oil_price where oil_price_id in 
+        <foreach item="oilPriceId" collection="array" open="(" separator="," close=")">
+            #{oilPriceId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+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"    />
+    </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
+    </sql>
+
+    <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
+        <include refid="selectStationPayVo"/>
+        <where>  
+            <if test="payMode != null  and payMode != ''"> and pay_mode = #{payMode}</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="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>
+        </where>
+    </select>
+    
+    <select id="selectStationPayById" parameterType="Long" resultMap="StationPayResult">
+        <include refid="selectStationPayVo"/>
+        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>
+         </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>
+         </trim>
+    </insert>
+
+    <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>
+        </trim>
+        where pay_id = #{payId}
+    </update>
+
+    <delete id="deleteStationPayById" parameterType="Long">
+        delete from station_pay where pay_id = #{payId}
+    </delete>
+
+    <delete id="deleteStationPayByIds" parameterType="String">
+        delete from station_pay where pay_id in 
+        <foreach item="payId" collection="array" open="(" separator="," close=")">
+            #{payId}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yijia.station.mapper.StationPersonnelMapper">
+    
+    <resultMap type="StationPersonnel" id="StationPersonnelResult">
+        <result property="personnelId"    column="personnel_id"    />
+        <result property="personnelName"    column="personnel_name"    />
+        <result property="gunNo"    column="gun_no"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="qrCode"    column="qr_code"    />
+        <result property="personnelPhone"    column="personnel_phone"    />
+    </resultMap>
+
+    <sql id="selectStationPersonnelVo">
+        select personnel_id, personnel_name, gun_no, station_id, station_name, qr_code, personnel_phone from station_personnel
+    </sql>
+
+    <select id="selectStationPersonnelList" parameterType="StationPersonnel" resultMap="StationPersonnelResult">
+        <include refid="selectStationPersonnelVo"/>
+        <where>  
+            <if test="personnelName != null  and personnelName != ''"> and personnel_name like concat('%', #{personnelName}, '%')</if>
+            <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</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="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="personnelPhone != null  and personnelPhone != ''"> and personnel_phone = #{personnelPhone}</if>
+        </where>
+    </select>
+    
+    <select id="selectStationPersonnelById" parameterType="Long" resultMap="StationPersonnelResult">
+        <include refid="selectStationPersonnelVo"/>
+        where personnel_id = #{personnelId}
+    </select>
+        
+    <insert id="insertStationPersonnel" parameterType="StationPersonnel">
+        insert into station_personnel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="personnelId != null">personnel_id,</if>
+            <if test="personnelName != null">personnel_name,</if>
+            <if test="gunNo != null">gun_no,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="personnelPhone != null">personnel_phone,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="personnelId != null">#{personnelId},</if>
+            <if test="personnelName != null">#{personnelName},</if>
+            <if test="gunNo != null">#{gunNo},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="personnelPhone != null">#{personnelPhone},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationPersonnel" parameterType="StationPersonnel">
+        update station_personnel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="personnelName != null">personnel_name = #{personnelName},</if>
+            <if test="gunNo != null">gun_no = #{gunNo},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="personnelPhone != null">personnel_phone = #{personnelPhone},</if>
+        </trim>
+        where personnel_id = #{personnelId}
+    </update>
+
+    <delete id="deleteStationPersonnelById" parameterType="Long">
+        delete from station_personnel where personnel_id = #{personnelId}
+    </delete>
+
+    <delete id="deleteStationPersonnelByIds" parameterType="String">
+        delete from station_personnel where personnel_id in 
+        <foreach item="personnelId" collection="array" open="(" separator="," close=")">
+            #{personnelId}
+        </foreach>
+    </delete>
+    
+</mapper>