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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
e34a416256 33c39f41be
commit
1bb26fc996
8 changed files with 87 additions and 7 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. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java
  2. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  3. 24
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  4. 34
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
  5. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  6. 18
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  7. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  8. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java
View File

@ -37,6 +37,7 @@ public class BaseVehicleStateEnum {
*/
CKKP_STATE_1("401", "待出库"),
CKKP_STATE_2("402", "出库中"),
CKKP_STATE_3("403", "出库申请保存"),
JC_STATE_1("501", "待准备"),
JC_STATE_2("502", "待交车"),
JC_STATE_3("503", "已交车"),
@ -66,6 +67,8 @@ public class BaseVehicleStateEnum {
DDBA_SUBMIT("1", "订单提交"),
DDBA_PASS("2", "订单审核通过"),
CKKP_PASS("3", "出库开票审核通过"),
CKKP_SAVE("17", "出库申请保存"),
CKKP_DELETE("18", "出库申请修改"),
JC_PASS("4", "交车审核通过"),
BUS_STOP("5", "业务终止"),
DDBA_SAVEVIN("6", "录入车架号"),

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
View File

@ -91,6 +91,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
}else if(BaseVehicleStateEnum.OperateTypeEnum.JCTJ.getTypeKey().equals(operateType)){
//交车提交后，则更新小状态为503已交车
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JC_STATE_3.getStateKey());
}else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey().equals(operateType)){
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_3.getStateKey());
}else if(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey().equals(operateType)){
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
}
baseMapper.updateById(baseVehicleState);
}else{

24
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -369,6 +369,18 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (busDeliveredApply == null) {
return rb.setMsg("该申请不存在");
}
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(dtoSid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey());
baseVehicleStateDto.setBusSid(v);
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
if (dtoList.size() > 0) {
busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
@ -507,6 +519,18 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}*/
if (sidsList.size() > 0) {
for (int i = 0; i < sidsList.size(); i++) {
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sidsList.get(i));
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey());
baseVehicleStateDto.setBusSid(v);
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));
busDeliveredUseMessageService.deleteByApplySid(sidsList.get(i));
busDeliveredDetailsDiscountService.deleteByApplySid(sidsList.get(i));

34
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
View File

@ -28,7 +28,11 @@ package com.yxt.anrui.buscenter.biz.busdeliveredapplydetails;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.*;
@ -43,13 +47,16 @@ import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleServ
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 org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.*;
/**
* Project: anrui-buscenter(业务管理) <br/>
@ -78,6 +85,8 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
private BusSalesOrderVehicleService busSalesOrderVehicleService;
@Autowired
private BusDeliveredApplyService busDeliveredApplyService;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
private QueryWrapper<BusDeliveredApplyDetails> createQueryWrapper(BusDeliveredApplyDetailsQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -158,6 +167,31 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
}
}
}
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
List<String> vinSidList = selectVinSidByApplySid(sid);
vinSidList.removeAll(Collections.singleton(null));
if (!vinSidList.isEmpty()) {
vinSidList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
baseVehicleStateDto.setBusSid(v);
stateDtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
/**

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -740,6 +740,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
@Transactional(rollbackFor = Exception.class)
public ResultBean<String> saveDepositInfo(AppBusDepositBuscenterDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
if(dto.getDeposit().compareTo(BigDecimal.ZERO) == 0){
return rb.setMsg("订金不允许为0");
}
SysUserVo data = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
String useOrgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) {

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

@ -595,10 +595,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
BigDecimal totalValue = new BigDecimal("0");
for (BusSalesOrderDiscountDetailsVo busSalesOrderDiscountDetailsVo : busSalesOrderDiscountDetailsVoList) {
totalValue = totalValue.add(new BigDecimal(busSalesOrderDiscountDetailsVo.getTotalValue()));
if (busSalesOrderDiscountDetailsVoList.size() != 0) {
for (BusSalesOrderDiscountDetailsVo busSalesOrderDiscountDetailsVo : busSalesOrderDiscountDetailsVoList) {
totalValue = totalValue.add(new BigDecimal(busSalesOrderDiscountDetailsVo.getTotalValue()));
}
}
if (StringUtils.isNotBlank(totalValue.toString())) {
if (StringUtils.isNotBlank(totalValue.toString()) && !"0".equals(totalValue.toString())) {
if (busSalesOrderPriceDetailsVo != null) {
BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()),2, BigDecimal.ROUND_CEILING);
bigDecimalSing = bigDecimalSing.add(discountA);
@ -4948,6 +4950,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public void saveContract(OrderContractQuery orderContractQuery) {
String sid = orderContractQuery.getSid();
String userSid = orderContractQuery.getUserSid();
BusSalesOrder busSalesOrder = fetchBySid(sid);
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
//查询销售订单的车型信息
@ -5027,8 +5030,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit()));
commonContract.setCustomerType(appOrderDetailsVo.getCustomerType());
commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
commonContractFeign.saveContract(commonContract);
baseMapper.updateContractNoBySid(commonContract.getContractNo(), sid);
if(StringUtils.isBlank(busSalesOrder.getContractNo())){
commonContractFeign.saveContract(commonContract);
baseMapper.updateContractNoBySid(commonContract.getContractNo(), sid);
}else{
commonContract.setContractNo(busSalesOrder.getContractNo());
}
ResultBean<List<FinUncollectedReceivablesDetailed>> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo());
List<FinUncollectedReceivablesDetailed> finUncollectedReceivablesDetailedList = listResultBean.getData();
if (finUncollectedReceivablesDetailedList.size() == 0) {

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -691,6 +691,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum);
busSalesOrderService.updateById(busSalesOrder);
}else{
busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum);
busSalesOrderService.updateById(busSalesOrder);
List<AppBusSalesOrderVehicleDto> nowCarList = orderInfo.getNowCarList();
busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid);
num = nowCarList.size();

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -541,8 +541,9 @@
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
left JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
<!-- left join fin_selected_receivables_detailed fd on fd.collSid = fa.sid-->
WHERE fa.`nodeState` != '终止'<!-- and fd.auditState = 3-->
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = 3
GROUP BY d.`sid`) d

Write Preview
Loading…
Cancel
Save