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

更新9.24

Browse Source
This commit is contained in:
许允枞 2024-09-24 10:50:47 +08:00
parent 2b60d598d0
commit eb127ee084
13 changed files with 194 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java
View File

@ -68,7 +68,7 @@ public class FleetMemberController extends BaseController {
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
return getSuccessResult(fleetMemberService.queryPage(page,fleetMember));
return getSuccessResult(fleetMemberService.queryPageByNameOrMobile(page,fleetMember));
}
/**

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java
View File

@ -19,6 +19,13 @@ public interface FleetMemberService {
* @return
*/
IPage<FleetMemberVo> queryPage(Page page, FleetMemberVo fleetMember);
/**
* 根据条件分页查询
* @param page
* @param fleetMember
* @return
*/
IPage<FleetMemberVo> queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember);
/**
* 通过ID查询单条数据

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
View File

@ -37,6 +37,11 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
public IPage<FleetMemberVo> queryPage(Page page, FleetMemberVo fleetMember) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
fleetMember.setStoreId(nowAccountInfo.getStoreId());
return baseMapper.queryPage(page,fleetMember);
}
@Override
public IPage<FleetMemberVo> queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
return baseMapper.queryPageByNameOrMobile(page,fleetMember);
}

21
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@ -365,26 +366,36 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
DateTime now = DateUtil.date();
DateTime yesterDay = DateUtil.offsetDay(now, -1);
//查询连续签到天数
List<IntegralDetail> day = integralDetailMapper.selectList(new LambdaQueryWrapper<IntegralDetail>()
IntegralDetail integralDetail = integralDetailMapper.selectOne(new LambdaQueryWrapper<IntegralDetail>()
.eq(IntegralDetail::getUserId, nowAccountInfo.getId())
.eq(IntegralDetail::getStoreId, storeId)
.eq(IntegralDetail::getType, "签到赠送")
.between(IntegralDetail::getCreateTime, DateUtil.beginOfDay(yesterDay), now)
.orderBy(true, false, IntegralDetail::getCreateTime));
.orderBy(true, false, IntegralDetail::getCreateTime).last("limit 1"));
if (CollUtil.isNotEmpty(day)) {
IntegralDetail integralDetail = day.get(0);
// if (CollUtil.isNotEmpty(day)) {
// IntegralDetail integralDetail = day.get(0);
if (ObjectUtil.isNotEmpty(integralDetail)) {
// 正则表达式，匹配数字
Pattern pattern = Pattern.compile("\\d+");
Matcher matcher = pattern.matcher(integralDetail.getChangeReason());
StringBuilder numbers = new StringBuilder();
numbers.append(0);
while (matcher.find()) {
numbers.append(matcher.group());
}
if (StrUtil.isEmpty(numbers)) {
integralSettingsVo.setSignInDays("0");
}
String str = numbers.toString();
if (Integer.parseInt(str) >= 10) {
numbers.deleteCharAt(0);
}
integralSettingsVo.setSignInDays(numbers.toString());
}else {
integralSettingsVo.setSignInDays("0");
}
}
// }
return integralSettingsVo;
}

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserFuelController.java Normal file
View File

@ -0,0 +1,20 @@
package com.fuint.business.userManager.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.stereotype.Controller;
/**
* <p>
* 用户囤油表 前端控制器
* </p>
*
* @author dianliang
* @since 2024-09-24
*/
@Controller
@RequestMapping("/mt-user-fuel")
public class MtUserFuelController {
}

66
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserFuel.java Normal file
View File

@ -0,0 +1,66 @@
package com.fuint.business.userManager.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 用户囤油表
* </p>
*
* @author dianliang
* @since 2024-09-24
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("mt_user_fuel")
@ApiModel(value="MtUserFuel对象", description="用户囤油表")
public class MtUserFuel implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "会员id")
private Integer mtUserId;
@ApiModelProperty(value = "所属连锁店id")
private Integer chainStoreId;
@ApiModelProperty(value = "所属店铺id")
private Integer storeId;
@ApiModelProperty(value = "油号信息")
private String oilName;
@ApiModelProperty(value = "囤油升数")
private Double fuelAmount;
@ApiModelProperty(value = "创建者")
private String createBy;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新者")
private String updateBy;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "备注")
private String remark;
}

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserFuelMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.fuint.business.userManager.mapper;
import com.fuint.business.userManager.entity.MtUserFuel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 用户囤油表 Mapper 接口
* </p>
*
* @author dianliang
* @since 2024-09-24
*/
public interface MtUserFuelMapper extends BaseMapper<MtUserFuel> {
}

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/IMtUserFuelService.java Normal file
View File

@ -0,0 +1,16 @@
package com.fuint.business.userManager.service;
import com.fuint.business.userManager.entity.MtUserFuel;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 用户囤油表 服务类
* </p>
*
* @author dianliang
* @since 2024-09-24
*/
public interface IMtUserFuelService extends IService<MtUserFuel> {
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserCarNoServiceImpl.java
View File

@ -68,6 +68,13 @@ public class MtUserCarNoServiceImpl extends ServiceImpl<MtUserCarNoMapper, MtUse
@Override
public int edit(MtUserCarNo mtUserCarNo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
//查询当前用户当前车牌号是否已经存在
MtUserCarNo existCarNo = baseMapper.selectOne(new LambdaQueryWrapper<MtUserCarNo>()
.eq(MtUserCarNo::getUserId, nowAccountInfo.getId())
.eq(MtUserCarNo::getCarNo, mtUserCarNo.getCarNo()));
if (ObjectUtil.isNotEmpty(existCarNo)) {
throw new RuntimeException("当前车牌号已存在");
}
mtUserCarNo.setUpdateTime(LocalDateTime.now());
mtUserCarNo.setUpdateBy(nowAccountInfo.getId().toString());
return baseMapper.updateById(mtUserCarNo);

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserFuelServiceImpl.java Normal file
View File

@ -0,0 +1,20 @@
package com.fuint.business.userManager.service.impl;
import com.fuint.business.userManager.entity.MtUserFuel;
import com.fuint.business.userManager.mapper.MtUserFuelMapper;
import com.fuint.business.userManager.service.IMtUserFuelService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 用户囤油表 服务实现类
* </p>
*
* @author dianliang
* @since 2024-09-24
*/
@Service
public class MtUserFuelServiceImpl extends ServiceImpl<MtUserFuelMapper, MtUserFuel> implements IMtUserFuelService {
}

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
View File

@ -23,8 +23,10 @@ import com.fuint.business.store.mapper.MtStoreMapper;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.business.userManager.entity.LJUserGrade;
import com.fuint.business.userManager.entity.MtUserFuel;
import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.mapper.LJUserGradeMapper;
import com.fuint.business.userManager.mapper.MtUserFuelMapper;
import com.fuint.business.userManager.mapper.UserBalanceMapper;
import com.fuint.business.userManager.service.LJUserGradeService;
import com.fuint.business.userManager.service.UserBalanceService;
@ -85,6 +87,9 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
@Autowired
CardGiftMapper cardGiftMapper;
@Autowired
MtUserFuelMapper mtUserFuelMapper;
@Override
public IPage<UserBalanceVo> listByZt(Page page, UserBalanceVo user) {
@ -376,8 +381,12 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
Double giftCardAmount = cardGifts.stream().mapToDouble(CardGift::getCardAmount).sum();
userBlanceUniVo.setGiftCardAmount(giftCardAmount);
}
userBlanceUniVo.setGiftCardCount(cardGifts.size());
//查询用户囤油信息
List<MtUserFuel> mtUserFuel = mtUserFuelMapper.selectList(new LambdaQueryWrapper<MtUserFuel>()
.eq(MtUserFuel::getMtUserId, nowAccountInfo.getId())
.eq(MtUserFuel::getStoreId, balance.getStoreId()));
userBlanceUniVo.setUserFuel(mtUserFuel);
} else {
userBlanceUniVo.setAllBalance(0.0);
userBlanceUniVo.setCardBalance(0.0);

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBlanceUniVo.java
View File

@ -1,8 +1,11 @@
package com.fuint.business.userManager.vo;
import com.fuint.business.userManager.entity.MtUserFuel;
import com.fuint.business.userManager.entity.UserBalance;
import lombok.Data;
import java.util.List;
@Data
public class UserBlanceUniVo extends UserBalance {
//总余额
@ -16,4 +19,6 @@ public class UserBlanceUniVo extends UserBalance {
//礼品卡总金额
private Double giftCardAmount;
private List<MtUserFuel> userFuel;
}

5
fuintBackend/fuint-application/src/main/resources/mapper/MtUserFuelMapper.xml Normal file
View File

@ -0,0 +1,5 @@
<?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.userManager.mapper.MtUserFuelMapper">
</mapper>