|
|
|
@ -116,6 +116,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.UserQuery; |
|
|
|
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; |
|
|
|
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
@ -123,9 +124,7 @@ 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 com.yxt.messagecenter.api.message.MessageFeign; |
|
|
|
import com.yxt.messagecenter.api.message.MessageFlowVo; |
|
|
|
import com.yxt.messagecenter.api.message.MessageFlowableQuery; |
|
|
|
import com.yxt.messagecenter.api.message.*; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.tomcat.util.threads.ThreadPoolExecutor; |
|
|
|
import org.slf4j.Logger; |
|
|
|
@ -861,7 +860,23 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
}); |
|
|
|
//推送合格证管理员站内信提醒有待移交的合格证，同时自动更改出库车辆的合格证移交状态为“待移交”。
|
|
|
|
//ToDo:合格证管理员、随车资料管理员、发票管理员创建并查询该角色的用户推送消息有待移交的资料等等。
|
|
|
|
|
|
|
|
/* Future future6 = pool.submit(() -> { |
|
|
|
//合格证管理员
|
|
|
|
List<String> recipientSidList = new ArrayList<>(); |
|
|
|
UserQuery userQuery = new UserQuery(); |
|
|
|
userQuery.setRoleSid("7846bb61-34e2-44e5-92da-279245308e53"); |
|
|
|
userQuery.setOrgSidPath(bv.getOrgSidPath()); |
|
|
|
recipientSidList = sysUserFeign.getUserSidByRole(userQuery).getData(); |
|
|
|
PushMessageQuery pushMessageQuery = new PushMessageQuery(); |
|
|
|
pushMessageQuery.setReceivedSids(recipientSidList); |
|
|
|
pushMessageQuery.setMsgTitle("业务"); |
|
|
|
pushMessageQuery.setMsgContent("有待移交的合格证，请查看"); |
|
|
|
pushMessageQuery.setApp_type("2"); |
|
|
|
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); |
|
|
|
// 消息推送
|
|
|
|
messageFeign.pushNoUriMessage(pushMessageQuery); |
|
|
|
}); |
|
|
|
*/ |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
log.error("推送数据失败=========================" + e.getMessage()); |
|
|
|
@ -913,7 +928,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
}*/ |
|
|
|
//更改申请的状态为待审核2
|
|
|
|
baseMapper.updateStateBySid(2, bv.getBusinessSid()); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
.setNameFormat("demo-pool-%d").build(); |
|
|
|
@ -998,14 +1013,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
appBusHandoverPrepareVehicleDto.setSubscription(busDelivered.getSubscription()); |
|
|
|
appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());*/ |
|
|
|
BaseVehicleState baseVehicleState = baseMapper.selectByBusVinSid(busSalesOrderVehicle.getSid()); |
|
|
|
if(baseVehicleState != null){ |
|
|
|
if(StringUtils.isNotBlank(baseVehicleState.getCarryVehicleState()) && "1".equals(baseVehicleState.getCarryVehicleState())){ |
|
|
|
if (baseVehicleState != null) { |
|
|
|
if (StringUtils.isNotBlank(baseVehicleState.getCarryVehicleState()) && "1".equals(baseVehicleState.getCarryVehicleState())) { |
|
|
|
//欠款提车
|
|
|
|
appBusHandoverPrepareVehicleDto.setSubscription("欠款提车"); |
|
|
|
appBusHandoverPrepareVehicleDto.setSubscriptionKey("0001"); |
|
|
|
|
|
|
|
}else{ |
|
|
|
if(StringUtils.isNotBlank(baseVehicleState.getFinState()) && "1".equals(baseVehicleState.getFinState())){ |
|
|
|
} else { |
|
|
|
if (StringUtils.isNotBlank(baseVehicleState.getFinState()) && "1".equals(baseVehicleState.getFinState())) { |
|
|
|
appBusHandoverPrepareVehicleDto.setSubscription("正常交款"); |
|
|
|
appBusHandoverPrepareVehicleDto.setSubscriptionKey("0002"); |
|
|
|
|
|
|
|
@ -1930,7 +1945,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
busDeliveredApplyDetails.setVinSid(appCarListVo.getVinSid()); |
|
|
|
busDeliveredApplyDetails.setApplySid(busDeliveredApply.getSid()); |
|
|
|
//根据合同编号和车架号查询busVinSId
|
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid()); |
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(), appCarListVo.getVinSid()); |
|
|
|
busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid()); |
|
|
|
BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer(); |
|
|
|
busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin()); |
|
|
|
@ -2109,7 +2124,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer(); |
|
|
|
busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin()); |
|
|
|
//根据合同编号和车架号查询busVinSId
|
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid()); |
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(), appCarListVo.getVinSid()); |
|
|
|
busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid()); |
|
|
|
//赠送套餐
|
|
|
|
BigDecimal discountAll = BigDecimal.ZERO; |
|
|
|
@ -2268,13 +2283,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid()); |
|
|
|
//查询该车辆是否有挂车
|
|
|
|
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo()); |
|
|
|
if(trailerList.getData() != null){ |
|
|
|
if (trailerList.getData() != null) { |
|
|
|
if (trailerList.getData().getList().isEmpty()) { |
|
|
|
appCarListVo.setShowHandCarBtn(false); |
|
|
|
} else { |
|
|
|
appCarListVo.setShowHandCarBtn(true); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
appCarListVo.setShowHandCarBtn(false); |
|
|
|
} |
|
|
|
|
|
|
|
@ -2318,14 +2333,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
List<AppCarListVo> carList = dto.getCarList(); |
|
|
|
if (!carList.isEmpty()) { |
|
|
|
List<String> vinNoLists = new ArrayList<>(); |
|
|
|
List<String> vinSidLists = baseMapper.selectSid(dto.getContractId(),dto.getSid()); |
|
|
|
List<String> vinSidLists = baseMapper.selectSid(dto.getContractId(), dto.getSid()); |
|
|
|
//判断合同编号是否一致
|
|
|
|
for (int a = 0; a < carList.size(); a++) { |
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractId(), carList.get(a).getVinSid()); |
|
|
|
if (busSalesOrderVehicle == null) { |
|
|
|
return rb.setMsg("所选车辆与合同编号不匹配"); |
|
|
|
} |
|
|
|
if(vinSidLists.contains(carList.get(a).getVinSid())){ |
|
|
|
if (vinSidLists.contains(carList.get(a).getVinSid())) { |
|
|
|
vinNoLists.add(carList.get(a).getVinSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2335,9 +2350,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
if (!vinNoList.isEmpty()) { |
|
|
|
return rb.setMsg(String.join(",", vinNoList) + "已提交或已出库"); |
|
|
|
} |
|
|
|
if(!vinNoLists.isEmpty()){ |
|
|
|
vinNoLists = baseMapper.selectBySid(dto.getContractId(),vinNoLists); |
|
|
|
if(!vinNoLists.isEmpty()){ |
|
|
|
if (!vinNoLists.isEmpty()) { |
|
|
|
vinNoLists = baseMapper.selectBySid(dto.getContractId(), vinNoLists); |
|
|
|
if (!vinNoLists.isEmpty()) { |
|
|
|
return rb.setMsg(String.join(",", vinNoLists) + "已发起过出库流程"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2352,7 +2367,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
//根据discountSid查询已通过或已提交的申请的赠送套餐的数量
|
|
|
|
int count = busDeliveredDetailsDiscountService.selectGiveNumBySid(busDeliveredDetailsDiscountsVo.getDiscountSid()); |
|
|
|
int giveNum = count + busDeliveredDetailsDiscountsVo.getDiscountNum(); |
|
|
|
giveNumBySid = giveNumBySid+busDeliveredDetailsDiscountsVo.getDiscountNum(); |
|
|
|
giveNumBySid = giveNumBySid + busDeliveredDetailsDiscountsVo.getDiscountNum(); |
|
|
|
if (busSalesOrderDiscount.getNum() < giveNum) { |
|
|
|
return rb.setMsg("车辆赠送的优惠包已超出"); |
|
|
|
} |
|
|
|
@ -2377,7 +2392,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
if (isTrue) { |
|
|
|
//是否存在未赠送的套餐，如果存在则不允许提交
|
|
|
|
int num = baseMapper.selectNumByContractNo(dto.getContractId()); |
|
|
|
num = num+giveNumBySid; |
|
|
|
num = num + giveNumBySid; |
|
|
|
int orderNum = busSalesOrderDiscountService.selectByContractNo(dto.getContractId()); |
|
|
|
if (orderNum > num) { |
|
|
|
return rb.setMsg("本次出库为该订单最后一批出库，还存在未赠送的套餐，不允许提交"); |
|
|
|
@ -2602,7 +2617,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); |
|
|
|
//根据合同号和车辆sid查询车辆
|
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid); |
|
|
|
if(busSalesOrderVehicle != null){ |
|
|
|
if (busSalesOrderVehicle != null) { |
|
|
|
deliveredFinVo.setVinNo(busSalesOrderVehicle.getLinkNo()); |
|
|
|
deliveredFinVo.setPaymentMethod(appOrderDetailsVo.getPayType()); |
|
|
|
deliveredFinVo.setContractNo(contractNo); |
|
|
|
|
dimengzhe
2 years ago