diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java index 7446847af..6f68cdeb2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java @@ -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)); } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java index c5782647d..9c0d2da30 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java @@ -19,6 +19,13 @@ public interface FleetMemberService { * @return */ IPage queryPage(Page page, FleetMemberVo fleetMember); + /** + * 根据条件分页查询 + * @param page + * @param fleetMember + * @return + */ + IPage queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember); /** * 通过ID查询单条数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java index a8c170b12..d86bad434 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java @@ -37,6 +37,11 @@ public class FleetMemberServiceImpl extends ServiceImpl queryPage(Page page, FleetMemberVo fleetMember) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); fleetMember.setStoreId(nowAccountInfo.getStoreId()); + return baseMapper.queryPage(page,fleetMember); + } + @Override + public IPage queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); return baseMapper.queryPageByNameOrMobile(page,fleetMember); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java index 6742266a6..9a9067cad 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java @@ -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 day = integralDetailMapper.selectList(new LambdaQueryWrapper() + IntegralDetail integralDetail = integralDetailMapper.selectOne(new LambdaQueryWrapper() .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; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserFuelController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserFuelController.java new file mode 100644 index 000000000..02b5f4c08 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/MtUserFuelController.java @@ -0,0 +1,20 @@ +package com.fuint.business.userManager.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.stereotype.Controller; + +/** + *

+ * 用户囤油表 前端控制器 + *

+ * + * @author dianliang + * @since 2024-09-24 + */ +@Controller +@RequestMapping("/mt-user-fuel") +public class MtUserFuelController { + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserFuel.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserFuel.java new file mode 100644 index 000000000..93dadf2c0 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtUserFuel.java @@ -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; + +/** + *

+ * 用户囤油表 + *

+ * + * @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; + + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserFuelMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserFuelMapper.java new file mode 100644 index 000000000..53c9ecc63 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/MtUserFuelMapper.java @@ -0,0 +1,16 @@ +package com.fuint.business.userManager.mapper; + +import com.fuint.business.userManager.entity.MtUserFuel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 用户囤油表 Mapper 接口 + *

+ * + * @author dianliang + * @since 2024-09-24 + */ +public interface MtUserFuelMapper extends BaseMapper { + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/IMtUserFuelService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/IMtUserFuelService.java new file mode 100644 index 000000000..ef8a60117 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/IMtUserFuelService.java @@ -0,0 +1,16 @@ +package com.fuint.business.userManager.service; + +import com.fuint.business.userManager.entity.MtUserFuel; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 用户囤油表 服务类 + *

+ * + * @author dianliang + * @since 2024-09-24 + */ +public interface IMtUserFuelService extends IService { + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserCarNoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserCarNoServiceImpl.java index 489bdc0d9..d9525615c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserCarNoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserCarNoServiceImpl.java @@ -68,6 +68,13 @@ public class MtUserCarNoServiceImpl extends ServiceImpl() + .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); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserFuelServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserFuelServiceImpl.java new file mode 100644 index 000000000..cc1a2b870 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserFuelServiceImpl.java @@ -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; + +/** + *

+ * 用户囤油表 服务实现类 + *

+ * + * @author dianliang + * @since 2024-09-24 + */ +@Service +public class MtUserFuelServiceImpl extends ServiceImpl implements IMtUserFuelService { + +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java index 326c4455f..d0ece41fa 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java @@ -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 listByZt(Page page, UserBalanceVo user) { @@ -376,8 +381,12 @@ public class UserBalanceServiceImpl extends ServiceImpl mtUserFuel = mtUserFuelMapper.selectList(new LambdaQueryWrapper() + .eq(MtUserFuel::getMtUserId, nowAccountInfo.getId()) + .eq(MtUserFuel::getStoreId, balance.getStoreId())); + userBlanceUniVo.setUserFuel(mtUserFuel); } else { userBlanceUniVo.setAllBalance(0.0); userBlanceUniVo.setCardBalance(0.0); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBlanceUniVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBlanceUniVo.java index 109f74e65..4a6d2a839 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBlanceUniVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBlanceUniVo.java @@ -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 userFuel; } diff --git a/fuintBackend/fuint-application/src/main/resources/mapper/MtUserFuelMapper.xml b/fuintBackend/fuint-application/src/main/resources/mapper/MtUserFuelMapper.xml new file mode 100644 index 000000000..d80bb2f7e --- /dev/null +++ b/fuintBackend/fuint-application/src/main/resources/mapper/MtUserFuelMapper.xml @@ -0,0 +1,5 @@ + + + + +