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

更新9.27

Browse Source
This commit is contained in:
许允枞 2024-09-27 11:49:38 +08:00
parent 173af4884a
commit e425475bde
9 changed files with 105 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java
View File

@ -11,10 +11,12 @@ import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import io.lettuce.core.dynamic.annotation.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
@ -24,12 +26,13 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author dianliang
* @since 2024-09-25
*/
@Controller
@RequestMapping("/fleet-lines-change")
@RestController
@RequestMapping("/fleetLinesChange")
public class FleetLinesChangeController extends BaseController {
@Autowired
private IFleetLinesChangeService fleetLinesChangeService;
@GetMapping("/queryByPageUni")
public ResponseObject queryByPageUni(@RequestParam(value = "page",defaultValue = "1") Integer page,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@Param("integralDetail") FleetLinesChangeVo fleetLinesChangeVo) {

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

@ -173,7 +173,7 @@ public class FleetMemberController extends BaseController {
if (list.size() >= 1) {
for (int i = 0; i < list.size(); i++) {
FleetMemberVo fleetMemberVo = (FleetMemberVo) list.get(i);
FleetMember fleetMember = fleetMemberService.queryByMobile(fleetMemberVo.getMobile());
FleetMember fleetMember = fleetMemberService.queryByMobile(fleetMemberVo);
if (ObjectUtil.isNotEmpty(fleetMember)){
repeat += 1;
}else {

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -43,28 +45,28 @@ public class FleetLinesChange implements Serializable {
private String adjustType;
@ApiModelProperty(value = "调整额度")
private BigDecimal adjustLimit;
private Double adjustLimit;
@ApiModelProperty(value = "创建人")
private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private String updateBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "剩余额度")
private BigDecimal remainingCreditLimit;
private Double remainingCreditLimit;
@ApiModelProperty(value = "被调整额度的用户id")
private Integer userId;
@ApiModelProperty(value = "订单id")
private Integer orderId;
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.fleet.entity.FleetLinesChange;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.business.fleet.vo.FleetLinesChangeVo;
import org.apache.ibatis.annotations.Param;
/**
* <p>
@ -16,5 +17,5 @@ import com.fuint.business.fleet.vo.FleetLinesChangeVo;
*/
public interface FleetLinesChangeMapper extends BaseMapper<FleetLinesChange> {
IPage<FleetLinesChangeVo> queryAllByLimit(Page page1, FleetLinesChangeVo fleetLinesChangeVo);
IPage<FleetLinesChangeVo> queryAllByLimit(Page page1,@Param("fleetLinesChange") FleetLinesChangeVo fleetLinesChangeVo);
}

19
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml
View File

@ -2,4 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.fleet.mapper.FleetLinesChangeMapper">
<select id="queryAllByLimit" resultType="com.fuint.business.fleet.vo.FleetLinesChangeVo">
select fc.*, mu.name userName
from fleet_lines_change fc
left join mt_user mu on mu.id = fc.user_id
<where>
<if test="fleetLinesChange.fleetId != null and fleetLinesChange.fleetId != ''">
and fc.fleet_id = #{fleetLinesChange.fleetId}
</if>
<if test="fleetLinesChange.storeId != null and fleetLinesChange.storeId != ''">
and fc.store_id = #{fleetLinesChange.storeId}
</if>
<if test="fleetLinesChange.adjustType != null and fleetLinesChange.adjustType != ''">
and fc.adjust_type = #{fleetLinesChange.adjustType}
</if>
<if test="fleetLinesChange.startTime != null and fleetLinesChange.startTime != ''">
and fc.create_time between #{fleetLinesChange.startTime} and #{fleetLinesChange.endTime}
</if>
</where>
</select>
</mapper>

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

@ -40,7 +40,7 @@ public interface FleetMemberService {
* @param mobile
* @return
*/
FleetMember queryByMobile(String mobile);
FleetMember queryByMobile(FleetMember fleetMember);
/**
* 新增数据

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

@ -17,4 +17,11 @@ import com.fuint.business.fleet.vo.FleetLinesChangeVo;
public interface IFleetLinesChangeService extends IService<FleetLinesChange> {
IPage<FleetLinesChangeVo> queryByPageUni(Page page1, FleetLinesChangeVo fleetLinesChangeVo);
/**
* 新增额度记录变化
* @param fleetLinesChange
* @return
*/
int insertFleetLinesChange(FleetLinesChange fleetLinesChange);
}

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

@ -39,4 +39,15 @@ public class FleetLinesChangeServiceImpl extends ServiceImpl<FleetLinesChangeMap
}
return this.baseMapper.queryAllByLimit(page1, fleetLinesChangeVo);
}
/**
* 新增额度记录变化
*
* @param fleetLinesChange
* @return
*/
@Override
public int insertFleetLinesChange(FleetLinesChange fleetLinesChange) {
return baseMapper.insert(fleetLinesChange);
}
}

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

@ -1,5 +1,6 @@
package com.fuint.business.fleet.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -8,10 +9,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.fleet.entity.FleetInfo;
import com.fuint.business.fleet.entity.FleetLinesChange;
import com.fuint.business.fleet.entity.FleetMember;
import com.fuint.business.fleet.mapper.FleetLinesChangeMapper;
import com.fuint.business.fleet.mapper.FleetMemberMapper;
import com.fuint.business.fleet.service.FleetInfoService;
import com.fuint.business.fleet.service.FleetMemberService;
import com.fuint.business.fleet.service.IFleetLinesChangeService;
import com.fuint.business.fleet.vo.FleetInfoUniVo;
import com.fuint.business.fleet.vo.FleetMemberVo;
import com.fuint.business.storeInformation.entity.LJStore;
@ -43,7 +47,7 @@ import java.util.Random;
* @since 2024-08-02 10:33:13
*/
@Service("fleetMemberService")
public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetMember> implements FleetMemberService {
public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper, FleetMember> implements FleetMemberService {
@Autowired
private LJUserService userService;
@ -63,22 +67,26 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
@Resource
private ILJStoreService iljStoreService;
@Autowired
private IFleetLinesChangeService fleetLinesChangeService;
@Override
public IPage<FleetMemberVo> queryPage(Page page, FleetMemberVo fleetMember) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
fleetMember.setStoreId(nowAccountInfo.getStoreId());
return baseMapper.queryPage(page,fleetMember);
return baseMapper.queryPage(page, fleetMember);
}
@Override
public IPage<FleetMemberVo> queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
FleetMember fleetMember1 = baseMapper.selectOne(new LambdaQueryWrapper<FleetMember>()
.eq(FleetMember::getFleetId, fleetMember.getFleetId())
.eq(FleetMember::getUserId, nowAccountInfo.getId()));
if (ObjectUtil.isEmpty(fleetMember1)){
if (ObjectUtil.isEmpty(fleetMember1)) {
throw new RuntimeException("未绑定该车队,无法查看当前车队成员信息");
}
return baseMapper.queryPageByNameOrMobile(page,fleetMember);
return baseMapper.queryPageByNameOrMobile(page, fleetMember);
}
/**
@ -93,10 +101,12 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
}
@Override
public FleetMember queryByMobile(String mobile) {
public FleetMember queryByMobile(FleetMember fleetMember) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("mobile",mobile);
queryWrapper.eq("if_log_off","0");
// queryWrapper.eq("mobile",mobile);
queryWrapper.eq("fleet_id", fleetMember.getFleetId());
queryWrapper.eq("mobile", fleetMember.getMobile());
queryWrapper.eq("if_log_off", "0");
return baseMapper.selectOne(queryWrapper);
}
@ -111,7 +121,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
//判断当前用户是否是车队负责人
FleetInfoUniVo fleetInfoUniVo = fleetInfoService.queryByFleetId(fleetMember.getFleetId());
if (ObjectUtil.isNotEmpty(fleetInfoUniVo) && (fleetInfoUniVo.getUserId() != nowAccountInfo.getId())){
if (ObjectUtil.isNotEmpty(fleetInfoUniVo) && (fleetInfoUniVo.getUserId() != nowAccountInfo.getId())) {
throw new RuntimeException("请由车队负责人进行此操作");
}
//判断用户是否存在选择的车队
@ -119,7 +129,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
.eq(FleetMember::getMobile, fleetMember.getMobile())
.eq(FleetMember::getFleetId, fleetMember.getFleetId())
.last("limit 1"));
if (ObjectUtil.isNotEmpty(fleetMember2)){
if (ObjectUtil.isNotEmpty(fleetMember2)) {
throw new RuntimeException("该用户已加入该车队");
}
// if (ObjectUtil.isNotEmpty(fleetMember1)) {
@ -130,7 +140,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
MtUser mtUser = mtUserMapper.selectOne(new LambdaQueryWrapper<MtUser>()
.eq(MtUser::getMobile, fleetMember.getMobile())
.last("limit 1"));
if (ObjectUtil.isEmpty(mtUser)){
if (ObjectUtil.isEmpty(mtUser)) {
//注册用户
mtUser = new MtUser();
mtUser.setUserNo(editUserNo());
@ -156,16 +166,16 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
@Override
public int insertFleetMember(FleetMemberVo fleetMember) {
FleetMember fleetMember1 = queryByMobile(fleetMember.getMobile());
FleetMember fleetMember1 = queryByMobile(fleetMember);
if (ObjectUtil.isNotEmpty(fleetMember1)) {
return 0;
}
LJUserVo user = userService.selectUserByMobileAndChantStoreId(fleetMember.getMobile());
if (ObjectUtil.isEmpty(user)){
if (ObjectUtil.isEmpty(user)) {
return 2;
}
FleetInfo fleetInfo = fleetInfoService.selectByName(fleetMember.getFleetName());
if (ObjectUtil.isEmpty(fleetInfo)){
if (ObjectUtil.isEmpty(fleetInfo)) {
return 3;
}
@ -184,11 +194,32 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
*/
@Override
public int update(FleetMember fleetMember) {
FleetMember fleetMember1 = queryByMobile(fleetMember.getMobile());
if (ObjectUtil.isNotEmpty(fleetMember1) && fleetMember1.getId() != fleetMember.getId()){
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
FleetMember fleetMember1 = queryByMobile(fleetMember);
if (ObjectUtil.isNotEmpty(fleetMember1) && fleetMember1.getId() != fleetMember.getId()) {
return 0;
}
//添加到车队额度变化表
FleetLinesChange fleetLinesChange = new FleetLinesChange();
if (ObjectUtil.isNotEmpty(fleetMember)) {
fleetLinesChange.setFleetId(fleetMember.getFleetId());
fleetLinesChange.setUserId(fleetMember.getUserId());
fleetLinesChange.setStoreId(fleetMember.getStoreId());
fleetLinesChange.setAdjustType(fleetMember.getAdjustType());
fleetLinesChange.setAdjustLimit(fleetMember.getAdjustLimit());
//剩余额度
if (ObjectUtil.isNotEmpty(fleetMember1.getRemainingCreditLimit())) {
if (fleetMember.getAdjustType().equals("0")) {
fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() + fleetMember.getAdjustLimit());
} else {
fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit());
}
// fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() - fleetMember.getAdjustLimit());
}
fleetLinesChange.setCreateBy(nowAccountInfo.getId().toString());
fleetLinesChange.setCreateTime(DateUtil.date().toLocalDateTime());
fleetLinesChangeService.insertFleetLinesChange(fleetLinesChange);
}
return baseMapper.updateById(fleetMember);
}
@ -227,7 +258,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
/**
* 创建用户的基础信息
*/
private void createVaseInfo (MtUser mtUser, String storeId,String staffId, String inviterId) {
private void createVaseInfo(MtUser mtUser, String storeId, String staffId, String inviterId) {
LJStore store = iljStoreService.selectStoreByStoreId(Integer.parseInt(storeId));
// 根据userid和连锁店id查询是否存在对应的余额信息
@ -252,7 +283,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
}
// 新增会员余额信息
userBalanceService.insertUserBalance(userBalanceAdd);
}else {
} else {
LJUserGrade ljUserGrade = ljUserGradeService.selectUserGradeByStoreId(Integer.parseInt(storeId));
if (ObjectUtil.isNotEmpty(ljUserGrade) && ObjectUtil.isNotEmpty(ljUserGrade.getId())) {
userBalance.setGradeId(ljUserGrade.getId());
@ -265,21 +296,22 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
MtInvitation mtInvitation = new MtInvitation();
mtInvitation.setUserId(mtUser.getId());
mtInvitation.setStoreId(Integer.parseInt(storeId));
if (ObjectUtil.isNotEmpty(staffId) && staffId !="") {
if (ObjectUtil.isNotEmpty(staffId) && staffId != "") {
mtInvitation.setStaffId(Integer.parseInt(staffId));
}
if (ObjectUtil.isNotEmpty(inviterId) && inviterId !="") {
if (ObjectUtil.isNotEmpty(inviterId) && inviterId != "") {
mtInvitation.setInviterId(Integer.parseInt(inviterId));
}
if (!ObjectUtil.isEmpty(store)){
if (!ObjectUtil.isEmpty(store)) {
mtInvitation.setChainStoreId(store.getChainStoreId());
}
mtInvitationMapper.insert(mtInvitation);
}
}
//生成用户编号
private String editUserNo() {
Random random = new Random();