Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/app/AppBusSalesOrderPriceVo.java

@@ -15,6 +15,8 @@ public class AppBusSalesOrderPriceVo implements Vo {
 
     @ApiModelProperty(value = "预计提车地点")
     private String address;
+    @ApiModelProperty(value = "预计提车地点全称")
+    private String fullName;
     @ApiModelProperty(value = "预计提车地点")
     private String addressKey;
     @ApiModelProperty(value = "主车单台成交价格")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
 import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
@@ -70,6 +72,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
     @Autowired
     private BusSalesOrderModelService busSalesOrderModelService;
+    @Autowired
+    private ScmWarehouseFeign scmWarehouseFeign;
 
     public void saveOrderPrice(BusSalesOrderPriceDto busSalesOrderPriceDto, String sid) {
         BusSalesOrderPrice busSalesOrderPrice = new BusSalesOrderPrice();
@@ -142,6 +146,14 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         AppBusSalesOrderPriceVo vo1 = baseMapper.getPriceInfo(sid);
         BusSalesOrderModelDetailsVo detailsVo = busSalesOrderModelService.details(sid);
         BeanUtil.copyProperties(vo1, vo);
+        if (StringUtils.isNotBlank(vo1.getAddressKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(vo1.getAddressKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                vo.setFullName(vo.getAddress() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
+            }else {
+                vo.setFullName(vo.getAddress());
+            }
+        }
         BigDecimal bigDecimalFinalPrice = new BigDecimal("0");
         if(detailsVo == null){
             return rb.setMsg("请先完善车型信息");

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmExtra.java

@@ -10,6 +10,7 @@ import lombok.Data;
 @Data
 public class ScmExtra {
 
+    private String fullName;
     private String name;
     private String sid;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@@ -61,16 +61,10 @@ public class ScmWarehouseVo implements Vo {
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
 
-	@ApiModelProperty("省sid")
-	private String provinceSid;
 	@ApiModelProperty("province")
 	private String province;
-	@ApiModelProperty("市sid")
-	private String citySid;
 	@ApiModelProperty("city")
 	private String city;
-	@ApiModelProperty("收货县区sid")
-	private String countySid;
 	@ApiModelProperty("county")
 	private String county;
     

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -99,6 +99,9 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         QueryWrapper<ScmWarehouse> qw = createQueryWrapper(query);
         IPage<ScmWarehouse> page = PagerUtil.queryToPage(pq);
         IPage<ScmWarehouseVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmWarehouseVo record : pagging.getRecords()) {
+            record.setWarehouseAttribute(record.getCity() + record.getCounty() + record.getWarehouseAttribute());
+        }
         PagerVo<ScmWarehouseVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -218,10 +221,15 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
                 ScmExtra scmExtra = new ScmExtra();
                 scmExtra.setSid(scmWarVo.getId());
                 scmExtra.setName(scmWarVo.getDictValue());
+                ScmWarehouse scmWarehouse = fetchBySid(scmWarVo.getId());
+                if (StringUtils.isNotBlank(scmWarehouse.getCity()) && StringUtils.isNotBlank(scmWarehouse.getCounty())){
+                    scmExtra.setFullName(scmExtra.getName() + "(" + scmWarehouse.getCity() + scmWarehouse.getCounty() + scmWarehouse.getWarehouseAttribute() + ")");
+                }else {
+                    scmExtra.setFullName(scmExtra.getName());
+                }
                 scmWarVo.setExtra(scmExtra);
             }
         }
-
         return rb.success().setData(list);
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java

@@ -14,6 +14,8 @@ public class PriceVo implements Vo {
     private static final long serialVersionUID = -6281257788690749096L;
     @ApiModelProperty(value = "预计提车地点")
     private String address;
+    @ApiModelProperty(value = "预计提车地点全称")
+    private String fullName;
     @ApiModelProperty(value = "预计提车地点")
     private String addressKey;
     @ApiModelProperty(value = "主车单台成交价格")

yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicle.java

@@ -68,16 +68,16 @@ public class AsCustomerVehicle extends BaseEntity {
     private Integer mileage; // 行驶里程
 	@ApiModelProperty("上次保养里程")
     private Integer lastMileage; // 上次保养里程
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	@ApiModelProperty("下次保养日期")
     private Date nextMaintainDate; // 下次保养日期
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	@ApiModelProperty("购车日期")
     private Date buyDate; // 购车日期
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	@ApiModelProperty("商业险到期日期")
     private Date commercialInsuranceEndDate; // 商业险到期日期
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	@ApiModelProperty("交强险到期日期")
     private Date compulsoryInsuranceEndDate; // 交强险到期日期
 	@ApiModelProperty("0为内部车，1为外部车")

yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetails.java

@@ -108,4 +108,9 @@ public class AsCustomerVehicleDetails{
     private String brakepads_km; // 刹车片到期公里
     @ApiModelProperty("刹车片到期日期")
     private String brakepads_date; // 刹车片到期日期
+
+    @ApiModelProperty("车辆备注")
+    private String carRemarks;
+    @ApiModelProperty("保养备注")
+    private String byRemarks;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -106,9 +106,10 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
     public AsCustomerVehicleDetails fetchDetailsVoBySid(String customerVehSid) {
         AsCustomerVehicleDetails vo = new AsCustomerVehicleDetails();
         AsCustomerVehicle entity = fetchBySid(customerVehSid);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (null != entity) {
             BeanUtil.copyProperties(entity, vo);
+            vo.setCarRemarks(entity.getRemarks());
             if (null != entity.getNextMaintainDate()) {
                 vo.setNextMaintainDate(sdf.format(entity.getNextMaintainDate()));
             }
@@ -124,6 +125,7 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
             AsCustomervehMaintenance maintenance = asCustomervehMaintenanceService.fetchByVehSid(customerVehSid);
             if (null != maintenance) {
                 BeanUtil.copyProperties(maintenance, vo, "id", "sid");
+                vo.setByRemarks(maintenance.getRemarks());
                 if (null != maintenance.getFanbelt_date()) {
                     vo.setFanbelt_date(sdf.format(maintenance.getFanbelt_date()));
                 }
@@ -163,25 +165,30 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         if (StringUtils.isNotBlank(sid)) {
             AsCustomerVehicle asCustomerVehicle = fetchBySid(sid);
             BeanUtil.copyProperties(dto, asCustomerVehicle, "id", "sid");
+            asCustomerVehicle.setRemarks(dto.getCarRemarks());
             baseMapper.updateById(asCustomerVehicle);
             AsCustomervehMaintenance asCustomervehMaintenance = asCustomervehMaintenanceService.fetchByVehSid(sid);
             if (null != asCustomervehMaintenance) {
                 BeanUtil.copyProperties(dto, asCustomervehMaintenance, "id", "sid");
+                asCustomervehMaintenance.setRemarks(dto.getByRemarks());
                 asCustomervehMaintenanceService.updateById(asCustomervehMaintenance);
             } else {
                 AsCustomervehMaintenance maintenance = new AsCustomervehMaintenance();
                 BeanUtil.copyProperties(dto, maintenance, "id", "sid");
                 maintenance.setVehSid(sid);
+                maintenance.setRemarks(dto.getByRemarks());
                 asCustomervehMaintenanceService.insert(maintenance);
             }
         } else {
             AsCustomerVehicle asCustomerVehicle = new AsCustomerVehicle();
             BeanUtil.copyProperties(dto, asCustomerVehicle, "id", "sid");
             asCustomerVehicle.setVehState(1);
+            asCustomerVehicle.setRemarks(dto.getCarRemarks());
             baseMapper.insert(asCustomerVehicle);
             AsCustomervehMaintenance maintenance = new AsCustomervehMaintenance();
             BeanUtil.copyProperties(dto, maintenance, "id", "sid");
             maintenance.setVehSid(asCustomerVehicle.getSid());
+            maintenance.setRemarks(dto.getByRemarks());
             asCustomervehMaintenanceService.insert(maintenance);
         }
         return rb.success();