优化与前端连接接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/hotel/SellbillsController.java

@@ -35,7 +35,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2021-02-23
  */
 @RestController
-@RequestMapping("/hotel/sellbills")
+@RequestMapping("/svip/sellbills")
 public class SellbillsController extends BaseController {
     @Autowired
     private ISellbillsService sellbillsService;
@@ -43,9 +43,10 @@ public class SellbillsController extends BaseController {
     /**
      * 查询消费记录列表
      */
-    @GetMapping("/page")
+    @RequestMapping("/page")
     public TableDataInfo list(Sellbills sellbills) {
         startPage();
+        System.out.println(sellbills.toString());
         List<Map<String, Object>> list = sellbillsService.selectSellMapList(sellbills);
         return getDataTable(list);
     }
@@ -53,7 +54,7 @@ public class SellbillsController extends BaseController {
     /**
      * 卡作废
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipItems:edit')")
+    @PreAuthorize("@ss.hasPermi('svip:svipItems:edit')")
     @RequestMapping("/svipCardInvalid")
     @RepeatSubmit
     public AjaxResult svipCardInvalid(@RequestBody SvipIccards svipIccardsDto) {
@@ -64,7 +65,7 @@ public class SellbillsController extends BaseController {
     /**
      * 换卡
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipItems:edit')")
+    @PreAuthorize("@ss.hasPermi('svip:svipItems:edit')")
     @RequestMapping("/svipChange")
     @RepeatSubmit
     public AjaxResult svipChange(@RequestBody SvipIccards svipIccardsDto) {
@@ -75,7 +76,7 @@ public class SellbillsController extends BaseController {
     /**
      * 导出消费记录列表
      */
-    @PreAuthorize("@ss.hasPermi('hotel:sellbills:export')")
+    @PreAuthorize("@ss.hasPermi('svip:sellbills:export')")
     @Log(title = "消费记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     @RepeatSubmit
@@ -88,7 +89,7 @@ public class SellbillsController extends BaseController {
     /**
      * 获取消费记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('hotel:sellbills:query')")
+    @PreAuthorize("@ss.hasPermi('svip:sellbills:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(sellbillsService.selectSellbillsById(id));
@@ -97,9 +98,9 @@ public class SellbillsController extends BaseController {
     /**
      * 新增消费记录
      */
-    @PreAuthorize("@ss.hasPermi('hotel:sellbills:add')")
+    @PreAuthorize("@ss.hasPermi('svip:sellbills:add')")
     @Log(title = "消费记录", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/add")
     @RepeatSubmit
     public AjaxResult add(@RequestBody Sellbills sellbills) {
         return toAjax(sellbillsService.insertSellbills(sellbills));
@@ -108,9 +109,9 @@ public class SellbillsController extends BaseController {
     /**
      * 修改消费记录
      */
-    @PreAuthorize("@ss.hasPermi('hotel:sellbills:edit')")
+    @PreAuthorize("@ss.hasPermi('svip:sellbills:edit')")
     @Log(title = "消费记录", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping(value = "/update")
     @RepeatSubmit
     public AjaxResult edit(@RequestBody Sellbills sellbills) {
         return toAjax(sellbillsService.updateSellbills(sellbills));
@@ -119,7 +120,7 @@ public class SellbillsController extends BaseController {
     /**
      * 删除消费记录
      */
-    @PreAuthorize("@ss.hasPermi('hotel:sellbills:remove')")
+    @PreAuthorize("@ss.hasPermi('svip:sellbills:remove')")
     @Log(title = "消费记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/hotel/SvipIccardsController.java

@@ -40,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2021-02-23
  */
 @RestController
-@RequestMapping("/hotel/svipIccards")
+@RequestMapping("/svip/svipIccards")
 public class SvipIccardsController extends BaseController {
     @Autowired
     private ISvipIccardsService svipIccardsService;
@@ -114,7 +114,7 @@ public class SvipIccardsController extends BaseController {
     /**
      * 导出会员卡信息列表
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipIccards:export')")
+    @PreAuthorize("@ss.hasPermi('svip:svipIccards:export')")
     @Log(title = "会员卡信息", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     @RepeatSubmit
@@ -127,7 +127,7 @@ public class SvipIccardsController extends BaseController {
     /**
      * 获取会员卡信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipIccards:query')")
+    @PreAuthorize("@ss.hasPermi('svip:svipIccards:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(svipIccardsService.selectSvipIccardsById(id));
@@ -136,9 +136,9 @@ public class SvipIccardsController extends BaseController {
     /**
      * 新增会员卡信息
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipIccards:add')")
+    @PreAuthorize("@ss.hasPermi('svip:svipIccards:add')")
     @Log(title = "会员卡信息", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/add")
     @RepeatSubmit
     public AjaxResult add(@RequestBody SvipIccards svipIccards) {
         if (StringUtils.isNull(svipIccards.getCardId())) {
@@ -165,9 +165,9 @@ public class SvipIccardsController extends BaseController {
     /**
      * 修改会员卡信息
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipIccards:edit')")
+    @PreAuthorize("@ss.hasPermi('svip:svipIccards:edit')")
     @Log(title = "会员卡信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping(value = "/update")
     @RepeatSubmit
     public AjaxResult edit(@RequestBody SvipIccards svipIccards) {
         return toAjax(svipIccardsService.updateSvipIccards(svipIccards));
@@ -176,7 +176,7 @@ public class SvipIccardsController extends BaseController {
     /**
      * 删除会员卡信息
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipIccards:remove')")
+    @PreAuthorize("@ss.hasPermi('svip:svipIccards:remove')")
     @Log(title = "会员卡信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/hotel/SvipItemsController.java

@@ -31,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2021-02-23
  */
 @RestController
-@RequestMapping("/hotel/svipItems")
+@RequestMapping("/svip/svipItems")
 public class SvipItemsController extends BaseController {
     @Autowired
     private ISvipItemsService svipItemsService;
@@ -45,14 +45,14 @@ public class SvipItemsController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(SvipItems svipItems) {
         startPage();
-        List<Map<String, Object>> list = svipItemsService.selectSvipItemsMapList(svipItems);
+        List<SvipItems> list = svipItemsService.selectSvipItemsMapList(svipItems);
         return getDataTable(list);
     }
 
     /**
      * 导出会员卡类型列表
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipItems:export')")
+    @PreAuthorize("@ss.hasPermi('svip:svipItems:export')")
     @Log(title = "会员卡类型", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(SvipItems svipItems) {
@@ -64,7 +64,7 @@ public class SvipItemsController extends BaseController {
     /**
      * 获取会员卡类型详细信息
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipItems:query')")
+    @PreAuthorize("@ss.hasPermi('svip:svipItems:query')")
     @GetMapping(value = "/{itemId}")
     public AjaxResult getInfo(@PathVariable("itemId") Long itemId) {
         return AjaxResult.success(svipItemsService.selectSvipItemsById(itemId));
@@ -73,9 +73,9 @@ public class SvipItemsController extends BaseController {
     /**
      * 新增会员卡类型
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipItems:add')")
+//    @PreAuthorize("@ss.hasPermi('svip:svipItems:add')")
     @Log(title = "会员卡类型", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody SvipItems svipItems) {
         return toAjax(svipItemsService.insertSvipItems(svipItems));
     }
@@ -83,9 +83,9 @@ public class SvipItemsController extends BaseController {
     /**
      * 修改会员卡类型
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipItems:edit')")
+    @PreAuthorize("@ss.hasPermi('svip:svipItems:edit')")
     @Log(title = "会员卡类型", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping(value = "/update")
     public AjaxResult edit(@RequestBody SvipItems svipItems) {
         return toAjax(svipItemsService.updateSvipItems(svipItems));
     }
@@ -93,7 +93,7 @@ public class SvipItemsController extends BaseController {
     /**
      * 删除会员卡类型
      */
-    @PreAuthorize("@ss.hasPermi('hotel:svipItems:remove')")
+    @PreAuthorize("@ss.hasPermi('svip:svipItems:remove')")
     @Log(title = "会员卡类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{itemIds}")
     public AjaxResult remove(@PathVariable Long[] itemIds) {

ruoyi-hotel/src/main/java/com/ruoyi/hotel/service/ISvipItemsService.java

@@ -60,5 +60,5 @@ public interface ISvipItemsService {
      */
     public int deleteSvipItemsById(Long itemId);
 
-    List<Map<String, Object>> selectSvipItemsMapList(SvipItems svipItems);
+    List<SvipItems> selectSvipItemsMapList(SvipItems svipItems);
 }

ruoyi-hotel/src/main/java/com/ruoyi/hotel/service/impl/SellbillsServiceImpl.java

@@ -158,7 +158,7 @@ public class SellbillsServiceImpl implements ISellbillsService {
         sellbills.setApplyDate(new Date());
         sellbills.setAuditDate(new Date());
         sellbills.setPostDate(new Date());
-        sellbills.setUserBane(iccards.getInitOpname());
+        sellbills.setUserBane(userDto.getUserName());
         sellbills.setActId(410L);
         sellbills.setBillStatus(6L);
         sellbills.setDeptId(sysDept.getDeptId());
@@ -247,7 +247,7 @@ public class SellbillsServiceImpl implements ISellbillsService {
         sellbills.setApplyDate(new Date());
         sellbills.setAuditDate(new Date());
         sellbills.setPostDate(new Date());
-        sellbills.setUserBane(iccards.getInitOpname());
+        sellbills.setUserBane(userDto.getUserName());
         sellbills.setActId(210L);
         sellbills.setBillStatus(6L);
         sellbills.setDeptId(sysDept.getDeptId());

ruoyi-hotel/src/main/java/com/ruoyi/hotel/service/impl/SvipIccardsServiceImpl.java

@@ -3,9 +3,11 @@ package com.ruoyi.hotel.service.impl;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.hotel.domain.Sellbills;
@@ -50,6 +52,9 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
     @Autowired
     private SysDeptMapper sysDeptMapper;
 
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询会员卡信息
      *
@@ -84,11 +89,17 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
     public AjaxResult insertSvipIccards(SvipIccards svipIccards, SysUser user) {
         SvipIccards iccard = new SvipIccards();
         iccard.setCardNo(svipIccards.getCardNo());
-        List<SvipIccards> iccards = svipIccardsMapper.selectSvipIccardsList(iccard);
-        if (iccards.size() <= 0) {
-            return AjaxResult.error("会员卡已被初始化");
+        if (svipIccardsMapper.selectSvipIccardsList(iccard).size() > 0) {
+            return AjaxResult.error("会员卡号已被使用");
+        }
+        SvipIccards iccardId = new SvipIccards();
+        iccardId.setCardId(svipIccards.getCardId());
+        if (svipIccardsMapper.selectSvipIccardsList(iccardId).size() > 0) {
+            return AjaxResult.error("会员卡芯片号已被使用");
         }
-        svipIccards.setVipBlc(svipIccards.getVipDr());
+        SvipItems svipItems = svipItemsMapper.selectSvipItemsById(svipIccards.getItemId());
+        svipIccards.setVipDr(svipItems.getAmount());
+        svipIccards.setVipBlc(svipItems.getAmount());
         svipIccards.setStatus("N");
         svipIccards.setGrantId(user.getUserId());
         svipIccards.setInitDate(new Date());
@@ -142,10 +153,12 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
     public AjaxResult selectionPeriod(SysConfig sysConfigDto) {
         SysConfig config = new SysConfig();
         config.setConfigKey("alert_time");
-        SysConfig sysConfig = sysConfigMapper.selectConfig(sysConfigDto);
-        if (StringUtils.isNull(sysConfig)) {
+        List<SysConfig> sysConfigs = sysConfigMapper.selectConfigList(config);
+        if (Objects.equals(sysConfigs.size(), 0)) {
             return AjaxResult.error("未找到会员卡警戒设置实际参数");
         }
+        redisCache.setCacheObject(getCacheKey("alert_time"), sysConfigDto.getConfigValue());
+        SysConfig sysConfig = sysConfigs.get(0);
         sysConfig.setConfigValue(sysConfigDto.getConfigValue());
         int configUpdate = sysConfigMapper.updateConfig(sysConfig);
         if (configUpdate <= 0) {
@@ -155,6 +168,17 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
     }
 
     /**
+     * 设置cache key
+     *
+     * @param configKey 参数键
+     * @return 缓存键key
+     */
+    private String getCacheKey(String configKey)
+    {
+        return Constants.SYS_CONFIG_KEY + configKey;
+    }
+
+    /**
      * 发卡
      */
     @Override
@@ -171,6 +195,7 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
             return AjaxResult.error("操作失败，该会员卡已被停用");
         }
         svipIccardsDto.setStatus("A");
+        svipIccardsDto.setGrantDate(new Date());
         svipIccardsDto.setGrantOpname(userDto.getUserName());
         svipIccardsDto.setVipBlc(svipIccardsDto.getVipDr());
         SysUser user = new SysUser();
@@ -190,7 +215,7 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
         sellbills.setApplyDate(new Date());
         sellbills.setAuditDate(new Date());
         sellbills.setPostDate(new Date());
-        sellbills.setUserBane(svipIccardsDto.getInitOpname());
+        sellbills.setUserBane(userDto.getUserName());
         sellbills.setActId(101L);
         sellbills.setBillStatus(6L);
         sellbills.setDeptId(sysDept.getDeptId());
@@ -226,9 +251,6 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
         if (StringUtils.isNull(iccards)) {
             return AjaxResult.error("未找到会员卡信息");
         }
-        if ("A".equals(iccards.getStatus())) {
-            return AjaxResult.error("操作失败，该会员卡已被激活");
-        }
         if ("S".equals(iccards.getStatus())) {
             return AjaxResult.error("操作失败，该会员卡已被停用");
         }
@@ -249,7 +271,7 @@ public class SvipIccardsServiceImpl implements ISvipIccardsService {
         sellbills.setApplyDate(new Date());
         sellbills.setAuditDate(new Date());
         sellbills.setPostDate(new Date());
-        sellbills.setUserBane(iccards.getInitOpname());
+        sellbills.setUserBane(user.getUserName());
         sellbills.setActId(310L);
         sellbills.setBillStatus(6L);
         sellbills.setDeptId(sysDept.getDeptId());

ruoyi-hotel/src/main/java/com/ruoyi/hotel/service/impl/SvipItemsServiceImpl.java

@@ -87,10 +87,7 @@ public class SvipItemsServiceImpl implements ISvipItemsService {
     }
 
     @Override
-    public List<Map<String, Object>> selectSvipItemsMapList(SvipItems svipItems) {
-
-
-
-        return null;
+    public List<SvipItems> selectSvipItemsMapList(SvipItems svipItems) {
+        return svipItemsMapper.selectSvipItemsList(svipItems);
     }
 }

ruoyi-hotel/src/main/resources/mapper/SellbillsMapper.xml

@@ -144,10 +144,10 @@
             <if test="printTime != null ">and s.print_time = #{printTime}</if>
             <if test="printsn != null ">and s.printsn = #{printsn}</if>
             <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
-                and s.f_bsdate &gt;= #{timeInterval[0]}
+                and s.bill_date &gt;= #{timeInterval[0]}
             </if>
             <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
-                and s.f_bsdate &lt;= #{timeInterval[1]}
+                and s.bill_date &lt;= #{timeInterval[1]}
             </if>
             <if test="printOpname != null  and printOpname != ''">and s.print_opname like concat('%', #{printOpname},'%')</if>
             <if test="cardId != null ">and s.card_id = #{cardId}</if>

ruoyi-hotel/src/main/resources/mapper/SvipIccardsMapper.xml

@@ -40,6 +40,7 @@
     <select id="selectSvipIccardsList" parameterType="SvipIccards" resultMap="SvipIccardsResult">
         <include refid="selectSvipIccardsVo"/>
         <where>
+            <if test="cardId != null  and cardId != 0">and card_id = #{cardId}</if>
             <if test="cardNo != null  and cardNo != ''">and card_no = #{cardNo}</if>
             <if test="itemId != null ">and item_id = #{itemId}</if>
             <if test="itemType != null  and itemType != ''">and item_type = #{itemType}</if>