Browse Source

修改

master
dimengzhe 2 years ago
parent
commit
af4d1df437
  1. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
  2. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java
  3. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  4. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java

@ -24,6 +24,7 @@ public class AppOrderPriceInfoVo implements Vo {
private String date; private String date;
@ApiModelProperty(value = "预计提车地点") @ApiModelProperty(value = "预计提车地点")
private String address; private String address;
private String plannedPickUpLocationKey;
@ApiModelProperty("单台整体指导价") @ApiModelProperty("单台整体指导价")
private String singleGuildPrice; private String singleGuildPrice;

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPrice.java

@ -70,4 +70,7 @@ public class BusSalesOrderPrice extends BaseEntity {
@ApiModelProperty("计划提车日期") @ApiModelProperty("计划提车日期")
private Date plannedPickUpDate; private Date plannedPickUpDate;
@ApiModelProperty("计划提车地点")
private String plannedPickUpLocationKey;
} }

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -2868,6 +2868,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//冷藏冷机 //冷藏冷机
if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())){ if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())){
topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator(); topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
if(!busSalesOrderMakeup.getRefirgerator().contains("机")){
topMessage = topMessage+"冷机";
}
} }
//自卸液压盖板 //自卸液压盖板
if(StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl())&& !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())){ if(StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl())&& !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())){

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@ -55,7 +55,8 @@
DATE_FORMAT(bp.plannedPickUpDate, '%Y-%m-%d') as date, DATE_FORMAT(bp.plannedPickUpDate, '%Y-%m-%d') as date,
bp.plannedPickUpLocation as address, bp.plannedPickUpLocation as address,
bp.singleGuildPrice, bp.singleGuildPrice,
bp.singleFinalPrice bp.singleFinalPrice,
bp.plannedPickUpLocationKey
from bus_sales_order_price bp from bus_sales_order_price bp
where bp.salesOrderSid = #{sid} where bp.salesOrderSid = #{sid}
</select> </select>

Loading…
Cancel
Save