yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

小程序销售订单列表按照最新需求调整查询当前客户下已办结销售订单完成 

小程序销售订单列表增加经销商返回字段完成
创建客户时自动创建客户账号
客户基础信息返回基础信息是否完善和身份证信息是否完善返回字段完成
master
God 10 months ago
parent
2ad9f74032
commit
d8c814e2b9
14 changed files with 210 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  2. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java
  3. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
  4. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  5. 163
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  6. 10
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  7. 4
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
  8. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
  9. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java
  10. 28
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
  11. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  12. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
  13. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
  14. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
View File

@ -403,4 +403,11 @@ public interface BusSalesOrderFeign {
@PostMapping("/saveList")
@ResponseBody
void saveList(@RequestBody() List<BusSalesOrder> orders);
/**********************************************小程序订单列表********************************************************/
@ApiOperation("小程序销售订单分页列表")
@PostMapping("/getSaleOrdersWx")
@ResponseBody
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersWx(@RequestBody PagerQuery<AppBusSalesOrderQuery> pq);
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java
View File

@ -63,7 +63,4 @@ public class AppBusSalesOrderQuery implements Query {
private String staffSid;
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
View File

@ -53,6 +53,9 @@ import lombok.Data;
public class AppBusSalesOrderVo implements Vo {
private static final long serialVersionUID = -5570433499942792774L;
@ApiModelProperty("经销商")
private String dealer;
/**
* 销售订单sid
*/

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
View File

@ -456,4 +456,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
public void saveList(List<BusSalesOrder> orders) {
busSalesOrderService.saveList(orders);
}
@Override
public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersWx(PagerQuery<AppBusSalesOrderQuery> pq) {
ResultBean<PagerVo<AppBusSalesOrderVo>> rb = ResultBean.fireFail();
PagerVo<AppBusSalesOrderVo> pv = busSalesOrderService.getSaleOrdersWx(pq);
return rb.success().setData(pv);
}
}

163
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -430,7 +430,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
/***************************车型信息***************************************/
AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
if (modelInfo != null) {
if (modelInfo.getModelName().contains("牵引车")){
if (modelInfo.getModelName().contains("牵引车")) {
vo.setIsGc(true);
}
//若前端传值的订单类型为0则为现车，为1采购订单，为2排产
@ -481,11 +481,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
/*************************************************挂车信息*****************************************************/
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
if (busSalesOrderTrailerDetailsVos.size() == 1){
if (busSalesOrderTrailerDetailsVos.size() == 1) {
BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0);
BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid());
String certFile = busSalesOrderTrailer.getCertFile();
if (StringUtils.isNotBlank(certFile)){
if (StringUtils.isNotBlank(certFile)) {
String[] certFiles = certFile.split(",");
List<BusSalesOrderTrailerFile> certFiless = new ArrayList<>();
for (String path : certFiles) {
@ -497,7 +497,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSalesOrderTrailerDetailsVo.setCertFile(certFiless);
}
String contractFile = busSalesOrderTrailer.getContractFile();
if (StringUtils.isNotBlank(contractFile)){
if (StringUtils.isNotBlank(contractFile)) {
String[] contractFiles = contractFile.split(",");
List<BusSalesOrderTrailerFile> contractFiless = new ArrayList<>();
for (String path : contractFiles) {
@ -509,12 +509,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
}
vo.setGc1(busSalesOrderTrailerDetailsVo);
}else if (busSalesOrderTrailerDetailsVos.size() == 2){
} else if (busSalesOrderTrailerDetailsVos.size() == 2) {
//挂车1
BusSalesOrderTrailerDetailsVo gc1 = busSalesOrderTrailerDetailsVos.get(0);
BusSalesOrderTrailer gcst1 = busSalesOrderTrailerService.fetchBySid(gc1.getSid());
String certFile1 = gcst1.getCertFile();
if (StringUtils.isNotBlank(certFile1)){
if (StringUtils.isNotBlank(certFile1)) {
String[] certFiles1 = certFile1.split(",");
List<BusSalesOrderTrailerFile> certFiless1 = new ArrayList<>();
for (String path : certFiles1) {
@ -526,7 +526,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
gc1.setCertFile(certFiless1);
}
String contractFile1 = gcst1.getContractFile();
if (StringUtils.isNotBlank(contractFile1)){
if (StringUtils.isNotBlank(contractFile1)) {
String[] contractFiles1 = contractFile1.split(",");
List<BusSalesOrderTrailerFile> contractFiless1 = new ArrayList<>();
for (String path : contractFiles1) {
@ -541,7 +541,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusSalesOrderTrailerDetailsVo gc2 = busSalesOrderTrailerDetailsVos.get(1);
BusSalesOrderTrailer gcst2 = busSalesOrderTrailerService.fetchBySid(gc2.getSid());
String certFile2 = gcst2.getCertFile();
if (StringUtils.isNotBlank(certFile2)){
if (StringUtils.isNotBlank(certFile2)) {
String[] certFiles2 = certFile2.split(",");
List<BusSalesOrderTrailerFile> certFiless2 = new ArrayList<>();
for (String path : certFiles2) {
@ -553,7 +553,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
gc2.setCertFile(certFiless2);
}
String contractFile2 = gcst1.getContractFile();
if (StringUtils.isNotBlank(contractFile2)){
if (StringUtils.isNotBlank(contractFile2)) {
String[] contractFiles2 = contractFile2.split(",");
List<BusSalesOrderTrailerFile> contractFiless2 = new ArrayList<>();
for (String path : contractFiles2) {
@ -709,9 +709,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
/*************************************************价格信息*****************************************************/
BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(entity.getSid());
if (StringUtils.isNotBlank(busSalesOrderPriceDetailsVo.getPlannedPickUpLocationKey())){
if (StringUtils.isNotBlank(busSalesOrderPriceDetailsVo.getPlannedPickUpLocationKey())) {
ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(busSalesOrderPriceDetailsVo.getPlannedPickUpLocationKey()).getData();
if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())) {
busSalesOrderPriceDetailsVo.setPlannedPickUpLocation(busSalesOrderPriceDetailsVo.getPlannedPickUpLocation() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
}
}
@ -778,12 +778,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(sid);
if (busSalesOrderMakeupDetailsVo != null) {
String topPrice = busSalesOrderMakeupDetailsVo.getTopPrice();
if(StringUtils.isNotBlank(topPrice)){
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderPriceDetailsVo.setTopPrice(topPrice);
}else {
} else {
busSalesOrderPriceDetailsVo.setTopPrice("0");
}
}else {
} else {
busSalesOrderPriceDetailsVo.setTopPrice("0");
}
vo.setBusSalesOrderPrice(busSalesOrderPriceDetailsVo);
@ -1961,9 +1961,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setUserSid(busSalesOrder.getCreateBySid());
vo.setProcInsId(busSalesOrder.getProcInstId());
vo.setTaskId(busSalesOrder.getTaskId());
if(StringUtils.isBlank(busSalesOrder.getCompanyInvoicingSid())){
if (StringUtils.isBlank(busSalesOrder.getCompanyInvoicingSid())) {
vo.setOrderInfoState(0);
}else{
} else {
vo.setOrderInfoState(1);
}
//车型状态
@ -1979,15 +1979,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setVehicleFunctionKey(selectDetails.getData().getVehicleType());
}
}
if (busSalesOrderModelDetailsVo.getModelName().contains("牵引车")){
if (busSalesOrderModelDetailsVo.getModelName().contains("牵引车")) {
vo.setTrailerState(true);
int i = busSalesOrderTrailerService.fetchByOrderSid(saleOrderSid);
if (i > 0){
if (i > 0) {
vo.setTrailerInfoState(1);
}else {
} else {
vo.setTrailerInfoState(0);
}
}else {
} else {
vo.setTrailerState(false);
vo.setTrailerInfoState(0);
}
@ -2150,6 +2150,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return qw;
}
/**
* 构造查询条件
*
* @param query 查询条件
* @return
*/
private QueryWrapper<BusSalesOrder> appCreateQueryWrapperWx(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.getUserSid())) {
SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData();
qw.eq("bo.customerSid", crmCustomerTempVo.getSid());
}
qw.eq("bo.nodeState", "已办结");
}
return qw;
}
/**
* App销售订单分页列表
*
@ -2510,9 +2530,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
if (!busSalesOrder.getPayTypeKey().equals(dto.getPayTypeKey())) {
isTrue = true;
}else{
if("2".equals(busSalesOrder.getPayTypeKey())){//贷款
if(!busSalesOrder.getFinancePlan().equals(dto.getFinancePlan())){
} else {
if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
if (!busSalesOrder.getFinancePlan().equals(dto.getFinancePlan())) {
issTrue = true;
}
}
@ -3345,7 +3365,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (busSalesOrder == null) {
return rb.setMsg("该销售订单单据不存在");
}
if(StringUtils.isBlank(busSalesOrder.getCompanyInvoicingSid())){
if (StringUtils.isBlank(busSalesOrder.getCompanyInvoicingSid())) {
return rb.setMsg("请完善单据信息");
}
//车型信息、价格信息、订金信息是否全部完善
@ -3890,7 +3910,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<AppOrderTrailerInfoVo> appOrderTrailerInfoVos = new ArrayList<>();
for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo();
BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile");
BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo, appOrderTrailerInfoVo, "contractFile", "certFile");
List<BusSalesOrderTrailerFile> contractFile = busSalesOrderTrailerDetailsVo.getContractFile();
List<BusSalesOrderTrailerFile> certFile = busSalesOrderTrailerDetailsVo.getCertFile();
ArrayList<String> contractFileString = new ArrayList<>();
@ -3909,9 +3929,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) {
AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i);
if (appOrderTrailerInfoVos.size() == 1){
if (appOrderTrailerInfoVos.size() == 1) {
appOrderTrailerInfoVo.setTrailerName("挂车");
}else {
} else {
appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1));
}
}
@ -3922,21 +3942,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (vo.getModelInfo() != null) {
priceInfo.setTransactionPrice(vo.getModelInfo().getPrice());
}
if (StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())){
if (StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())) {
ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())) {
priceInfo.setAddress(priceInfo.getAddress() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
}
}
if (appOrderTrailerInfoVos.size() == 1){
if (appOrderTrailerInfoVos.size() == 1) {
priceInfo.setGcOneConPrice(appOrderTrailerInfoVos.get(0).getSingleFinalPrice().toString());
priceInfo.setGcOneCount(appOrderTrailerInfoVos.get(0).getTrailerCount().toString());
}else if (appOrderTrailerInfoVos.size() == 2){
} else if (appOrderTrailerInfoVos.size() == 2) {
priceInfo.setGcOneConPrice(appOrderTrailerInfoVos.get(0).getSingleFinalPrice().toString());
priceInfo.setGcOneCount(appOrderTrailerInfoVos.get(0).getTrailerCount().toString());
priceInfo.setGcTwoConPrice(appOrderTrailerInfoVos.get(1).getSingleFinalPrice().toString());
priceInfo.setGcTwoCount(appOrderTrailerInfoVos.get(1).getTrailerCount().toString());
}else {
} else {
priceInfo.setGcOneConPrice("");
priceInfo.setGcOneCount("");
priceInfo.setGcTwoConPrice("");
@ -5213,7 +5233,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (busSalesOrder.get() == null) {
return rb.setMsg("该销售订单不存在");
}
if ("2".equals(busSalesOrder.get().getPayTypeKey())){
if ("2".equals(busSalesOrder.get().getPayTypeKey())) {
SolutionsDetailsVo data = loanSolutionsFeign.selectDetails(busSalesOrder.get().getSid()).getData();
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.get().getSid());
BigDecimal total = new BigDecimal("0");
@ -5221,10 +5241,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
total = total.add(datum.getSingleFinalPrice().multiply(new BigDecimal(datum.getTrailerCount())));
}
String trailerAmount = data.getTrailerAmount();
if (StringUtils.isBlank(trailerAmount)){
if (StringUtils.isBlank(trailerAmount)) {
trailerAmount = "0";
}
if (total.compareTo(new BigDecimal(trailerAmount)) != 0){
if (total.compareTo(new BigDecimal(trailerAmount)) != 0) {
return rb.setMsg("金融方案中挂车融资额与单台主车对应挂车成交价之和不一致，请检查!");
}
}
@ -5931,10 +5951,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.getSid());
//获取挂车金额
BigDecimal gcMoney = new BigDecimal("0");
if ("1".equals(busSalesOrder.getPayTypeKey())){
if (busSalesOrderTrailerDetailsVos.size() == 1){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
if (busSalesOrderTrailerDetailsVos.size() == 1) {
gcMoney = gcMoney.add(busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount())));
}else if (busSalesOrderTrailerDetailsVos.size() == 2){
} else if (busSalesOrderTrailerDetailsVos.size() == 2) {
BigDecimal gc1 = busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount()));
BigDecimal gc2 = busSalesOrderTrailerDetailsVos.get(1).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(1).getTrailerCount()));
gcMoney = gcMoney.add(gc1).add(gc2);
@ -6136,10 +6156,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.getSid());
//获取挂车金额
BigDecimal gcMoney = new BigDecimal("0");
if ("1".equals(busSalesOrder.getPayTypeKey())){
if (busSalesOrderTrailerDetailsVos.size() == 1){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
if (busSalesOrderTrailerDetailsVos.size() == 1) {
gcMoney = gcMoney.add(busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount())));
}else if (busSalesOrderTrailerDetailsVos.size() == 2){
} else if (busSalesOrderTrailerDetailsVos.size() == 2) {
BigDecimal gc1 = busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount()));
BigDecimal gc2 = busSalesOrderTrailerDetailsVos.get(1).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(1).getTrailerCount()));
gcMoney = gcMoney.add(gc1).add(gc2);
@ -7681,9 +7701,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//销售订单-挂车信息
List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(saleOrderSid);
if (null != busSalesOrderTrailerDetailsVos){
if (null != busSalesOrderTrailerDetailsVos) {
for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
if (null != busSalesOrderTrailerDetailsVo){
if (null != busSalesOrderTrailerDetailsVo) {
BusSalesOrderTrailer newBusSalesOrderTrailer = new BusSalesOrderTrailer();
String makeupSid = newBusSalesOrderTrailer.getSid();
Date makeupCreateTime = newBusSalesOrderTrailer.getCreateTime();
@ -8274,4 +8294,61 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public void saveList(List<BusSalesOrder> orders) {
baseMapper.saveList(orders);
}
public PagerVo<AppBusSalesOrderVo> getSaleOrdersWx(PagerQuery<AppBusSalesOrderQuery> pq) {
QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapperWx(pq.getParams());
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
for (AppBusSalesOrderVo record : pagging.getRecords()) {
record.setShowFinancialBtn(false);
record.setShowStopBtn(false);
record.setShowContractBtn(false);
record.setShowBorrowBtn(false);
record.setShowInputBtn(false);
record.setShowApplyBtn(false);
if (StringUtils.isBlank(record.getClosingDate())) {
record.setClosingDate("-");
}
if (StringUtils.isNotBlank(record.getCustomerImage())) {
record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
}
//已交定金
String deposit = "-";
BigDecimal depositBig = new BigDecimal("0");
if (StringUtils.isNotBlank(record.getDepositAll())) {
//需补交订金
if (StringUtils.isNotBlank(record.getMakeUpDeposit())) {
depositBig = new BigDecimal(record.getDepositAll()).subtract(new BigDecimal(record.getMakeUpDeposit()));
} else {
depositBig = new BigDecimal(record.getDepositAll());
}
//将已交订金转为string
deposit = depositBig.toString();
}
record.setDeposit(deposit);
//查询车型信息
AppModelInfoVo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid());
if (appModelInfo != null) {
if (StringUtils.isBlank(appModelInfo.getPrice())) {
appModelInfo.setPrice("-");
}
//根据车型查询车型图片
ResultBean imageString = baseVehicleModelAppendixFeign.selectImage(appModelInfo.getModelSid());
if (imageString.getSuccess()) {
appModelInfo.setCarImage(imageString.getData().toString());
}
record.setModelInfo(appModelInfo);
}
//是否保险
String insuranceInfo = record.getInsuranceInfo();
if (StringUtils.isBlank(insuranceInfo)) {
record.setInsuranceInfo("-");
}
if (StringUtils.isBlank(record.getSaleOrderState())) {
record.setSaleOrderState("待提交");
}
}
PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

10
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
View File

@ -43,10 +43,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.*;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -935,6 +932,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
}
commonAppendixFeign.saveCommonAppendix(visitSid, pcCommonAppendixDtoList);
}
//创建客户账号中
SysUserDto sysUserDto = new SysUserDto();
sysUserDto.setMobile(dto.getMobile());
sysUserDto.setUserType(2);
sysUserFeign.saveCustUser(sysUserDto);
return crmCustomerTemp;
}

4
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
View File

@ -56,6 +56,10 @@ public interface SysUserFeign {
@PostMapping("/save")
public ResultBean save(@Valid @RequestBody SysUserDto dto);
@ApiOperation("新增保存客户账号")
@PostMapping("/saveCustUser")
public ResultBean saveCustUser(@Valid @RequestBody SysUserDto dto);
@ApiOperation("根据staffSid删除用户（逻辑删除）")
@PostMapping("/delSysUserByMobile")
public ResultBean delSysUserByMobile(@RequestParam("sid") String sid);

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
View File

@ -50,6 +50,11 @@ public class SysUserFeignFallback implements SysUserFeign {
return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/save无法访问");
}
@Override
public ResultBean saveCustUser(SysUserDto dto) {
return null;
}
@Override
public ResultBean delSysUserByMobile(String sid) {
return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/delSysUserByMobile无法访问");

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java
View File

@ -24,4 +24,9 @@ public class WxHomePageVo implements Vo {
private Boolean isHave;
@ApiModelProperty(value = "客户sid")
private String staffSid;
@ApiModelProperty(value = "基础信息是否完善")
private Boolean base = true;
@ApiModelProperty(value = "身份证信息是否完善")
private Boolean idCard = false;
}

28
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
View File

@ -172,6 +172,34 @@ public class SysUserRest implements SysUserFeign {
return rb.success();
}
@Override
public ResultBean saveCustUser(SysUserDto dto) {
ResultBean rb = ResultBean.fireFail();
//手机号
String mobile = dto.getMobile();
//用户类型
int userType = dto.getUserType();
if (StringUtils.isBlank(mobile)) {
return new ResultBean<SysUserVo>().fail().setMsg("手机号不能为空");
} else {
SysUser one = sysUserService.fetchByUserName(mobile);
if (null != one) {
return new ResultBean<SysUserVo>().fail().setMsg("手机号重复!`");
}
}
if (userType == 0) {
return new ResultBean<SysUserVo>().fail().setMsg("用户类型不能为空");
}
String password = mobile.substring(5, 11);
String md5 = Encodes.md5(password);
SysUser su = new SysUser();
dto.fillEntity(su);
su.setUserName(mobile);
su.setPassword(md5);
sysUserService.save(su);
return rb.success();
}
@Override
public ResultBean delSysUserByMobile(String mobile) {
int i = sysUserService.delSysUserByMobile(mobile);

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
View File

@ -81,6 +81,13 @@ import java.util.List;
fallback = AppBusSalesOrderFeignFallback.class)
public interface AppBusSalesOrderFeign {
/*-------------------------------------小程序销售订单接口----------------------------------------------*/
@ApiOperation("小程序销售订单分页列表")
@PostMapping("/getSaleOrdersWx")
@ResponseBody
public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersWx(@RequestBody PagerQuery<BusOrderSalesQuery> pq);
/*-------------------------------------App销售订单接口------------------------------------------------*/
@ApiOperation("初始化销售订单状态")

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
View File

@ -15,6 +15,9 @@ import lombok.Data;
public class BusOrderSalesVo implements Vo {
private static final long serialVersionUID = 6162163732173109484L;
@ApiModelProperty("经销商")
private String dealer;
/**
* 销售订单sid
*/

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
View File

@ -83,6 +83,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
@Autowired
AppBusSalesOrderService appBusSalesOrderService;
/************************************ 小程序订单接口 *********************************************/
@Override
public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersWx(PagerQuery<BusOrderSalesQuery> pq) {
return appBusSalesOrderService.getSaleOrdersWx(pq);
}
/************************************* 销售订单接口 *********************************************/

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
View File

@ -1021,4 +1021,12 @@ public class AppBusSalesOrderService {
appSalesOrderTrailerDetailsVo.setContractFile(contractFiless);
return rb.success().setData(appSalesOrderTrailerDetailsVo);
}
public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersWx(PagerQuery<BusOrderSalesQuery> pagerQuery) {
ResultBean<PagerVo<BusOrderSalesVo>> rb = ResultBean.fireFail();
PagerQuery<AppBusSalesOrderQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppBusSalesOrderVo>> resultBean = busSalesOrderFeign.getSaleOrdersWx(pq);
PagerVo<BusOrderSalesVo> vo = CoverUtils.selectPagerVo(resultBean.getData());
return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo);
}
}
Write Preview
Loading…
Cancel
Save