jiaosong
2023-10-13 07e05c3847141c4896156c143e2ac89e7837e1bb
#获取可退款信息
已修改4个文件
96 ■■■■ 文件已修改
server/platform/src/main/java/com/doumee/api/business/PricingDetailController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/api/business/PricingDetailController.java
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +36,7 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:pricingdetail:create")
    public ApiResponse create(@RequestBody PricingDetail pricingDetail) {
    public ApiResponse create(@RequestBody @Valid PricingDetail pricingDetail) {
        return ApiResponse.success(pricingDetailService.create(pricingDetail));
    }
@@ -87,4 +89,20 @@
    public ApiResponse findById(@PathVariable String id) {
        return ApiResponse.success(pricingDetailService.findById(id));
    }
    /**
     * 条件查询
     *
     * @param pricePramId 实体对象
     * @return List<PricingDetail>
     */
    @ApiOperation("根据定价配置ID查询")
    @GetMapping("/findListByPricePramId")
    @RequiresPermissions("business:pricingdetail:query")
    public ApiResponse<List<PricingDetail>> findList(@RequestParam String pricePramId){
        PricingDetail pricingDetail = new PricingDetail();
        pricingDetail.setPricePramId(pricePramId);
        pricingDetail.setIsdeleted(Constants.ZERO);
        return ApiResponse.success(pricingDetailService.findList(pricingDetail));
    }
}
server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
@@ -10,6 +10,8 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.Date;
@@ -51,10 +53,12 @@
    @ApiModelProperty(value = "定价方案编码(关联price_param)")
    @ExcelColumn(name="定价方案编码(关联price_param)")
    @NotBlank(message = "定价方案编码不允许为空")
    private String pricePramId;
    @ApiModelProperty(value = "车辆类型编码(关联bike_types表)")
    @ExcelColumn(name="车辆类型编码(关联bike_types表)")
    @NotBlank(message = "车辆类型不允许为空")
    private String bikeTypeId;
    @ApiModelProperty(value = "车辆类型编码(关联bike_types表)")
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -45,28 +45,7 @@
    @Override
    public String create(PricingDetail pricingDetail) {
        if ((pricingDetail.getBaseTime() < 0) &&
                Objects.isNull(pricingDetail.getBasePrice())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"一口价价格不可为空");
        }
        if ((pricingDetail.getBaseTime() > 0) &&
                (Objects.isNull(pricingDetail.getBasePrice())
                || Objects.isNull(pricingDetail.getUnitTime())
                || Objects.isNull(pricingDetail.getUnitPrice()))){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"阶梯定价参数不可为空");
        }
        if ( Objects.isNull(pricingDetail.getBasePrice()) && (pricingDetail.getHolidayBasePrice().compareTo(BigDecimal.ZERO)<Constants.ZERO)
                ){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"节假一口价价格不可为空");
        }
        if ((Objects.isNull(pricingDetail.getHolidayBasePrice())
                        || Objects.isNull(pricingDetail.getHolidayBasePrice())
                        || Objects.isNull(pricingDetail.getHolidayBasePrice()))&&(pricingDetail.getHolidayBasePrice().compareTo(BigDecimal.ZERO)>Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"节假阶梯定价参数不可为空");
        }
        checkPricingDetail(pricingDetail);
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        PricingDetail insert = new PricingDetail();
        insert.setCreateDate(new Date());
@@ -90,6 +69,46 @@
        return pricingDetail.getId();
    }
    private void checkPricingDetail(PricingDetail pricingDetail){
        if ((Objects.nonNull(pricingDetail.getBaseTime()) &&  pricingDetail.getBaseTime() < 0) &&
                Objects.isNull(pricingDetail.getBasePrice())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"一口价价格不可为空");
        }
        if ((Objects.nonNull(pricingDetail.getBaseTime()) && pricingDetail.getBaseTime() > 0) &&
                (Objects.isNull(pricingDetail.getBasePrice())
                        || Objects.isNull(pricingDetail.getUnitTime())
                        || Objects.isNull(pricingDetail.getUnitPrice()))){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"阶梯定价参数不可为空");
        }
        if ( (Objects.nonNull(pricingDetail.getHolidayBaseTime()) && pricingDetail.getHolidayBaseTime() < 0)
                && ( Objects.isNull(pricingDetail.getHolidayBasePrice()))
        ){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"节假一口价价格不可为空");
        }
        if (((Objects.nonNull(pricingDetail.getHolidayBaseTime()) && pricingDetail.getHolidayBaseTime() > 0))
                && (Objects.isNull(pricingDetail.getHolidayBasePrice())
                || Objects.isNull(pricingDetail.getHolidayUnitTime())
                || Objects.isNull(pricingDetail.getHolidayUnitPrice()))){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"节假阶梯定价参数不可为空");
        }
        QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(PricingDetail::getIsdeleted,Constants.ZERO)
                .eq(PricingDetail::getBikeTypeId,pricingDetail.getBikeTypeId())
                .eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId());
        Integer exitCount = pricingDetailMapper.selectCount(wrapper);
        if (exitCount > Constants.ZERO){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"该车型已配置");
        }
    }
    @Override
    public void deleteById(String id) {
        pricingDetailMapper.deleteById(id);
@@ -111,6 +130,10 @@
    @Override
    public void updateById(PricingDetail pricingDetail) {
        checkPricingDetail(pricingDetail);
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        pricingDetail.setEditDate(new Date());
        pricingDetail.setEditor(principal.getId());
        pricingDetailMapper.updateById(pricingDetail);
    }
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -46,8 +46,9 @@
        insert.setEndDate(pricingParam.getEndDate());
        insert.setSortnum(pricingParam.getSortnum());
        insert.setStatus(Constants.ZERO);
        pricingParamMapper.insert(pricingParam);
        return pricingParam.getId();
        insert.setInfo(pricingParam.getInfo());
        pricingParamMapper.insert(insert);
        return insert.getId();
    }
    @Override