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