diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java index 479faa0ff..318bd7ab4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java @@ -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; /** *

@@ -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) { 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 712a914fa..c96fb1a1e 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 @@ -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 { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java index 9767ba744..12aadacfe 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java @@ -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; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java index 012a080f3..9f9f8b205 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java @@ -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; /** *

@@ -16,5 +17,5 @@ import com.fuint.business.fleet.vo.FleetLinesChangeVo; */ public interface FleetLinesChangeMapper extends BaseMapper { - IPage queryAllByLimit(Page page1, FleetLinesChangeVo fleetLinesChangeVo); + IPage queryAllByLimit(Page page1,@Param("fleetLinesChange") FleetLinesChangeVo fleetLinesChangeVo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml index b5fb9dbf0..7a913110d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml @@ -2,4 +2,23 @@ + 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 cbdd12b8d..a4d66c229 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 @@ -40,7 +40,7 @@ public interface FleetMemberService { * @param mobile * @return */ - FleetMember queryByMobile(String mobile); + FleetMember queryByMobile(FleetMember fleetMember); /** * 新增数据 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java index 54589f218..f22ce82c6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java @@ -17,4 +17,11 @@ import com.fuint.business.fleet.vo.FleetLinesChangeVo; public interface IFleetLinesChangeService extends IService { IPage queryByPageUni(Page page1, FleetLinesChangeVo fleetLinesChangeVo); + + /** + * 新增额度记录变化 + * @param fleetLinesChange + * @return + */ + int insertFleetLinesChange(FleetLinesChange fleetLinesChange); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java index 58267200b..6112365c3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java @@ -39,4 +39,15 @@ public class FleetLinesChangeServiceImpl extends ServiceImpl implements FleetMemberService { +public class FleetMemberServiceImpl extends ServiceImpl implements FleetMemberService { @Autowired private LJUserService userService; @@ -63,22 +67,26 @@ public class FleetMemberServiceImpl extends ServiceImpl 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 queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); FleetMember fleetMember1 = baseMapper.selectOne(new LambdaQueryWrapper() .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(); - 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() .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