dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化活动

Browse Source
This commit is contained in:
齐天大圣 2023-12-06 18:00:48 +08:00
parent a318f0ca31
commit fbbe572286
19 changed files with 352 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
View File

@ -68,6 +68,17 @@ public class ActiveConsumptionController extends BaseController {
return getSuccessResult(this.activeConsumptionService.getOneById(id)); return getSuccessResult(this.activeConsumptionService.getOneById(id));
} }
/**
* 通过id查询数据集合
*
* @param id 主键
* @return 单条数据
*/
@GetMapping("/list/{id}")
public ResponseObject selectList(@PathVariable Serializable id) {
return getSuccessResult(this.activeConsumptionChildService.selectList(id));
}
/** /**
* 新增数据 * 新增数据
* *

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java
View File

@ -4,6 +4,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -16,6 +17,7 @@ import java.io.Serializable;
* @since 2023-11-10 10:44:58 * @since 2023-11-10 10:44:58
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
@TableName("active_consumption")
public class ActiveConsumption extends Model<ActiveConsumption> { public class ActiveConsumption extends Model<ActiveConsumption> {
//主键id //主键id
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/mapper/ActiveConsumptionChildMapper.java
View File

@ -3,6 +3,9 @@ package com.fuint.business.marketingActivity.activeConsumption.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild; import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild;
import java.io.Serializable;
import java.util.List;
/** /**
* 消费有礼活动子表（存放兑换物品）(ActiveConsumptionChild)表数据库访问层 * 消费有礼活动子表（存放兑换物品）(ActiveConsumptionChild)表数据库访问层
* *
@ -11,4 +14,6 @@ import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsu
*/ */
public interface ActiveConsumptionChildMapper extends BaseMapper<ActiveConsumptionChild> { public interface ActiveConsumptionChildMapper extends BaseMapper<ActiveConsumptionChild> {
List<ActiveConsumptionChild> selectConsumptionChilds(Serializable id);
} }

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/mapper/ActiveConsumptionMapper.java
View File

@ -1,7 +1,12 @@
package com.fuint.business.marketingActivity.activeConsumption.mapper; package com.fuint.business.marketingActivity.activeConsumption.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption; import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 消费有礼活动(ActiveConsumption)表数据库访问层 * 消费有礼活动(ActiveConsumption)表数据库访问层
@ -11,5 +16,6 @@ import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsu
*/ */
public interface ActiveConsumptionMapper extends BaseMapper<ActiveConsumption> { public interface ActiveConsumptionMapper extends BaseMapper<ActiveConsumption> {
IPage selectConsumptions(Page page, @Param("activeConsumption") ActiveConsumption activeConsumption);
} }

35
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/mapper/xml/ActiveConsumptionChildMapper.xml Normal file
View File

@ -0,0 +1,35 @@
<?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.fuint.business.marketingActivity.activeConsumption.mapper.ActiveConsumptionChildMapper">
<resultMap type="com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild" id="ActiveConsumptionChildMap">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="activeConsumptionId" column="active_consumption_id" />
<result property="activeGift" column="active_gift" />
<result property="goodsIds" column="goods_ids" />
<result property="goodsName" column="goods_name" />
<result property="goodsTotal" column="goods_total" />
<result property="vouchersId" column="vouchers_id" />
<result property="giftCardName" column="gift_card_name" />
<result property="giftCardType" column="gift_card_type" />
<result property="giftCardDetail" column="gift_card_detail" />
<result property="giftCardTime" column="gift_card_time" />
<result property="giftCardTotal" column="gift_card_total" />
<result property="validityZero" column="validity_zero" />
<result property="validityOne" column="validity_one" />
<result property="validityTwo" column="validity_two" />
<result property="timeType" column="time_type" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
</resultMap>
<select id="selectConsumptionChilds" resultMap="ActiveConsumptionChildMap">
select
*
from active_consumption_child acc
where
acc.active_consumption_id = #{id}
</select>
</mapper>

69
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/mapper/xml/ActiveConsumptionMapper.xml
View File

@ -2,46 +2,55 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.marketingActivity.activeConsumption.mapper.ActiveConsumptionMapper"> <mapper namespace="com.fuint.business.marketingActivity.activeConsumption.mapper.ActiveConsumptionMapper">
<resultMap type="com.fuint.business.petrolStationManagement.entity.OilGun" id="OilGunMap"> <resultMap type="com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionVOS" id="ActiveConsumptionMap">
<result property="id" column="id" jdbcType="INTEGER"/> <result property="id" column="id" jdbcType="INTEGER"/>
<result property="gunName" column="gun_name" jdbcType="VARCHAR"/> <result property="chainStorId" column="chain_storId" jdbcType="INTEGER"/>
<result property="tankId" column="tank_id" jdbcType="INTEGER"/>
<result property="status" column="status" jdbcType="VARCHAR"/>
<result property="storeId" column="store_id" jdbcType="INTEGER"/> <result property="storeId" column="store_id" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="name" column="name" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> <result property="participationConditionMoney" column="participation_condition_money" jdbcType="VARCHAR"/>
<result property="createBy" column="create_by" jdbcType="INTEGER"/> <result property="activeStartTime" column="active_start_time" />
<result property="updateBy" column="update_by" jdbcType="INTEGER"/> <result property="activeEndTime" column="active_end_time" />
<result property="numberId" column="number_id" jdbcType="INTEGER"/> <result property="adaptOil" column="adapt_oil" />
<result property="tankName" column="tank_name" jdbcType="VARCHAR"/> <result property="adaptUserType" column="adapt_user_type" />
<result property="oilNumber" column="oil_number" jdbcType="VARCHAR"/> <result property="member_type" column="member_type" />
<result property="oilMachineGunNumber" column="oil_machine_gun_number" jdbcType="VARCHAR"/> <result property="dieselUserLevel" column="diesel_user_level" />
<result property="gasolineUserLevel" column="gasoline_user_level" />
<result property="naturalUserLevel" column="natural_user_level" />
<result property="paymentType" column="payment_type" />
<result property="participationCondition" column="participation_condition" />
<result property="participationAcount" column="participation_acount" />
<result property="limitAcount" column="limit_acount" />
<result property="activeGift" column="active_gift" />
<result property="points" column="points" />
<result property="status" column="status" />
<result property="isonline" column="isonline" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<collection property="activeConsumptionChildList" javaType="java.util.ArrayList" ofType="com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild"
select="com.fuint.business.marketingActivity.activeConsumption.mapper.ActiveConsumptionChildMapper.selectConsumptionChilds" column="id">
</collection>
</resultMap> </resultMap>
<select id="getAllList" resultMap="OilGunMap"> <select id="selectConsumptions" resultMap="ActiveConsumptionMap">
select select
og.id, og.gun_name, og.tank_id, og.status, og.store_id, og.create_time, og.update_time, og.create_by, og.update_by, og.number_id, ot.tank_name, *
og.oil_machine_gun_number from active_consumption
from oil_gun og left join oil_tank ot on og.tank_id = ot.id
<where> <where>
<if test="oilGun.id != null"> <if test="activeConsumption.status != null and activeConsumption.status != ''">
and og.id = #{oilGun.id} and status = #{activeConsumption.status}
</if> </if>
<if test="oilGun.gunName != null and oilGun.gunName != ''"> <if test="activeConsumption.isonline != null and activeConsumption.isonline != ''">
and og.gun_name = #{oilGun.gunName} and isonline = #{activeConsumption.isonline}
</if> </if>
<if test="oilGun.tankId != null"> <if test="activeConsumption.storeId != null and activeConsumption.storeId != ''">
and og.tank_id = #{oilGun.tankId} and store_id = #{activeConsumption.storeId}
</if> </if>
<if test="oilGun.status != null and oilGun.status != ''"> <if test="activeConsumption.name != null and activeConsumption.name != ''">
and og.status = #{oilGun.status} and name like concat('%', #{activeConsumption.name}, '%')
</if>
<if test="oilGun.storeId != null">
and og.store_id = #{oilGun.storeId}
</if>
<if test="oilGun.updateBy != null">
and og.update_by = #{oilGun.updateBy}
</if> </if>
</where> </where>
order by create_time desc
</select> </select>
</mapper> </mapper>

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionChildService.java
View File

@ -3,6 +3,9 @@ package com.fuint.business.marketingActivity.activeConsumption.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild; import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild;
import java.io.Serializable;
import java.util.List;
/** /**
* 消费有礼活动子表（存放兑换物品）(ActiveConsumptionChild)表服务接口 * 消费有礼活动子表（存放兑换物品）(ActiveConsumptionChild)表服务接口
* *
@ -11,4 +14,6 @@ import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsu
*/ */
public interface ActiveConsumptionChildService extends IService<ActiveConsumptionChild> { public interface ActiveConsumptionChildService extends IService<ActiveConsumptionChild> {
List<ActiveConsumptionChild> selectList(Serializable id);
} }

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.marketingActivity.activeConsumption.dto.ActiveConsumptionDTO; import com.fuint.business.marketingActivity.activeConsumption.dto.ActiveConsumptionDTO;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption; import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild;
import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionAppletVO; import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionAppletVO;
import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionVO; import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionVO;

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java
View File

@ -6,6 +6,10 @@ import com.fuint.business.marketingActivity.activeConsumption.mapper.ActiveConsu
import com.fuint.business.marketingActivity.activeConsumption.service.ActiveConsumptionChildService; import com.fuint.business.marketingActivity.activeConsumption.service.ActiveConsumptionChildService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/** /**
* 消费有礼活动子表（存放兑换物品）(ActiveConsumptionChild)表服务实现类 * 消费有礼活动子表（存放兑换物品）(ActiveConsumptionChild)表服务实现类
* *
@ -15,4 +19,10 @@ import org.springframework.stereotype.Service;
@Service("activeConsumptionChildService") @Service("activeConsumptionChildService")
public class ActiveConsumptionChildServiceImpl extends ServiceImpl<ActiveConsumptionChildMapper, ActiveConsumptionChild> implements ActiveConsumptionChildService { public class ActiveConsumptionChildServiceImpl extends ServiceImpl<ActiveConsumptionChildMapper, ActiveConsumptionChild> implements ActiveConsumptionChildService {
@Resource
private ActiveConsumptionChildMapper activeConsumptionChildMapper;
@Override
public List<ActiveConsumptionChild> selectList(Serializable id) {
return activeConsumptionChildMapper.selectConsumptionChilds(id);
}
} }

37
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.fuint.business.marketingActivity.activeConsumption.service.ActiveCons
import com.fuint.business.marketingActivity.activeConsumption.service.ActiveConsumptionService; import com.fuint.business.marketingActivity.activeConsumption.service.ActiveConsumptionService;
import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionAppletVO; import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionAppletVO;
import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionVO; import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionVO;
import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionVOS;
import com.fuint.business.petrolStationManagement.service.OilNameService; import com.fuint.business.petrolStationManagement.service.OilNameService;
import com.fuint.business.store.service.StoreService; import com.fuint.business.store.service.StoreService;
import com.fuint.business.userManager.entity.LJUserGrade; import com.fuint.business.userManager.entity.LJUserGrade;
@ -49,6 +50,8 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
private LJUserGradeService userGradeService; private LJUserGradeService userGradeService;
@Resource @Resource
private OilNameService oilNameService; private OilNameService oilNameService;
@Resource
private ActiveConsumptionMapper activeConsumptionMapper;
/** /**
* 新增数据 * 新增数据
* @param activeConsumptionDTO * @param activeConsumptionDTO
@ -98,31 +101,14 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
* @return * @return
*/ */
@Override @Override
public IPage select(Page page, ActiveConsumption activeConsumption) { public IPage<ActiveConsumptionVOS> select(Page page, ActiveConsumption activeConsumption) {
//构建查询条件 //所属店铺id
LambdaQueryWrapper<ActiveConsumption> queryWrapper = new LambdaQueryWrapper<>(); activeConsumption.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
if(ObjectUtils.isNotEmpty(activeConsumption.getName())){ //查询活动及其兑换券
queryWrapper.like(ActiveConsumption::getName,activeConsumption.getName()); IPage activeConsumptionVOSIPage = activeConsumptionMapper.selectConsumptions(page, activeConsumption);
} List<ActiveConsumptionVOS> records = activeConsumptionVOSIPage.getRecords();
if(ObjectUtils.isNotEmpty(activeConsumption.getStatus())) {
queryWrapper.eq(ActiveConsumption::getStatus,activeConsumption.getStatus());
}
if(ObjectUtils.isNotEmpty(activeConsumption.getIsonline())) {
queryWrapper.eq(ActiveConsumption::getIsonline,activeConsumption.getIsonline());
}
queryWrapper.eq(ActiveConsumption::getStoreId,TokenUtil.getNowAccountInfo().getStoreId());
queryWrapper.orderByDesc(ActiveConsumption::getCreateTime);
IPage page1 = page(page, queryWrapper);
//会员等级
List<ActiveConsumption> records = page1.getRecords();
List<ActiveConsumptionVO> activeConsumptionVOList = records.stream().map(s ->{ List<ActiveConsumptionVO> activeConsumptionVOList = records.stream().map(s ->{
ActiveConsumptionVO activeConsumptionVO = new ActiveConsumptionVO(); ActiveConsumptionVO activeConsumptionVO = new ActiveConsumptionVO();
//获取兑换物品信息
LambdaQueryWrapper<ActiveConsumptionChild> queryWrappers = new LambdaQueryWrapper<>();
queryWrappers.eq(ActiveConsumptionChild::getActiveConsumptionId,s.getId());
queryWrappers.orderByDesc(ActiveConsumptionChild::getCreateTime);
List<ActiveConsumptionChild> activeConsumptionChildList = activeConsumptionChildService.list(queryWrappers);
BeanUtils.copyProperties(s,activeConsumptionVO); BeanUtils.copyProperties(s,activeConsumptionVO);
activeConsumptionVO.setAdaptOil(Arrays.stream(s.getAdaptOil().split(",")) activeConsumptionVO.setAdaptOil(Arrays.stream(s.getAdaptOil().split(","))
.map(Integer::valueOf) .map(Integer::valueOf)
@ -139,11 +125,10 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
} }
activeConsumptionVO.setDieselUserLevel(str.split(",")); activeConsumptionVO.setDieselUserLevel(str.split(","));
} }
activeConsumptionVO.setActiveConsumptionChildList(activeConsumptionChildList);
return activeConsumptionVO; return activeConsumptionVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
page1.setRecords(activeConsumptionVOList); activeConsumptionVOSIPage.setRecords(activeConsumptionVOList);
return page1; return activeConsumptionVOSIPage;
} }
/** /**

72
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionVOS.java Normal file
View File

@ -0,0 +1,72 @@
package com.fuint.business.marketingActivity.activeConsumption.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
public class ActiveConsumptionVOS implements Serializable {
//主键id
@TableId(type = IdType.AUTO)
private Integer id;
//所属连锁店id
private Integer chainStorId;
//所属店铺id
private Integer storeId;
//活动名称
private String name;
//满足金额
private String participationConditionMoney;
//活动开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date activeStartTime;
//活动结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date activeEndTime;
//适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
private String adaptOil;
//适用会员类型 0:全部用户 1：全部会员 2：等级会员
private String adaptUserType;
//会员类型 0：汽油会员 1：柴油会员 2：天然气会员
private String member_type;
//柴油会员等级 1：一级会员 2：二级会员。。。。。。。
private String dieselUserLevel;
//汽油会员等级 1：一级会员 2：二级会员。。。。。。。
private String gasolineUserLevel;
//天然气会员等级 1：一级会员 2：二级会员。。。。。。。
private String naturalUserLevel;
//支付方式 0：微信支付 1：支付宝 2：银行卡 3：会员卡 4：现金 5：组合支付
private String paymentType;
//参与条件 0：不限制 1：优惠订单不参与
private String participationCondition;
//参与次数类别0：不限制 1：限制
private String participationAcount;
//限制次数
private Integer limitAcount;
//活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物
private String activeGift;
//赠送积分
private Integer points;
//活动状态 0：启用 1：禁用
private String status;
//是否在线 0：在线 1： 下线
private String isonline;
//券列表
private List<ActiveConsumptionChild> activeConsumptionChildList;
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
//更新者
private String updateBy;
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

19
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -31,6 +31,9 @@ import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorable;
import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord;
import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService; import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService;
import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableService; import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableService;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.service.CardValueService;
import com.fuint.business.marketingActivity.cardValue.vo.CardValueAppletVO;
import com.fuint.business.userManager.service.LJUserGradeService; import com.fuint.business.userManager.service.LJUserGradeService;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -67,6 +70,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
private ActiveNewlywedsService activeNewlywedsService; private ActiveNewlywedsService activeNewlywedsService;
@Resource @Resource
private ActiveRecommendService activeRecommendService; private ActiveRecommendService activeRecommendService;
@Resource
private CardValueService cardValueService;
/** /**
* 分页查询所有 * 分页查询所有
* @param * @param
@ -339,6 +344,20 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
activeAppletVO.setDes("活动准备中，敬请期待！"); activeAppletVO.setDes("活动准备中，敬请期待！");
activeAppletVOS.add(activeAppletVO); activeAppletVOS.add(activeAppletVO);
} }
//充值有礼
List<CardValueAppletVO> cardValueAppletVOS = cardValueService.selectAllApplet(new CardValue());
if (CollectionUtils.isNotEmpty(cardValueAppletVOS)){
ActiveAppletVO activeAppletVO = new ActiveAppletVO();
activeAppletVO.setName("储值卡充值活动");
activeAppletVO.setDes(cardValueAppletVOS.get(0).getDiscountActiveDescribe());
activeAppletVO.setTime(cardValueAppletVOS.get(0).getTime());
activeAppletVOS.add(activeAppletVO);
}else {
ActiveAppletVO activeAppletVO = new ActiveAppletVO();
activeAppletVO.setName("储值卡充值活动");
activeAppletVO.setDes("活动准备中，敬请期待！");
activeAppletVOS.add(activeAppletVO);
}
return activeAppletVOS; return activeAppletVOS;
} }
} }

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardValue.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption;
import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO; import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue; import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.service.CardValueService; import com.fuint.business.marketingActivity.cardValue.service.CardValueService;
@ -44,6 +45,16 @@ public class CardValueController extends BaseController {
return getSuccessResult(this.cardValueService.select(page, cardValue)); return getSuccessResult(this.cardValueService.select(page, cardValue));
} }
/**
* 查询所有数据(小程序端)
* @param cardValue
* @return
*/
@GetMapping("appletList")
public ResponseObject selectAllApplet(@Param("cardValue") CardValue cardValue) {
return getSuccessResult(this.cardValueService.selectAllApplet(cardValue));
}
/** /**
* 通过主键查询单条数据 * 通过主键查询单条数据
* *

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
View File

@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO; import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue; import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.vo.CardValueAppletVO;
import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO; import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* 储值卡表(CardValue)表服务接口 * 储值卡表(CardValue)表服务接口
@ -45,5 +47,13 @@ public interface CardValueService extends IService<CardValue> {
* @return * @return
*/ */
boolean updateOneById(CardValueDTO cardValueDTO); boolean updateOneById(CardValueDTO cardValueDTO);
/**
* 查询所有数据(小程序端)
* @param cardValue
* @return
*/
List<CardValueAppletVO> selectAllApplet(CardValue cardValue);
} }

96
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
View File

@ -5,22 +5,33 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumptionChild;
import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionAppletVO;
import com.fuint.business.marketingActivity.activeConsumption.vo.ActiveConsumptionVO;
import com.fuint.business.marketingActivity.activeDiscount.entity.ActiveDiscount;
import com.fuint.business.marketingActivity.activeDiscount.entity.ActiveDiscountChild;
import com.fuint.business.marketingActivity.activeDiscount.vo.ActiveDiscountVO;
import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO; import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueChild; import com.fuint.business.marketingActivity.cardValue.entity.CardValueChild;
import com.fuint.business.marketingActivity.cardValue.mapper.CardValueMapper; import com.fuint.business.marketingActivity.cardValue.mapper.CardValueMapper;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue; import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.service.CardValueChildService; import com.fuint.business.marketingActivity.cardValue.service.CardValueChildService;
import com.fuint.business.marketingActivity.cardValue.service.CardValueService; import com.fuint.business.marketingActivity.cardValue.service.CardValueService;
import com.fuint.business.marketingActivity.cardValue.vo.CardValueAppletVO;
import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO; import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO;
import com.fuint.business.store.service.StoreService; import com.fuint.business.store.service.StoreService;
import com.fuint.business.userManager.service.LJUserGradeService;
import com.fuint.common.util.TokenUtil; import com.fuint.common.util.TokenUtil;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -38,6 +49,8 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
private CardValueChildService cardValueChildService; private CardValueChildService cardValueChildService;
@Resource @Resource
private StoreService storeService; private StoreService storeService;
@Autowired
private LJUserGradeService userGradeService;
/** /**
* 分页查询所有数据 * 分页查询所有数据
* @param page * @param page
@ -75,6 +88,46 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
return page1; return page1;
} }
public IPage selectAll(Page page, CardValue cardValue) {
LambdaQueryWrapper<CardValue> queryWrapper = new LambdaQueryWrapper<>();
//构建查询条件
if (ObjectUtils.isNotEmpty(cardValue.getIsonline())){
queryWrapper.eq(CardValue::getIsonline,cardValue.getIsonline());
}
if (ObjectUtils.isNotEmpty(cardValue.getActiveStatus())){
queryWrapper.eq(CardValue::getActiveStatus,cardValue.getActiveStatus());
}
queryWrapper.eq(CardValue::getStoreId, TokenUtil.getNowAccountInfo().getStoreId());
queryWrapper.orderByDesc(CardValue::getCreateTime);
IPage page1 = page(page, queryWrapper);
List<CardValue> records = page1.getRecords();
//会员等级
List<CardValueVO> cardValueVOS = records.stream().map(s ->{
CardValueVO cardValueVO = new CardValueVO();
//获取兑换物品信息
LambdaQueryWrapper<CardValueChild> queryWrappers = new LambdaQueryWrapper<>();
queryWrappers.eq(CardValueChild::getCardValueId,s.getId());
queryWrappers.orderByDesc(CardValueChild::getCreateTime);
List<CardValueChild> cardValueChildList = cardValueChildService.list(queryWrappers);
BeanUtils.copyProperties(s,cardValueVO);
//获取会员等级
String str = "";
if (ObjectUtils.isNotEmpty(s.getMembershipLevel())){
for (String gradeId : s.getMembershipLevel().split(",")) {
if (ObjectUtils.isNotEmpty(userGradeService.selectUserGradeById(Integer.parseInt(gradeId)))){
str += userGradeService.selectUserGradeById(Integer.parseInt(gradeId)).getName() + ",";
}
}
cardValueVO.setMembershipLevel(str.split(","));
}
cardValueVO.setCardValueChildList(cardValueChildList);
return cardValueVO;
}).collect(Collectors.toList());
page1.setRecords(cardValueVOS);
return page1;
}
/** /**
* 通过主键查询单条数据(充值) * 通过主键查询单条数据(充值)
* @param id * @param id
@ -167,6 +220,49 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
return update; return update;
} }
/**
* 查询所有数据(小程序端)
* @param cardValue
* @return
*/
@Override
public List<CardValueAppletVO> selectAllApplet(CardValue cardValue) {
//获取本油站消费有礼活动列表
IPage page = selectAll(new Page(1, 20), cardValue);
List<CardValueVO> cardValueAppletVOList = page.getRecords();
List<CardValueAppletVO> appletVOList = cardValueAppletVOList.stream().map(s -> {
CardValueAppletVO cardValueAppletVO = new CardValueAppletVO();
//活动时间
if (s.getActiveTime().equals("1")){
cardValueAppletVO.setTime("不限时间");
}else {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
String formatSt = dateFormat.format(s.getStartTime());
String formatEd = dateFormat.format(s.getEndTime());
cardValueAppletVO.setTime(formatSt+"-" + formatEd+"");
}
//适用用户名
String adaptUserType = "";
if (s.getGroupOriented().equals("1")){
adaptUserType = "普通群体";
}else {
adaptUserType = arrayToString(s.getMembershipLevel());
//adaptUserType = s.getMembershipLevel();
}
//赠送优惠券兑换券实物
String card = "";
if (CollectionUtils.isNotEmpty(s.getCardValueChildList())) {
for (CardValueChild cardValueChild : s.getCardValueChildList()) {
card = cardValueChild.getGiftCardDetail() + "的券";
}
}
cardValueAppletVO.setDiscountActiveDescribe("本充值活动"+adaptUserType+"可用,充值满"+
s.getBidBalance()+"元，赠送金额为："+s.getGiftBalance()+"元，赠送券："+card+" 赠送积分："+s.getPoints()+"积分，赠送成长值为："+s.getGrowthValue()+"。");
return cardValueAppletVO;
}).collect(Collectors.toList());
return appletVOList;
}
/** /**
* 数组转字符串 * 数组转字符串
* @param array * @param array

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueAppletVO.java Normal file
View File

@ -0,0 +1,13 @@
package com.fuint.business.marketingActivity.cardValue.vo;
import lombok.Data;
import java.io.Serializable;
@Data
public class CardValueAppletVO implements Serializable {
//活动描述
private String discountActiveDescribe;
//活动时间
private String time;
}

4
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -1,7 +1,7 @@
# \u57FA\u672C\u914D\u7F6E # \u57FA\u672C\u914D\u7F6E
server.port=8008 server.port=8080
env.profile=dev env.profile=dev
env.properties.path=D:/oil/oil/oilSystem/fuintBackend/configure/ env.properties.path=D:/office/proj/oilSystem/fuintBackend/configure/
# \u6570\u636E\u5E93\u914D\u7F6E # \u6570\u636E\u5E93\u914D\u7F6E

6
gasStation-uni/pagesHome/Activity/index.vue
View File

@ -57,9 +57,9 @@
}) })
}, },
getData() { getData() {
uni.showLoading({ /*uni.showLoading({
title: '加载中' //title: '加载中'
}); });*/
request({ request({
url: 'business/marketingActivity/activeExchange/applet', url: 'business/marketingActivity/activeExchange/applet',
method: 'get', method: 'get',

2
gasStation-uni/pagesHome/activeIn/index.vue
View File

@ -59,7 +59,7 @@
methods: { methods: {
getData(name) { getData(name) {
uni.showLoading({ uni.showLoading({
title: '加载中' //title: '加载中'
}); });
if (name == '消费有礼活动') { if (name == '消费有礼活动') {
request({ request({