diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java index 532ab60281..dd51606d25 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java @@ -52,6 +52,8 @@ public class BusSalesOrderModel extends BaseEntity { @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty(value = "品牌sid") + private String brandSid; @ApiModelProperty(value = "品牌") private String brandName; @ApiModelProperty("车型sid") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java index 510eb2a158..899c145aa1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java @@ -70,5 +70,9 @@ public class BusSalesOrderModelDetailsVo implements Vo { @ApiModelProperty("单台成交价") @JsonSerialize(using = ToStringSerializer.class) private String finalPrice; + @ApiModelProperty(value = "品牌sid") + private String brandSid; + @ApiModelProperty(value = "品牌") + private String brandName; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java new file mode 100644 index 0000000000..81b0c87738 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java @@ -0,0 +1,41 @@ +package com.yxt.anrui.buscenter.api.bussalesordersubmit; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:20 + * @Description + */ +@Data +public class BusSalesOrderSubmit extends BaseEntity { + private static final long serialVersionUID = 1919809277011946278L; + @ApiModelProperty(value = "销售订单sid") + private String salesOrderSid; + @ApiModelProperty(value = "价格说明") + private String priceRemarks; + + @ApiModelProperty(value = "优惠说明") + private String discountRemarks; + @ApiModelProperty(value = "中介名称") + private String distributorName; + @ApiModelProperty(value = "联系电话") + private String distributorMobile; + + @ApiModelProperty(value = "中介单位sid") + private String distributorSid; + @ApiModelProperty(value = "单车中介服务费") + private BigDecimal distributorPrice; + @ApiModelProperty(value = "返利合计") + private BigDecimal distributorPriceAll; + @ApiModelProperty(value = "内部引荐人") + private String name; + @ApiModelProperty(value = "内部引荐人sid") + private String userSid; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java new file mode 100644 index 0000000000..37622c9265 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.buscenter.api.bussalesordersubmit; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:29 + * @Description + */ +@Data +public class BusSalesOrderSubmitDto implements Dto { + private static final long serialVersionUID = 4276394815492406556L; + + @ApiModelProperty(value = "价格说明") + private String priceRemarks; + + @ApiModelProperty(value = "优惠说明") + private String discountRemarks; + @ApiModelProperty(value = "中介名称") + private String distributorName; + @ApiModelProperty(value = "联系电话") + private String distributorMobile; + + @ApiModelProperty(value = "中介单位sid") + private String distributorSid; + @ApiModelProperty(value = "单车中介服务费") + private String distributorPrice; + @ApiModelProperty(value = "返利合计") + private String distributorPriceAll; + @ApiModelProperty(value = "内部引荐人") + private String name; + @ApiModelProperty(value = "内部引荐人sid") + private String userSid; + + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index a23b273199..0743f063cd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -238,9 +238,9 @@ public class BusSalesOrderService extends MybatisBaseService0){ + if (depositBig.compareTo(new BigDecimal(depositAll)) > 0) { return rb.setMsg("本次结转金额之和已超订金合计金额"); } if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) { @@ -462,8 +472,8 @@ public class BusSalesOrderService extends MybatisBaseService busDepositFictitiousDtoList = dto.getBusDepositFictitiousList(); BusSalesOrder busSalesOrder = fetchBySid(dto.getSid()); BeanUtil.copyProperties(dto, busSalesOrder, "sid"); - if(dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){ - busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(),"")); + if (dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())) { + busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), "")); } baseMapper.updateById(busSalesOrder); //主车车型信息保存 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml index 5c63af3123..22273ef677 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml @@ -41,7 +41,9 @@ moreConfig, specialConfig, guildPrice, - finalPrice + finalPrice, + brandName, + brandSid from bus_sales_order_model where salesOrderSid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java new file mode 100644 index 0000000000..3057a8d9b4 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.buscenter.biz.bussalesordersubmit; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:35 + * @Description + */ +@Mapper +public interface BusSalesOrderSubmitMapper extends BaseMapper { +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java new file mode 100644 index 0000000000..1eeae8e694 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.buscenter.biz.bussalesordersubmit; + +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @Author dimengzhe + * @Date 2022/5/20 9:31 + * @Description + */ +@Service +public class BusSalesOrderSubmitService extends MybatisBaseService { +}