会员等级模块

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketMemberController.java

@@ -9,8 +9,15 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.dynamic.db.DataSourceCachePool;
 import org.jeecg.common.util.oConvertUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,8 +25,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.business.entity.BusHotel;
 import org.jeecg.modules.business.entity.BusMarketMember;
+import org.jeecg.modules.business.service.IBusHotelService;
 import org.jeecg.modules.business.service.IBusMarketMemberService;
+import org.jeecg.modules.system.entity.SysDataSource;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -40,17 +50,19 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  /**
  * @Description: bus_market_member_info
  * @Author: jeecg-boot
- * @Date:   2023-02-28
+ * @Date:   2023-03-02
  * @Version: V1.0
  */
 @Api(tags="bus_market_member_info")
 @RestController
-@RequestMapping("/business/busMarketMember")
+@RequestMapping("/org.jeecg.modules.business/busMarketMember")
 @Slf4j
 public class BusMarketMemberController extends JeecgController<BusMarketMember, IBusMarketMemberService> {
 	@Autowired
 	private IBusMarketMemberService busMarketMemberService;
-
+	 @Autowired
+private IBusHotelService busHotelService;
+	
 	/**
 	 * 分页列表查询
 	 *
@@ -70,9 +82,17 @@ public class BusMarketMemberController extends JeecgController<BusMarketMember,
 		QueryWrapper<BusMarketMember> queryWrapper = QueryGenerator.initQueryWrapper(busMarketMember, req.getParameterMap());
 		Page<BusMarketMember> page = new Page<BusMarketMember>(pageNo, pageSize);
 		IPage<BusMarketMember> pageList = busMarketMemberService.page(page, queryWrapper);
+		if(pageList.getSize()>0) {
+			pageList.getRecords().forEach(item -> {
+				BusHotel hotle = busHotelService.getById(item.getHotelId());
+				if (hotle != null) {
+					item.setHotelName(hotle.getName());
+				}
+			});
+		}
 		return Result.OK(pageList);
 	}
-
+	
 	/**
 	 *   添加
 	 *
@@ -81,13 +101,20 @@ public class BusMarketMemberController extends JeecgController<BusMarketMember,
 	 */
 	@AutoLog(value = "bus_market_member_info-添加")
 	@ApiOperation(value="bus_market_member_info-添加", notes="bus_market_member_info-添加")
-	//@RequiresPermissions("business:bus_market_member_info:add")
+	//@RequiresPermissions("org.jeecg.modules.business:bus_market_member_info:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BusMarketMember busMarketMember) {
+
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMarketMember.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
 		busMarketMemberService.save(busMarketMember);
 		return Result.OK("添加成功！");
 	}
-
+	
 	/**
 	 *  编辑
 	 *
@@ -96,13 +123,13 @@ public class BusMarketMemberController extends JeecgController<BusMarketMember,
 	 */
 	@AutoLog(value = "bus_market_member_info-编辑")
 	@ApiOperation(value="bus_market_member_info-编辑", notes="bus_market_member_info-编辑")
-	//@RequiresPermissions("business:bus_market_member_info:edit")
+	//@RequiresPermissions("org.jeecg.modules.business:bus_market_member_info:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody BusMarketMember busMarketMember) {
 		busMarketMemberService.updateById(busMarketMember);
 		return Result.OK("编辑成功!");
 	}
-
+	
 	/**
 	 *   通过id删除
 	 *
@@ -111,13 +138,13 @@ public class BusMarketMemberController extends JeecgController<BusMarketMember,
 	 */
 	@AutoLog(value = "bus_market_member_info-通过id删除")
 	@ApiOperation(value="bus_market_member_info-通过id删除", notes="bus_market_member_info-通过id删除")
-	//@RequiresPermissions("business:bus_market_member_info:delete")
+	//@RequiresPermissions("org.jeecg.modules.business:bus_market_member_info:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		busMarketMemberService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-
+	
 	/**
 	 *  批量删除
 	 *
@@ -126,13 +153,13 @@ public class BusMarketMemberController extends JeecgController<BusMarketMember,
 	 */
 	@AutoLog(value = "bus_market_member_info-批量删除")
 	@ApiOperation(value="bus_market_member_info-批量删除", notes="bus_market_member_info-批量删除")
-	//@RequiresPermissions("business:bus_market_member_info:deleteBatch")
+	//@RequiresPermissions("org.jeecg.modules.business:bus_market_member_info:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.busMarketMemberService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-
+	
 	/**
 	 * 通过id查询
 	 *
@@ -156,7 +183,7 @@ public class BusMarketMemberController extends JeecgController<BusMarketMember,
     * @param request
     * @param busMarketMember
     */
-    //@RequiresPermissions("business:bus_market_member_info:exportXls")
+    //@RequiresPermissions("org.jeecg.modules.business:bus_market_member_info:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, BusMarketMember busMarketMember) {
         return super.exportXls(request, busMarketMember, BusMarketMember.class, "bus_market_member_info");
@@ -169,7 +196,7 @@ public class BusMarketMemberController extends JeecgController<BusMarketMember,
     * @param response
     * @return
     */
-    //@RequiresPermissions("business:bus_market_member_info:importExcel")
+    //@RequiresPermissions("org.jeecg.modules.business:bus_market_member_info:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, BusMarketMember.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketMember.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -21,7 +19,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: bus_market_member_info
  * @Author: jeecg-boot
- * @Date:   2023-02-28
+ * @Date:   2023-03-02
  * @Version: V1.0
  */
 @Data
@@ -87,79 +85,97 @@ public class BusMarketMember implements Serializable {
 	/**充值是否自动续期*/
 	@Excel(name = "充值是否自动续期", width = 15)
     @ApiModelProperty(value = "充值是否自动续期")
-    private String renewal;
+    private Boolean renewal;
 	/**自动续期天数*/
 	@Excel(name = "自动续期天数", width = 15)
     @ApiModelProperty(value = "自动续期天数")
     private BigDecimal renewalDay;
-	/**积分类型
-	1-客房积分模式；
-	2-按储值卡支付积分；
-	3-按入住天数积分；
-	4-启用储值赠送；
-	5-积分满足自动升级；
-	6-升级扣除相应积分；*/
-	@Excel(name = "积分类型 1-客房积分模式；2-按储值卡支付积分； 3-按入住天数积分； 4-启用储值赠送； 5-积分满足自动升级； -升级扣除相应积分；", width = 15)
-    @ApiModelProperty(value = "积分类型 1-客房积分模式； 2-按储值卡支付积分； 3-按入住天数积分； 4-启用储值赠送； 5-积分满足自动升级； 6-升级扣除相应积分；")
-    private java.lang.String integralTypes;
+	/**是否客房积分模式*/
+	@Excel(name = "是否客房积分模式", width = 15)
+    @ApiModelProperty(value = "是否客房积分模式")
+    private Boolean tenantPointsChecked;
 	/**客房积分模式（1-所有的消费转成积分；2-只房费转积分；）*/
 	@Excel(name = "客房积分模式（1-所有的消费转成积分；2-只房费转积分；）", width = 15)
     @ApiModelProperty(value = "客房积分模式（1-所有的消费转成积分；2-只房费转积分；）")
-    private java.lang.String tenantPoints;
+    private Integer tenantPoints;
 	/**客房消费金额*/
 	@Excel(name = "客房消费金额", width = 15)
     @ApiModelProperty(value = "客房消费金额")
-    private java.math.BigDecimal tenantRoomIntegral;
+    private BigDecimal tenantRoomIntegral;
 	/**客房消费可增加积分*/
 	@Excel(name = "客房消费可增加积分", width = 15)
     @ApiModelProperty(value = "客房消费可增加积分")
-    private java.math.BigDecimal addTenantRoomIntegral;
+    private BigDecimal addTenantRoomIntegral;
+	/**是否按储值卡支付积分*/
+	@Excel(name = "是否按储值卡支付积分", width = 15)
+    @ApiModelProperty(value = "是否按储值卡支付积分")
+    private Boolean roomIntegralChecked;
 	/**储值卡消费金额*/
 	@Excel(name = "储值卡消费金额", width = 15)
     @ApiModelProperty(value = "储值卡消费金额")
-    private java.math.BigDecimal roomIntegral;
+    private BigDecimal roomIntegral;
 	/**储值卡消费可增加积分*/
 	@Excel(name = "储值卡消费可增加积分", width = 15)
     @ApiModelProperty(value = "储值卡消费可增加积分")
-    private java.math.BigDecimal addRoomIntegral;
+    private BigDecimal addRoomIntegral;
+	/**是否按入住天数积分*/
+	@Excel(name = "是否按入住天数积分", width = 15)
+    @ApiModelProperty(value = "是否按入住天数积分")
+    private Boolean dayIntegralChecked;
 	/**入住天数*/
 	@Excel(name = "入住天数", width = 15)
     @ApiModelProperty(value = "入住天数")
-    private java.math.BigDecimal dayIntegral;
+    private BigDecimal dayIntegral;
 	/**入住可增加积分*/
 	@Excel(name = "入住可增加积分", width = 15)
     @ApiModelProperty(value = "入住可增加积分")
-    private java.math.BigDecimal addDayIntegral;
+    private BigDecimal addDayIntegral;
+	/**是否按启用储值赠送*/
+	@Excel(name = "是否按启用储值赠送", width = 15)
+    @ApiModelProperty(value = "是否按启用储值赠送")
+    private Boolean rechargeChecked;
 	/**充值金额*/
 	@Excel(name = "充值金额", width = 15)
     @ApiModelProperty(value = "充值金额")
-    private java.math.BigDecimal rechargeIntegral;
+    private BigDecimal rechargeIntegral;
 	/**充值可增加积分*/
 	@Excel(name = "充值可增加积分", width = 15)
     @ApiModelProperty(value = "充值可增加积分")
-    private java.math.BigDecimal addRechargeIntegral;
+    private BigDecimal addRechargeIntegral;
+	/**是否积分满足*/
+	@Excel(name = "是否积分满足", width = 15)
+    @ApiModelProperty(value = "是否积分满足")
+    private Boolean upLevelChecked;
 	/**自动升级所需积分*/
 	@Excel(name = "自动升级所需积分", width = 15)
     @ApiModelProperty(value = "自动升级所需积分")
-    private java.math.BigDecimal upLevelIntegral;
+    private BigDecimal upLevelIntegral;
 	/**自动升级等级*/
 	@Excel(name = "自动升级等级", width = 15)
     @ApiModelProperty(value = "自动升级等级")
-    private java.lang.Integer upLevel;
-	/**升级后剩余积分*/
-	@Excel(name = "升级后剩余积分", width = 15)
-    @ApiModelProperty(value = "升级后剩余积分")
-    private java.math.BigDecimal subLevelIntegral;
+    private Integer upLevel;
+	/**升级扣除积分*/
+	@Excel(name = "升级扣除积分", width = 15)
+    @ApiModelProperty(value = "升级扣除积分")
+    private BigDecimal subLevelIntegral;
+	/**是否升级扣除相应积分*/
+	@Excel(name = "是否升级扣除相应积分", width = 15)
+    @ApiModelProperty(value = "是否升级扣除相应积分")
+    private Boolean subLevelChecked;
 	/**会员图标*/
 	@Excel(name = "会员图标", width = 15)
     @ApiModelProperty(value = "会员图标")
-    private java.lang.String icon;
+    private String icon;
 	/**卡片背景*/
 	@Excel(name = "卡片背景", width = 15)
     @ApiModelProperty(value = "卡片背景")
-    private java.lang.String bgImage;
+    private String bgImage;
 	/**卡片描述*/
 	@Excel(name = "卡片描述", width = 15)
     @ApiModelProperty(value = "卡片描述")
-    private java.lang.String content;
+    private String content;
+
+
+    @TableField(exist = false)
+    private String hotelName;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketMemberMapper.java

@@ -3,13 +3,14 @@ package org.jeecg.modules.business.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.business.entity.BusMarketMember;
 
 /**
  * @Description: bus_market_member_info
  * @Author: jeecg-boot
- * @Date:   2023-02-28
+ * @Date:   2023-03-02
  * @Version: V1.0
  */
 public interface BusMarketMemberMapper extends BaseMapper<BusMarketMember> {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketMemberMapper.xml

@@ -1,5 +1,4 @@
 <?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="org.jeecg.modules.demo.business.mapper.BusMarketMemberMapper">
-
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketMemberService.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.business.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.business.entity.BusMarketMember;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * @Description: bus_market_member_info
  * @Author: jeecg-boot
- * @Date:   2023-02-28
+ * @Date:   2023-03-02
  * @Version: V1.0
  */
 public interface IBusMarketMemberService extends IService<BusMarketMember> {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketMemberServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.business.service.impl;
 
+
 import org.jeecg.modules.business.entity.BusMarketMember;
 import org.jeecg.modules.business.mapper.BusMarketMemberMapper;
 import org.jeecg.modules.business.service.IBusMarketMemberService;
@@ -10,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: bus_market_member_info
  * @Author: jeecg-boot
- * @Date:   2023-02-28
+ * @Date:   2023-03-02
  * @Version: V1.0
  */
 @Service