Browse Source

app销售订单相关接口

master
hanlinghao 3 years ago
parent
commit
1b67a23ab0
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
  2. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
  3. 31
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/AppOrderReadyCar.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java
  5. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java
  6. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
  7. 63
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  8. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
  9. 60
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  10. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java
  11. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
  12. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
  13. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
  14. 25
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderInitModelInfoVo.java
  15. 63
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderStateVo.java
  16. 37
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderAllDto.java
  17. 52
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderBillInfoVo.java
  18. 64
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderQuery.java
  19. 99
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderVo.java
  20. 18
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppCarInfo.java
  21. 24
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppModelInfo.java
  22. 24
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCar.java
  23. 25
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCarList.java
  24. 39
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppOrderInfo.java
  25. 31
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCar.java
  26. 32
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCarList.java
  27. 41
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  28. 35
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  29. 30
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  30. 78
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  31. 55
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  32. 363
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  33. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java
  34. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
  35. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
  36. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
  37. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
  38. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
  39. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
  40. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
  41. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
  42. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java
  43. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
  44. 27
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  45. 17
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  46. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
  47. 33
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java
  48. 98
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  49. 84
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java
  50. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDeposit.java
  51. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositDto.java
  52. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java
  53. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java
  54. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositPageQuery.java
  55. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositPageVo.java
  56. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositQuery.java
  57. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositVo.java
  58. 16
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java
  59. 84
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.base.api.basevehmodelconfig;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -109,5 +110,8 @@ public interface BaseVehmodelConfigFeign {
public ResultBean<AppModelVeDetailVo> getAppIntentionVehicleVo(@RequestParam("userSid") String userSid,
@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
@ApiOperation("获取车型配置总结(即常用配置一句话描述)(销售订单)")
@GetMapping("/selectCarConfigSummary/{modelSid}/{configSid}/{userSid}")
public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid);
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.base.api.basevehmodelconfig;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -103,4 +104,9 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
return null;
}
@Override
public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
return null;
}
}

31
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/AppOrderReadyCar.java

@ -0,0 +1,31 @@
package com.yxt.anrui.base.api.busvehicleorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppOrderReadyCar implements Vo {
@ApiModelProperty("排产订单编号")
private String orderId;
@ApiModelProperty("创建日期")
private String date;
@ApiModelProperty("总数")
private String totalNum;
@ApiModelProperty("可使用数量")
private String canUseNum;
@ApiModelProperty("选择数量")
private String selectNum;
@ApiModelProperty("排产单sid")
private String sid;
@ApiModelProperty("提示消息")
private String msg;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@ -35,6 +35,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: anrui-base(车型信息) <br/>
@ -103,5 +104,7 @@ public interface BusVehicleOrderFeign {
@GetMapping("/appProductionScheduling/{modelSid}/{configSid}")
public ResultBean<AppCurrentCarDetailConfigVo> getAppProductionSchedulingDetailConfigVo(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
@ApiOperation("手机端销售订单选择采购订单列表")
@GetMapping("/getAppReadyCar/{modelSid}/{configSid}")
public ResultBean<List<AppOrderReadyCar>> getAppReadyCar(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
}

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@ -31,6 +31,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-base(车型信息) <br/>
* File: BusVehicleOrderFeignFallback.java <br/>
@ -90,4 +92,9 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
return null;
}
@Override
public ResultBean<List<AppOrderReadyCar>> getAppReadyCar(String modelSid, String configSid) {
return null;
}
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
import com.yxt.anrui.base.api.basevehmodelconfig.*;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
@ -117,4 +118,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
BaseVehmodelConfigVo fetchAllBySid(String sid);
BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
AppModelConfigListVo selectCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid);
}

63
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@ -5,9 +5,9 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
SELECT bvc.*,
bvm.modelName,
bvm.`vehicleVersionValue`,
bvm.`vehicleTypeCode`,
bvm.modelName,
bvm.`vehicleVersionValue`,
bvm.`vehicleTypeCode`,
<!--车身颜色-->
bmc.carColor,
<!--驾驶室规格-->
@ -52,10 +52,10 @@
bmc.bumper,
bmc.configName
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm
ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc
ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm
ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc
ON bvc.configurationItemsSid = bmc.sid
<where>
${ew.sqlSegment}
</where>
@ -72,14 +72,14 @@
<select id="getAppCommonlyUsedModelsByPageList"
resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo">
SELECT bvm.sid AS modelSid,
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
bvm.vehicleAlias,
bvm.brandName,
bvm.vehicleVersionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
<where>
${ew.sqlSegment}
</where>
@ -214,4 +214,39 @@
where modelSid = #{modelSid}
and configurationItemsSid = #{configSid}
</select>
<select id="selectCarConfigSummary"
resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
SELECT bmc.sid,
bvm.sid AS modelSid,
bvm.vehicleAlias AS model,
bvm.carBrand AS brandSid,
bvm.brandName AS brand,
bmc.carColor,
bmc.slowMachine,
bmc.rearViewMirror,
bmc.tireSize,
bmc.specification,
bmc.rearAxleRatio,
bmc.airConditioner,
bmc.hubMaterial,
bmc.baffleModel,
bmc.suspension,
bmc.seat,
bmc.tireCover,
bmc.saddle,
bmc.wheelbase,
bmc.bumper,
bmc.configuringBao,
bmc.independentSources,
bmc.fuelTank,
bmc.multimedia,
bvc.guidedPrice,
bmc.otherConfig
FROM base_vehmodel_config bvc
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid LIKE concat('%', #{orgSid}, '%')
</select>
</mapper>

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@ -26,6 +26,7 @@
package com.yxt.anrui.base.biz.basevehmodelconfig;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basevehmodelconfig.*;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -152,4 +153,11 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid, modelSid, configSid);
return new ResultBean<AppModelVeDetailVo>().success().setData(vo);
}
@Override
public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
AppCarConfigSummaryVo vo = baseVehmodelConfigService.selectCarConfigSummary(modelSid, configSid,userSid);
return rb.success().setData(vo);
}
}

60
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.base.biz.basevehmodelconfig;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
import com.yxt.anrui.base.api.basevehmodelconfig.*;
@ -384,4 +385,63 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid);
return rb.success().setData(vo);
}
public AppCarConfigSummaryVo selectCarConfigSummary(String modelSid, String configSid,String userSid) {
String orgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid,orgSid);
AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
return configSummaryVo;
}
/**
* 拼接常用配置字段
*
* @param
* @return
*/
public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
String slowMachine = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
String rearViewMirror = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
String tireSize = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
String specification = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
String rearAxleRatio = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
String airConditioner = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
String hubMaterial = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
String baffleModel = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
String suspension = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
String seat = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
String tireCover = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getTireCover(), "有") ? ("护轮罩" + "/") : "";
String saddle = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
String wheelbase = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
String bumper = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
String configuringBao = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
String independentSources = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
String fuelTank = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
vo.setConfig(configName);
vo.setModel(appModelConfigListVo.getModel());
vo.setMoreConfig(appModelConfigListVo.getOtherConfig());
return vo;
}
}

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java

@ -101,4 +101,13 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
AppCurrentCarDetailVo getAppProductionSchedulingDetailConfigVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
BusVehicleOrderVo selectBySid(@Param("sid") String sid);
/**
* 手机端销售订单选择采购订单列表
*
* @param modelSid
* @param configSid
* @return
*/
List<AppOrderReadyCar> getAppReadyCar(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
}

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@ -183,4 +183,15 @@
LEFT JOIN bus_vehicle_apply bva ON bvad.applySid = bva.sid
WHERE bvo.sid = #{sid}
</select>
<select id="getAppReadyCar" resultType="com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar">
SELECT bvo.orderNo as orderId,
bvo.orderDate as `date`,
bvo.platformNo as totalNum,
bvo.sid
FROM bus_vehicle_order bvo
LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
WHERE bvad.vehicleSid = #{modelSid}
and bvad.configSid = #{configSid}
</select>
</mapper>

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@ -39,6 +39,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Project: anrui-base(车型信息) <br/>
* File: BusVehicleOrderFeignFallback.java <br/>
@ -146,4 +148,10 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
return new ResultBean<AppCurrentCarDetailConfigVo>().success().setData(vo);
}
@Override
public ResultBean<List<AppOrderReadyCar>> getAppReadyCar(String modelSid, String configSid) {
List<AppOrderReadyCar> list = busVehicleOrderService.getAppReadyCar(modelSid, configSid);
return new ResultBean<List<AppOrderReadyCar>>().success().setData(list);
}
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@ -383,4 +383,9 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
}
return configInfoSpanSize;
}
public List<AppOrderReadyCar> getAppReadyCar(String modelSid, String configSid) {
List<AppOrderReadyCar> list = baseMapper.getAppReadyCar(modelSid, configSid);
return list;
}
}

25
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderInitModelInfoVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppBusSaleOrderInitModelInfoVo implements Vo {
@ApiModelProperty("")
private AppOrderInfo orderInfo;
@ApiModelProperty("")
private AppCarInfo carInfo;
@ApiModelProperty("订单sid")
private String saleOrderSid;
@ApiModelProperty("选择类型")
private String state;
@ApiModelProperty("排产数量")
private String arrangeNumber;
}

63
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSaleOrderStateVo.java

@ -0,0 +1,63 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppBusSaleOrderStateVo implements Vo {
//0 未完善 1 已完善
@ApiModelProperty("单据状态")
private int orderInfoState;
@ApiModelProperty("车型状态")
private int modleInfoState;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("上装状态")
private int topInfoState;
@ApiModelProperty("上装名称")
private String topName;
@ApiModelProperty("挂车状态")
private int trailerInfoState;
@ApiModelProperty("价格信息")
private int priceInfoState;
@ApiModelProperty("订金状态")
private int depositInfoState;
@ApiModelProperty("保险说明")
private int insureInfoState;
@ApiModelProperty("保险名称")
private String insureName;
@ApiModelProperty("金融方案状态")
private int financeInfoState;
@ApiModelProperty("补充说明状态")
private int remarksStete;
@ApiModelProperty("补充说明")
private String remarks;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("客户名称")
private String customerName;
}

37
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderAllDto.java

@ -0,0 +1,37 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppBusSalesOrderAllDto implements Dto {
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("手机号")
private String customerMobile;
@ApiModelProperty("付款类型")
private String payType;
@ApiModelProperty("付款类型")
private String payValue;
@ApiModelProperty("开票类型")
private String invoiceType;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("付款类型")
private String invoiceValue;
@ApiModelProperty("挂靠公司类型 1 选择 2 手写")
private String affiliatedType;
@ApiModelProperty("选择挂靠公司名称")
private String affiliatedOrgNameChoose;
@ApiModelProperty("手写挂靠公司名称")
private String affiliatedOrgNameWrite;
@ApiModelProperty("挂靠公司名称sid")
private String affiliatedOrgSid;
}

52
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderBillInfoVo.java

@ -0,0 +1,52 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppBusSalesOrderBillInfoVo implements Vo {
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户手机号")
private String customerMobile;
@ApiModelProperty("付款类型")
private String payType;
@ApiModelProperty("付款类型")
private String payValue;
@ApiModelProperty("开票类型")
private String invoiceType;
@ApiModelProperty("开票类型")
private String invoiceValue;
@ApiModelProperty("挂靠公司填写类型 默认值: 1长度: 1正则: ^[1-2]*$ 1选择 2手写")
private String affiliatedType;
@ApiModelProperty("选择的挂靠挂靠公司")
private String affiliatedOrgNameChoose;
@ApiModelProperty("手写的挂靠公司")
private String affiliatedOrgNameWrite;
@ApiModelProperty("挂靠单位sid")
private String affiliatedOrgSid;
@ApiModelProperty("挂靠单位名称")
private String affiliatedCompany;
@ApiModelProperty("用户的sid")
private String userSid;
@ApiModelProperty("单据sid")
private String saleOrderSid;
@ApiModelProperty("客户sid")
private String customerSid;
}

64
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderQuery.java

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderQuery.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderQuery <br/>
* Description: 销售订单主表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-27 13:39:04 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "销售订单主表 查询条件", description = "销售订单主表 查询条件")
public class AppBusSalesOrderQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("销售订单类型(“”或null 全部 “1” 待办理 “2”已办理)")
private String type;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("业务员sid")
private String staffSid;
}

99
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppBusSalesOrderVo.java

@ -0,0 +1,99 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo <br/>
* Description: 销售订单主表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-27 13:39:04 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "销售订单主表 视图数据对象", description = "销售订单主表 视图数据对象")
public class AppBusSalesOrderVo implements Vo {
private static final long serialVersionUID = -5570433499942792774L;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("销售订单编号")
private String saleOrderId;
@ApiModelProperty("客户类型")
private String customerType;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户头像")
private String customerImage;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("购车方式")
private String carPurchaseType;
@ApiModelProperty("购车方式key")
private String carPurchaseKey;
@ApiModelProperty("销售订单状态")
private String saleOrderState;
@ApiModelProperty("创建日期")
private String createdDate;
@ApiModelProperty("是否保险")
private String insuranceInfo;
@ApiModelProperty("订金")
private String deposit;
@ApiModelProperty("是否显示修改订单按钮")
private boolean showUpdateBtn;
@ApiModelProperty("是否显示金融方案按钮")
private boolean showFinancialBtn;
@ApiModelProperty("是否显示生成合同按钮")
private boolean showContractBtn;
@ApiModelProperty("是否显示删除订单按钮")
private boolean showDeleteBtn;
@ApiModelProperty("是否显示申请合格证按钮")
private boolean showApplyBtn;
@ApiModelProperty("是否显示录入车架号")
private boolean showInputBtn;
@ApiModelProperty("车型信息")
private AppModelInfo modelInfo;
}

18
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppCarInfo.java

@ -0,0 +1,18 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppCarInfo implements Vo {
@ApiModelProperty("销售订单-车型确认-现车")
private List<AppNowCar> nowCar;
@ApiModelProperty("销售订单-车型确认-排产")
private List<AppReadyCar> readyCar;
}

24
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppModelInfo.java

@ -0,0 +1,24 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppModelInfo {
@ApiModelProperty("车辆图片")
private String carImage;
@ApiModelProperty("车型名称")
private String model;
@ApiModelProperty("品牌")
private String brand;
@ApiModelProperty("价格")
private String price;
@ApiModelProperty("数量")
private String number;
}

24
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCar.java

@ -0,0 +1,24 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppNowCar implements Vo {
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("是否有合格证")
private String certificate;
@ApiModelProperty("存放地点")
private String address;
@ApiModelProperty("车辆sid")
private String carSid;
@ApiModelProperty("是否虚拟订单锁定的")
private String virtual;
}

25
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppNowCarList.java

@ -0,0 +1,25 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppNowCarList implements Vo {
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("是否有合格证")
private String certificate;
@ApiModelProperty("存放地点")
private String address;
@ApiModelProperty("车库sid")
private String carSid;
@ApiModelProperty("是否虚拟订单锁定的")
private String virtual;
}

39
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppOrderInfo.java

@ -0,0 +1,39 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppOrderInfo implements Vo {
@ApiModelProperty("提示")
private String notice;
@ApiModelProperty("更多配置")
private String moreConfig;
@ApiModelProperty("常用配置")
private String commonlyConfig;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("特殊说明")
private String specialInstructions;
@ApiModelProperty("销售订单-车型确认-现车")
private List<AppNowCarList> nowCarList;
@ApiModelProperty("销售订单-车型确认-排产")
private List<AppReadyCarList> readyCarList;
}

31
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCar.java

@ -0,0 +1,31 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppReadyCar implements Vo {
@ApiModelProperty("排产订单编号")
private String orderId;
@ApiModelProperty("创建日期")
private String date;
@ApiModelProperty("总数")
private String totalNum;
@ApiModelProperty("可使用数量")
private String canUseNum;
@ApiModelProperty("选择数量")
private String selectNum;
@ApiModelProperty("排产单sid")
private String sid;
@ApiModelProperty("提示消息")
private String msg;
}

32
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/AppReadyCarList.java

@ -0,0 +1,32 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppReadyCarList implements Vo {
@ApiModelProperty("排产订单编号")
private String orderId;
@ApiModelProperty("创建日期")
private String date;
@ApiModelProperty("总数")
private String totalNum;
@ApiModelProperty("可使用数量")
private String canUseNum;
@ApiModelProperty("选择数量")
private String selectNum;
@ApiModelProperty("排产单sid")
private String sid;
@ApiModelProperty("提示消息")
private String msg;
}

41
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@ -102,4 +102,45 @@ public interface BusSalesOrderFeign {
@PostMapping("/revokeProcess")
@ResponseBody
ResultBean revokeProcess(@RequestBody BusSalesOrderFlowDto dto);
/*-------------------------------------App销售订单接口------------------------------------------------*/
@ApiOperation("初始化销售订单状态")
@GetMapping("/init/saleOrderState/{saleOrderSid}")
@ResponseBody
public ResultBean<AppBusSaleOrderStateVo> saleOrderState(@PathVariable("saleOrderSid") String saleOrderSid);
@ApiOperation("App销售订单分页列表")
@PostMapping("/getSaleOrders")
@ResponseBody
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(@RequestBody PagerQuery<AppBusSalesOrderQuery> pq);
@ApiOperation("删除销售订单")
@DeleteMapping("/deleteSaleOrder/{saleOrderSid}/{userSid}")
@ResponseBody
public ResultBean deleteSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
@ApiOperation("初始化销售订单单据信息")
@GetMapping("/init/billInfo/{saleOrderSid}/{userSid}")
@ResponseBody
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
@ApiOperation("新增/修改销售订单单据")
@PostMapping("/save/billInfo")
@ResponseBody
public ResultBean saveBillInfo(@RequestBody AppBusSalesOrderAllDto dto);
@ApiOperation("初始化销售订单 车型信息")
@GetMapping("/init/modelInfo")
@ResponseBody
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("customerSid") String customerSid, @RequestParam("userSid") String userSid);
@ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
@GetMapping("/init/modelInfo2")
@ResponseBody
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid,
@RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
}

35
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@ -97,4 +97,39 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
public ResultBean revokeProcess(BusSalesOrderFlowDto dto) {
return null;
}
@Override
public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
return null;
}
@Override
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
return null;
}
@Override
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
return null;
}
@Override
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
return null;
}
@Override
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
return null;
}
@Override
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
return null;
}
@Override
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
return null;
}
}

30
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@ -26,15 +26,17 @@
package com.yxt.anrui.buscenter.biz.bussalesorder;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderMapper.java <br/>
@ -58,4 +60,28 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
@Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")
int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney);
/**
* App销售订单分页列表
*
* @param page
* @param qw
* @return
*/
IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw);
/**
* 根据销售订单sid查询车型信息
*
* @param saleOrderSid
* @return
*/
AppModelInfo selectModelInfoByOrderSid(String saleOrderSid);
/**
* App初始化销售订单单据信息
*
* @param saleOrderSid
* @return
*/
AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid);
}

78
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -5,23 +5,23 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo">
SELECT bo.sid,
bo.nodeState,
bo.billNo,
DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
bo.customerName,
bo.mobile,
bm.brandName,
bp.singleFinalPrice,
bp.quantity,
bo.payType,
bd.depositAll,
case bo.isInsurance
when 0 then '否'
when 1 then '是' end as isInsurance
bo.nodeState,
bo.billNo,
DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
bo.customerName,
bo.mobile,
bm.brandName,
bp.singleFinalPrice,
bp.quantity,
bo.payType,
bd.depositAll,
case bo.isInsurance
when 0 then '否'
when 1 then '是' end as isInsurance
FROM bus_sales_order bo
left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
<where>
${ew.sqlSegment}
</where>
@ -35,4 +35,50 @@
nodeId=#{nodeSid}
where sid = #{businessSid}
</update>
<!--app查询销售订单列表-->
<select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo">
SELECT bo.sid AS saleOrderSid,
bo.billNo AS saleOrderId,
bo.customerClass AS customerType,
bo.customerSid,
bo.customerName,
bo.customerPhoto AS customerImage,
bo.mobile,
bo.payType AS carPurchaseType,
bo.payTypeKey AS carPurchaseKey,
bd.depositAll AS deposit,
bo.nodeState AS saleOrderState,
DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
case bo.isInsurance
when 0 then '否'
when 1 then '是' end as insuranceInfo
FROM bus_sales_order bo
left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
<where>
${ew.sqlSegment}
</where>
</select>
<!--根据销售订单sid查询车型信息-->
<select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppModelInfo">
SELECT modelName AS model,
brandName AS brand,
guildPrice AS price
from bus_sales_order_model bm
where bm.salesOrderSid = #{saleOrderSid}
</select>
<!--App初始化销售订单单据信息-->
<select id="getBillInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderBillInfoVo">
SELECT customerSid,
customerName,
mobile AS customerMobile,
payTypeKey AS payType,
payType AS payValue,
billingTypeKey AS invoiceType,
billingType AS invoiceValue,
affiliatedCompany,
affiliatedCompany as affiliatedOrgSid
FROM bus_sales_order bo
WHERE bo.sid = #{saleOrderSid}
</select>
</mapper>

55
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@ -129,4 +129,59 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
public ResultBean revokeProcess(BusSalesOrderFlowDto dto) {
return busSalesOrderService.revokeProcess(dto);
}
@Override
@ApiOperation("初始化销售订单状态")
public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
ResultBean rb = ResultBean.fireFail();
AppBusSaleOrderStateVo vo = busSalesOrderService.saleOrderState(saleOrderSid);
return rb.success().setData(vo);
}
@Override
@ApiOperation("App销售订单分页列表")
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<AppBusSalesOrderVo> pv = busSalesOrderService.getSaleOrders(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("删除销售订单")
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
busSalesOrderService.deleteSaleOrder(saleOrderSid, userSid);
return rb.success();
}
@Override
@ApiOperation("App初始化销售订单单据信息")
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(saleOrderSid, userSid);
return rb.success().setData(vo);
}
@Override
@ApiOperation("App新增/修改销售订单单据")
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
return busSalesOrderService.saveBillInfo(dto);
}
@Override
@ApiOperation("App初始化销售订单 车型信息 需要详细沟通")
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
AppBusSaleOrderInitModelInfoVo vo = busSalesOrderService.getInitModelInfo(saleOrderSid, customerSid, userSid);
return rb.success().setData(vo);
}
@Override
@ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
ResultBean rb = ResultBean.fireFail();
AppBusSaleOrderInitModelInfoVo vo = busSalesOrderService.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
return rb.success().setData(vo);
}
}

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

@ -27,13 +27,23 @@ package com.yxt.anrui.buscenter.biz.bussalesorder;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclemodel.AppVehicleModelBySidVo;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto;
@ -69,11 +79,14 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -81,6 +94,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.HashMap;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -120,9 +135,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private BusDepositFictitiousService busDepositFictitiousService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
private FlowableFeign flowableFeign;
private FlowTaskFeign flowTaskFeign;
private SysFormLinkFeign sysFormLinkFeign;
@Autowired
private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BusVehicleOrderFeign busVehicleOrderFeign;
/**
* 构造查询条件
@ -547,6 +570,346 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return i;
}
/**
* 初始化销售订单状态
*
* @param saleOrderSid
* @return
*/
public AppBusSaleOrderStateVo saleOrderState(String saleOrderSid) {
AppBusSaleOrderStateVo vo = new AppBusSaleOrderStateVo();
//订单状态
BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
if (busSalesOrder != null) {
vo.setOrderInfoState(1);
} else {
vo.setOrderInfoState(0);
}
//车型状态
BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.selectOrderModelStateBySid(saleOrderSid);
if (busSalesOrderModelDetailsVo != null) {
vo.setModleInfoState(1);
vo.setModelSid(busSalesOrderModelDetailsVo.getModelSid());
vo.setModelName(busSalesOrderModelDetailsVo.getModelName());
} else {
vo.setModleInfoState(0);
}
//上装状态
if (StringUtils.isBlank(busSalesOrder.getIsTop())) {
vo.setTopInfoState(0);
} else if (busSalesOrder.getIsTop().equals("0")) { //否
vo.setTopInfoState(1);
vo.setTopName("无上装");
} else if (busSalesOrder.getIsTop().equals("1")) {//是
BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.selectOrderMakeupStateBySid(saleOrderSid);
if (busSalesOrderMakeupDetailsVo != null) {
if (StringUtils.isNotBlank(busSalesOrderMakeupDetailsVo.getTopName())) {
vo.setTopName(busSalesOrderMakeupDetailsVo.getTopName());
vo.setTopInfoState(1);
} else {
vo.setTopInfoState(0);
}
} else {
vo.setTopInfoState(1);
vo.setTopName("无上装");
}
}
//挂车状态
vo.setTrailerInfoState(1);
//订金状态
BusSalesOrderDepositDetailsVo busSalesOrderDepositDetailsVo = busSalesOrderDepositService.selectOrderDepositStateBySid(saleOrderSid);
if (busSalesOrderDepositDetailsVo != null) {
vo.setTrailerInfoState(1);
} else {
vo.setTrailerInfoState(0);
}
//保险说明状态
if (StringUtils.isBlank(busSalesOrder.getIsInsurance())) {
vo.setInsureInfoState(0);
} else if (busSalesOrder.getIsInsurance().equals("0")) { //否
vo.setInsureInfoState(1);
vo.setInsureName("不入保");
} else if (busSalesOrder.getIsInsurance().equals("1")) {//是
BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.selectOrderInsuranceStateBySid(saleOrderSid);
if (busSalesOrderInsuranceDetailsVo != null) {
if (StringUtils.isNotBlank(busSalesOrderInsuranceDetailsVo.getInsuranceName())) {
vo.setInsureName(busSalesOrderInsuranceDetailsVo.getInsuranceName());
vo.setInsureInfoState(1);
} else {
vo.setInsureInfoState(0);
}
} else {
vo.setInsureInfoState(1);
vo.setInsureName("不入保");
}
}
//金融方案状态
vo.setFinanceInfoState(1);
//补充说明状态
if (StringUtils.isNotBlank(busSalesOrder.getNotes())) {
vo.setRemarksStete(1);
vo.setRemarks(busSalesOrder.getNotes());
} else {
vo.setRemarksStete(0);
}
vo.setCustomerSid(busSalesOrder.getCustomerSid());
vo.setCustomerName(busSalesOrder.getCustomerName());
return vo;
}
/**
* 构造查询条件
*
* @param query 查询条件
* @return
*/
private QueryWrapper<BusSalesOrder> appCreateQueryWrapper(AppBusSalesOrderQuery query) {
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusSalesOrder> qw = new QueryWrapper<>();
if (query != null) {
//客户名称
if (StringUtils.isNotBlank(query.getName())) {
qw.like("bo.customerName", query.getName());
}
//订单类型
if (StringUtils.isNotBlank(query.getType())) {
qw.eq("bo.type", query.getType());
}
if (StringUtils.isNotBlank(query.getStaffSid())) {
qw.eq("bo.staffSid", query.getStaffSid());
}
}
return qw;
}
/**
* App销售订单分页列表
*
* @param pq
* @return
*/
public PagerVo<AppBusSalesOrderVo> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(pq.getParams().getUserSid()).getData();
pq.getParams().setStaffSid(data.getStaffSid());
QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapper(pq.getParams());
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw);
for (AppBusSalesOrderVo record : pagging.getRecords()) {
String saleOrderState = record.getSaleOrderState();
if (StringUtils.isNotBlank(saleOrderState)) {
record.setShowUpdateBtn(false);
record.setShowFinancialBtn(false);
record.setShowDeleteBtn(false);
}
if (saleOrderState.equals("审批完成")) {
record.setShowContractBtn(true);
} else {
record.setShowContractBtn(false);
}
int deposit = 0;
if (StringUtils.isNotBlank(record.getDeposit())) {
deposit = new Integer(record.getDeposit());
}
if (saleOrderState.equals("审批完成") || deposit <= 0) {
record.setShowApplyBtn(true);
} else {
record.setShowApplyBtn(false);
}
AppModelInfo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid());
if (appModelInfo == null) {
AppModelInfo modelInfo = new AppModelInfo();
record.setModelInfo(modelInfo);
} else {
record.setModelInfo(appModelInfo);
}
}
PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
/**
* App初始化销售订单单据信息
*
* @param saleOrderSid
* @param userSid
* @return
*/
public AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid, String userSid) {
AppBusSalesOrderBillInfoVo vo = baseMapper.getBillInfo(saleOrderSid);
String affiliatedOrgSid = vo.getAffiliatedOrgSid();
if (StringUtils.isNotBlank(affiliatedOrgSid)) {
vo.setAffiliatedType("1");
vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
} else {
vo.setAffiliatedType("2");
vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
}
vo.setUserSid(userSid);
vo.setSaleOrderSid(saleOrderSid);
return vo;
}
/**
* App初始化销售订单单据信息
*
* @param dto
* @return
*/
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(dto.getUserSid())) {
return rb.fail().setMsg("用户sid不能为空");
}
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
if (StringUtils.isBlank(dto.getSaleOrderSid())) { //订单sid为空新增
BusSalesOrder busSalesOrder = new BusSalesOrder();
busSalesOrder.setCustomerName(dto.getCustomerName());
busSalesOrder.setMobile(dto.getCustomerMobile());
busSalesOrder.setPayType(dto.getPayValue());
busSalesOrder.setPayTypeKey(dto.getPayType());
busSalesOrder.setBillingType(dto.getInvoiceValue());
busSalesOrder.setBillingTypeKey(dto.getInvoiceType());
busSalesOrder.setStaffName(data.getStaffName());
busSalesOrder.setStaffSid(data.getStaffSid());
busSalesOrder.setOrgName(data.getOrgName());
busSalesOrder.setOrgSid(data.getOrgSid());
String affiliatedType = dto.getAffiliatedType();
if (affiliatedType.equals("1")) {
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
} else if (affiliatedType.equals("2")) {
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
}
save(busSalesOrder);
} else { //订单sid不为空修改
BusSalesOrder busSalesOrder = new BusSalesOrder();
busSalesOrder.setCustomerName(dto.getCustomerName());
busSalesOrder.setMobile(dto.getCustomerMobile());
busSalesOrder.setPayType(dto.getPayValue());
busSalesOrder.setPayTypeKey(dto.getPayType());
busSalesOrder.setBillingType(dto.getInvoiceValue());
busSalesOrder.setBillingTypeKey(dto.getInvoiceType());
String affiliatedType = dto.getAffiliatedType();
if (affiliatedType.equals("1")) {
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
} else if (affiliatedType.equals("2")) {
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
}
updateById(busSalesOrder);
}
return rb.success();
}
public AppBusSaleOrderInitModelInfoVo getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
List<AppReadyCarList> appReadyCar = new ArrayList<>();
List<AppNowCarList> appNowCars = new ArrayList<>();
AppOrderInfo orderInfo = new AppOrderInfo();
AppOrderInfo appOrderInfo = busSalesOrderModelService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
orderInfo.setNotice("提示");
orderInfo.setModelSid(appOrderInfo.getModelSid());
orderInfo.setModelName(appOrderInfo.getModelName());
orderInfo.setConfigSid(appOrderInfo.getConfigSid());
orderInfo.setCommonlyConfig(appOrderInfo.getCommonlyConfig());
orderInfo.setMoreConfig(appOrderInfo.getMoreConfig());
orderInfo.setModelName(appOrderInfo.getModelName());
//现车
List<AppNowCarList> appNowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
BeanUtil.copyProperties(appNowCarList, appNowCars);
orderInfo.setNowCarList(appNowCars);
//排产
List<AppReadyCarList> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
BeanUtil.copyProperties(appReadyCarList, appReadyCar);
orderInfo.setReadyCarList(appReadyCarList);
vo.setOrderInfo(orderInfo);
AppCarInfo carInfo = new AppCarInfo();
List<AppReadyCar> readyCars = new ArrayList<>();
carInfo.setReadyCar(readyCars);
List<AppNowCar> nowCars = new ArrayList<>();
carInfo.setNowCar(nowCars);
vo.setCarInfo(carInfo);
return vo;
}
public AppBusSaleOrderInitModelInfoVo getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
AppOrderInfo orderInfo = new AppOrderInfo();
AppCarInfo appCarInfo = new AppCarInfo();
List<AppNowCar> appNowCars = new ArrayList<>();
List<AppReadyCar> appReadyCar = new ArrayList<>();
List<AppNowCarList> appNowCarLists = new ArrayList<>();
List<AppReadyCarList> appReadyCarLists = new ArrayList<>();
AppNowCar appNowCar = null;
ResultBean<AppCarConfigSummaryVo> appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary(modelSid, configSid, userSid);
AppCarConfigSummaryVo data = appCarConfigSummaryVoResultBean.getData();
//现车
List<AppVinsDetailsVo> appNowCarVos = baseVehicleFeign.getVins(modelSid, configSid).getData();
//排产
List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData();
orderInfo.setNotice("提示");
orderInfo.setModelSid(modelSid);
orderInfo.setModelName(data.getModel());
orderInfo.setConfigSid(configSid);
orderInfo.setCommonlyConfig(data.getConfig());
orderInfo.setMoreConfig(data.getMoreConfig());
orderInfo.setModelName(special);
orderInfo.setNowCarList(appNowCarLists);
orderInfo.setReadyCarList(appReadyCarLists);
//现车
if (appNowCarVos.size() > 0) {
for (AppVinsDetailsVo appNowCarVo : appNowCarVos) {
appNowCar = new AppNowCar();
appNowCar.setCarSid(appNowCarVo.getCarSid());
appNowCar.setAddress(appNowCarVo.getAddress());
appNowCar.setVin(appNowCarVo.getVin());
appNowCars.add(appNowCar);
appCarInfo.setNowCar(appNowCars);
}
} else {
appCarInfo.setNowCar(appNowCars);
}
//排产
BeanUtil.copyProperties(appReadyCar, appOrderReadyCars);
vo.setCarInfo(appCarInfo);
vo.setOrderInfo(orderInfo);
appCarInfo.setReadyCar(appReadyCar);
return vo;
}
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
ResultBean rb = ResultBean.fireFail();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData().getStaffSid();
BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
if (busSalesOrder.getStaffSid().equals(staffSid)) {
return rb.fail().setMsg("该订单不是当前用户所属订单,不能删除");
}
deleteBySid(saleOrderSid);
return rb.success();
}
/**
* 删除/批量删除销售订单
*

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java

@ -66,6 +66,8 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
BusSalesOrderDeposit selectByOrderSid(String sid);
BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(@Param("saleOrderSid") String saleOrderSid);
/**
* 根据销售订单sid查询订金信息
*

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@ -24,6 +24,13 @@
from bus_sales_order_discount
where salesOrderSid = #{sid}
</select>
<select id="selectOrderDepositStateBySid"
resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo">
SELECT *
FROM bus_sales_order_deposit
WHERE salesOrderSid = #{sid}
</select>
<!--根据销售订单sid查询订金信息-->
<select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo">
select sid,

11
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@ -114,4 +114,15 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
public int deleteByOrderSid(String sid) {
return baseMapper.deleteByOrderSid(sid);
}
/**
* 查询销售订单订金状态
*
* @param saleOrderSid
* @return
*/
public BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(String saleOrderSid) {
return baseMapper.selectOrderDepositStateBySid(saleOrderSid);
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java

@ -66,6 +66,8 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderIn
int deleteByOrderSid(String sid);
BusSalesOrderInsuranceDetailsVo selectOrderInsuranceStateBySid(@Param("saleOrderSid") String saleOrderSid);
/**
* 根据销售订单sid查询保险信息
*

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml

@ -19,6 +19,12 @@
${ew.sqlSegment}
</where>
</select>
<select id="selectOrderInsuranceStateBySid"
resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo">
SELECT *
FROM bus_sales_order_insurance
WHERE salesOrderSid = #{sid}
</select>
<delete id="deleteByOrderSid">
delete

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java

@ -92,4 +92,14 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
public BusSalesOrderInsuranceDetailsVo details(String sid) {
return baseMapper.details(sid);
}
/**
* 查询销售订单保险状态
*
* @param saleOrderSid
* @return
*/
public BusSalesOrderInsuranceDetailsVo selectOrderInsuranceStateBySid(String saleOrderSid) {
return baseMapper.selectOrderInsuranceStateBySid(saleOrderSid);
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@ -72,6 +72,8 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
*/
int deleteBySalesOrderSid(String sid);
BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(@Param("saleOrderSid") String saleOrderSid);
/**
* 根据销售订单sid查询销售订单的上装配置
*

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@ -18,6 +18,14 @@
${ew.sqlSegment}
</where>
</select>
<select id="selectOrderMakeupStateBySid"
resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo">
SELECT *
FROM bus_sales_order_makeup
WHERE salesOrderSid = #{sid}
</select>
<!--根据销售订单删除该销售订单的上装配置-->
<delete id="deleteBySalesOrderSid">
delete

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@ -104,4 +104,14 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
public BusSalesOrderMakeupDetailsVo details(String sid) {
return baseMapper.details(sid);
}
/**
* 查询销售订单上装信息状态
*
* @param saleOrderSid
* @return
*/
public BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(String saleOrderSid) {
return baseMapper.selectOrderMakeupStateBySid(saleOrderSid);
}
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo;
@ -66,6 +67,9 @@ public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel>
BusSalesOrderModel selectBySalesSid(String sid);
BusSalesOrderModelDetailsVo selectOrderModelStateBySid(@Param("saleOrderSid") String saleOrderSid);
/**
* 根据销售订单sid查询销售订单主车车型信息
*

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@ -24,6 +24,13 @@
from bus_sales_order_model
where salesOrderSid = #{sid}
</select>
<select id="selectOrderModelStateBySid"
resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo">
select *
from bus_sales_order_model
where salesOrderSid = #{sid}
</select>
<!--根据销售订单sid查询主车车型信息-->
<select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo">
select modelSid,

27
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.AppOrderInfo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -113,4 +114,30 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
public int deleteByOrderSid(String sid) {
return baseMapper.deleteByOrderSid(sid);
}
public AppOrderInfo selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
BusSalesOrderModel busSalesOrderModel = baseMapper.selectBySalesSid(saleOrderSid);
AppOrderInfo appOrderInfo = new AppOrderInfo();
if (busSalesOrderModel != null) {
appOrderInfo.setModelSid(busSalesOrderModel.getModelSid());
appOrderInfo.setModelName(busSalesOrderModel.getModelName());
appOrderInfo.setConfigSid(busSalesOrderModel.getModelConfigSid());
appOrderInfo.setCommonlyConfig(busSalesOrderModel.getConfig());
appOrderInfo.setMoreConfig(busSalesOrderModel.getMoreConfig());
appOrderInfo.setModelName(busSalesOrderModel.getModelName());
return appOrderInfo;
} else {
return new AppOrderInfo();
}
}
/**
* 查询销售订单车型状态
*
* @param saleOrderSid
* @return
*/
public BusSalesOrderModelDetailsVo selectOrderModelStateBySid(String saleOrderSid) {
return baseMapper.selectOrderModelStateBySid(saleOrderSid);
}
}

17
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@ -28,13 +28,17 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCar;
import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCarList;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -107,4 +111,17 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
public int deleteByOrderSid(String sid) {
return baseMapper.deleteByOrderSid(sid);
}
public List<AppNowCarList> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(saleOrderSid);
List<AppNowCarList> appNowCars = new ArrayList<>();
for (BusSalesOrderVehicle busSalesOrderVehicle : stringList) {
AppNowCarList appNowCar = new AppNowCarList();
appNowCar.setCarSid(busSalesOrderVehicle.getLinkSid());
appNowCar.setVin(busSalesOrderVehicle.getLinkNo());
appNowCar.setAddress(busSalesOrderVehicle.getLinkText());
appNowCars.add(appNowCar);
}
return appNowCars;
}
}

16
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@ -28,6 +28,8 @@ package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCar;
import com.yxt.anrui.buscenter.api.bussalesorder.AppReadyCarList;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -35,6 +37,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -114,4 +117,17 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
public int deleteByOrderSid(String sid) {
return baseMapper.deleteByOrderSid(sid);
}
public List<AppReadyCarList> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(saleOrderSid);
List<AppReadyCarList> appReadyCar = new ArrayList<>();
for (BusSalesVehicleOrder busSalesVehicleOrder : stringList) {
AppReadyCarList appReadyCarList = new AppReadyCarList();
appReadyCarList.setOrderId(busSalesVehicleOrder.getLinkNo());
appReadyCarList.setSid(busSalesVehicleOrder.getLinkSid());
appReadyCarList.setDate(busSalesVehicleOrder.getLinkText());
appReadyCar.add(appReadyCarList);
}
return appReadyCar;
}
}

33
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppOrderCrmVehicleDemandVo.java

@ -0,0 +1,33 @@
package com.yxt.anrui.crm.api.crmvehicledemand;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppOrderCrmVehicleDemandVo implements Vo {
@ApiModelProperty("意向sid")
private String sid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("销售指导价")
private String guidancePrice;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("品牌名称")
private String brandName;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("特殊情况说明")
private String specialExplain;
}

98
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@ -0,0 +1,98 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderFeign.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign <br/>
* Description: 销售订单主表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-27 13:39:04 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "销售订单主表")
@FeignClient(
contextId = "anrui-buscenter-BusSalesOrder",
name = "anrui-buscenter",
path = "/autoservice/v1/saleOrders",
fallback = BusSalesOrderFeignFallback.class)
public interface AppBusSalesOrderFeign {
/*-------------------------------------App销售订单接口------------------------------------------------*/
@ApiOperation("初始化销售订单状态")
@GetMapping("/init/saleOrderState/{saleOrderSid}")
@ResponseBody
public ResultBean<AppBusSaleOrderStateVo> saleOrderState(@PathVariable("saleOrderSid") String saleOrderSid);
@ApiOperation("App销售订单分页列表")
@PostMapping("/getSaleOrders")
@ResponseBody
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(@RequestBody PagerQuery<AppBusSalesOrderQuery> pq);
@ApiOperation("删除销售订单")
@DeleteMapping("/deleteSaleOrder/{saleOrderSid}/{userSid}")
@ResponseBody
public ResultBean deleteSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
@ApiOperation("初始化销售订单单据信息")
@GetMapping("/init/billInfo/{saleOrderSid}/{userSid}")
@ResponseBody
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
@ApiOperation("新增/修改销售订单单据")
@PostMapping("/save/billInfo")
@ResponseBody
public ResultBean saveBillInfo(@Valid @RequestBody AppBusSalesOrderAllDto dto);
@ApiOperation("初始化销售订单 车型信息")
@GetMapping("/init/modelInfo")
@ResponseBody
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("customerSid") String customerSid, @RequestParam("userSid") String userSid);
@ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
@GetMapping("/init/modelInfo2")
@ResponseBody
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid,
@RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
}

84
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@ -0,0 +1,84 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback <br/>
* Description: 销售订单主表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-27 13:39:04 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
@Override
public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
return null;
}
@Override
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
return null;
}
@Override
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
return null;
}
@Override
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
return null;
}
@Override
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
return null;
}
@Override
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
return null;
}
@Override
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
return null;
}
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDeposit.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDeposit.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositDto.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.common.core.dto.Dto;

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeign.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java

@ -1,4 +1,4 @@
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
@ -16,13 +16,11 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-buscenter(车辆订单) <br/>
@ -45,6 +43,8 @@ import java.util.Map;
fallback = AppBusMainDepositFeignFallback.class)
public interface AppBusMainDepositFeign {
/*******************************************************虚拟订单接口*********************************************************************/
@ApiOperation("虚拟订单列表")
@PostMapping("/getVirtualOrders")
public ResultBean<PagerVo<AppBusMainDepositVo>> getVirtualOrders(@RequestBody PagerQuery<AppBusMainDepositPageQuery> pagerQuery);

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositFeignFallback.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
@ -35,14 +35,15 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositFlowTask;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-buscenter(车辆订单) <br/>

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositPageQuery.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositPageQuery.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.common.core.query.Query;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositPageVo.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositPageVo.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.common.core.vo.Vo;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositQuery.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositQuery.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.common.core.query.Query;

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/AppBusMainDepositVo.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositVo.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice;
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.common.core.vo.Vo;

16
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositRest.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice;
package com.yxt.anrui.terminal.biz.autoservice.virtualOrders;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
@ -36,19 +36,21 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositFlowTask;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
import com.yxt.anrui.terminal.api.autoservice.AppBusMainDepositFeign;
import com.yxt.anrui.terminal.api.autoservice.AppBusMainDepositPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositFeign;
import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositPageQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-buscenter(车辆订单) <br/>
@ -64,8 +66,8 @@ import java.util.Map;
* @since 1.0
*/
@Api(tags = "销售虚拟订单")
@RestController("com.yxt.anrui.terminal.biz.autoservice.AppBusMainDepositRest")
@RequestMapping("autoservice/v1/virtualOrders")
@RestController
@RequestMapping("/autoservice/v1/virtualOrders")
public class AppBusMainDepositRest implements AppBusMainDepositFeign {
@Autowired

84
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/AppBusMainDepositService.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice;
package com.yxt.anrui.terminal.biz.autoservice.virtualOrders;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
@ -32,7 +32,8 @@ import com.yxt.anrui.buscenter.api.busdeposit.*;
import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
import com.yxt.anrui.buscenter.api.busmaindeposit.*;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
import com.yxt.anrui.terminal.api.autoservice.AppBusMainDepositPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositPageQuery;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -70,6 +71,9 @@ public class AppBusMainDepositService {
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
/**
* 虚拟定单列表查询接口
*
@ -270,4 +274,80 @@ public class AppBusMainDepositService {
ResultBean resultBean = busMainDepositFeign.stopReserveCar(appBusMainDepositFlowTask);
return resultBean;
}
/************************************* 销售订单接口 *********************************************/
/**
* App销售订单分页列表
*
* @param pq
* @return
*/
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
ResultBean resultBean = busSalesOrderFeign.getSaleOrders(pq);
return resultBean;
}
/**
* 初始化销售订单单据信息
*
* @param saleOrderSid
* @param userSid
* @return
*/
public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
ResultBean resultBean = busSalesOrderFeign.getBillInfo(saleOrderSid, userSid);
return resultBean;
}
/**
* 新增/修改销售订单单据
*
* @param dto
* @return
*/
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
ResultBean resultBean = busSalesOrderFeign.saveBillInfo(dto);
return resultBean;
}
/**
* 初始化销售订单 车型信息
*
* @param saleOrderSid
* @param customerSid
* @param userSid
* @return
*/
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
ResultBean resultBean = busSalesOrderFeign.getInitModelInfo(saleOrderSid, customerSid, userSid);
return resultBean;
}
/**
* 初始化销售订单(第一次选择或重选) 车型信息
*
* @param special
* @param customerSid
* @param userSid
* @param modelSid
* @param configSid
* @return
*/
public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
return resultBean;
}
/**
* 删除销售订单
*
* @param saleOrderSid
* @param userSid
* @return
*/
public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
ResultBean resultBean = busSalesOrderFeign.deleteSaleOrder(saleOrderSid, userSid);
return resultBean;
}
}
Loading…
Cancel
Save