Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
1652d89fa8
  1. 28
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AddRetrievalApplyDto.java
  2. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java
  3. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java
  4. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml
  5. 109
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  6. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml
  7. 116
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  8. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java
  9. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  10. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  11. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  12. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  13. 37
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java
  14. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
  15. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
  16. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java
  17. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
  18. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

28
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AddRetrievalApplyDto.java

@ -0,0 +1,28 @@
package com.yxt.anrui.buscenter.api.busdelivered;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AddRetrievalApplyDto implements Dto {
private static final long serialVersionUID = -8809397255849039931L;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty(value = "车型别名")
private String modelName;
@ApiModelProperty(value = "联系电话")
private String mobile;
@ApiModelProperty(value = "证件号码")
private String idNo;
@ApiModelProperty(value = "联系地址")
private String address;
@ApiModelProperty(value = "成交价")
private String price;
}

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java

@ -33,6 +33,8 @@ 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: BusDeliveredFeign.java <br/>
@ -89,4 +91,8 @@ public interface BusDeliveredFeign {
@ResponseBody
public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(@RequestBody AppDeliveredDetailsQuery query);
@ApiOperation("移动端-欠款提车推送待出库")
@PostMapping("/addRetrievalApply")
@ResponseBody
public ResultBean addRetrievalApply(@Valid @RequestBody AddRetrievalApplyDto dto);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java

@ -79,4 +79,9 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign {
public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
return null;
}
@Override
public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) {
return null;
}
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml

@ -62,7 +62,10 @@
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and customerName,contractNo LIKE concat('%'
and concat(IFNULL(contractNo
, '')
, ifnull(customerName
, '')) LIKE concat('%'
, #{name}
, '%')
</if>

109
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@ -49,6 +49,9 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finbillapplication.AddInvoicedApplyDto;
import com.yxt.anrui.fin.api.finbillapplication.AppVinListDto;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -128,6 +131,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
private CommonContractFeign commonContractFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private FinBillApplicationFeign finBillApplicationFeign;
public PagerVo<BusAdvanceGinvoiceapply> listPage(PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
BusAdvanceGinvoiceapplyQuery query = pq.getParams();
@ -717,6 +722,26 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
appMaps.put("contractSid", busAdvanceGinvoiceapply.getSid());
List<String> recipientSidList = new ArrayList<>();
//推送开票申请
AddInvoicedApplyDto addInvoicedApplyDto = new AddInvoicedApplyDto();
addInvoicedApplyDto.setApplyDate(busAdvanceGinvoiceapply.getApplyDate());
addInvoicedApplyDto.setContractNo(busAdvanceGinvoiceapply.getContractNo());
addInvoicedApplyDto.setCustomerName(busAdvanceGinvoiceapply.getCustomerName());
addInvoicedApplyDto.setBillTypeKey("001");
addInvoicedApplyDto.setBillTypeValue("欠款开票");
addInvoicedApplyDto.setUseOrgSid(busAdvanceGinvoiceapply.getUseOrgSid());
addInvoicedApplyDto.setCreateBySid(bv.getUserSid());
List<AppVinListDto> vinList = new ArrayList<>();
List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid());
for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
AppVinListDto appVinListDto = new AppVinListDto();
appVinListDto.setVIN(vehicleDetailsVo.getVinNo());
vinList.add(appVinListDto);
}
addInvoicedApplyDto.setVinList(vinList);
finBillApplicationFeign.addInvoicedApply(addInvoicedApplyDto);
// 风控中心风控内勤
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
@ -766,6 +791,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
public ResultBean InitiatorToAnswer(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
SysUserVo userVo = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(bv.getBusinessSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
@ -796,7 +822,90 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
if (!"Event_end".equals(ufVo.getTaskDefKey())) {
//极光推送
busAdvanceGinvoiceapply = fetchBySid(bv.getBusinessSid());
ufVo.setProcInsId(busAdvanceGinvoiceapply.getProcInstId());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcInsId(busAdvanceGinvoiceapply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("提前开票申请");
messageFlowableQuery.setMsgContent(busAdvanceGinvoiceapply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("提前开票申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
} else {
AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
Map<String, Object> appMaps = new HashMap<>();
appMaps.put("contractSid", busAdvanceGinvoiceapply.getSid());
List<String> recipientSidList = new ArrayList<>();
//推送开票申请
AddInvoicedApplyDto addInvoicedApplyDto = new AddInvoicedApplyDto();
addInvoicedApplyDto.setApplyDate(busAdvanceGinvoiceapply.getApplyDate());
addInvoicedApplyDto.setContractNo(busAdvanceGinvoiceapply.getContractNo());
addInvoicedApplyDto.setCustomerName(busAdvanceGinvoiceapply.getCustomerName());
addInvoicedApplyDto.setBillTypeKey("001");
addInvoicedApplyDto.setBillTypeValue("欠款开票");
addInvoicedApplyDto.setUseOrgSid(busAdvanceGinvoiceapply.getUseOrgSid());
addInvoicedApplyDto.setCreateBySid(bv.getUserSid());
List<AppVinListDto> vinList = new ArrayList<>();
List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid());
for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
AppVinListDto appVinListDto = new AppVinListDto();
appVinListDto.setVIN(vehicleDetailsVo.getVinNo());
vinList.add(appVinListDto);
}
addInvoicedApplyDto.setVinList(vinList);
finBillApplicationFeign.addInvoicedApply(addInvoicedApplyDto);
// 风控中心风控内勤
UserRoleQuery userRoleQuery1 = new UserRoleQuery();
userRoleQuery1.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
for (SysUserVo user : list1) {
recipientSidList.add(user.getSid());
}
// 分公司会计角色用户
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
userQuery.setOrgSidPath(bv.getOrgSidPath());
List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
for (SysUserVo user : list) {
recipientSidList.add(user.getSid());
}
//财务中心总经理角色用户
UserRoleQuery userRoleQuery3 = new UserRoleQuery();
userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
for (SysUserVo user : list3) {
recipientSidList.add(user.getSid());
}
//事业部运营经理角色用户
UserRoleQuery userRoleQuery2 = new UserRoleQuery();
userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
for (SysUserVo user : list2) {
recipientSidList.add(user.getSid());
}
query.setRecipientSidList(recipientSidList);
query.setAppMap(appMaps);
query.setMsgTitle("业务");
query.setMsgContent(userVo.getName() + "提交的提前开票申请,请查阅");
query.setMsgSource("业务");
query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
query.setApp_type("2");
query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
query.setName("业务");
// 消息推送
messageFeign.sendAutoserviceMessage(query);
}
return rb.success().setData(resultBean1.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@ -72,7 +72,10 @@
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and customerName,contractNo LIKE concat('%'
and concat(IFNULL(contractNo
, '')
, ifnull(customerName
, '')) LIKE concat('%'
, #{name}
, '%')
</if>

116
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -20,8 +20,11 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
import com.yxt.anrui.buscenter.api.busdelivered.AddRetrievalApplyDto;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService;
import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
@ -122,6 +125,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private BusDeliveredService busDeliveredService;
/**
* 欠款提车分页列表查询条件
*
@ -763,9 +769,29 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
List<String> recipientSidList = new ArrayList<>();
// 风控中心总经理角色用户
//推送出库申请
List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
if (vehicleDetailsVos.size() > 0) {
for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) {
AddRetrievalApplyDto addRetrievalApplyDto = new AddRetrievalApplyDto();
addRetrievalApplyDto.setVinNo(vehicleDetailsVo.getVinNo());
addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney()));
addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo());
addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName());
busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
}
}
// 风控中心风控经理
UserRoleQuery userRoleQuery1 = new UserRoleQuery();
userRoleQuery1.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
for (SysUserVo userVo : list4) {
recipientSidList.add(userVo.getSid());
}
// 风控中心风控内勤
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39");
userRoleQuery.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
for (SysUserVo userVo : list1) {
recipientSidList.add(userVo.getSid());
@ -812,6 +838,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
public ResultBean InitiatorToAnswerInfo(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
SysUserVo userVos = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
@ -842,7 +869,92 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (!resultBean1.getSuccess()) {
return rb.setMsg(resultBean1.getMsg());
}
UpdateFlowFieldVo ufVos = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
if (!"Event_end".equals(ufVos.getTaskDefKey())) {
//极光推送
busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVos, messageFlowVo);
ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("欠款提车申请");
messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("欠款提车申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
} else {
AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
Map<String, Object> appMaps = new HashMap<>();
appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
List<String> recipientSidList = new ArrayList<>();
//推送出库申请
List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
if (vehicleDetailsVos.size() > 0) {
for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) {
AddRetrievalApplyDto addRetrievalApplyDto = new AddRetrievalApplyDto();
addRetrievalApplyDto.setVinNo(vehicleDetailsVo.getVinNo());
addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney()));
addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo());
addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName());
busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
}
}
// 风控中心风控经理
UserRoleQuery userRoleQuery1 = new UserRoleQuery();
userRoleQuery1.setRoleSid("242d52de-7df9-4fab-91ff-d6f07dc98341");
List<SysUserVo> list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData();
for (SysUserVo userVo : list4) {
recipientSidList.add(userVo.getSid());
}
// 风控中心风控内勤
UserRoleQuery userRoleQuery2 = new UserRoleQuery();
userRoleQuery2.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4");
List<SysUserVo> list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData();
for (SysUserVo userVo : list1) {
recipientSidList.add(userVo.getSid());
}
// 分公司会计角色用户
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a");
userQuery.setOrgSidPath(bv.getOrgSidPath());
List<SysUserVo> list = sysUserFeign.getUserByRole(userQuery).getData();
for (SysUserVo userVo : list) {
recipientSidList.add(userVo.getSid());
}
//财务中心总经理角色用户
UserRoleQuery userRoleQuery3 = new UserRoleQuery();
userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155");
List<SysUserVo> list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData();
for (SysUserVo userVo : list3) {
recipientSidList.add(userVo.getSid());
}
//事业部运营经理角色用户
UserRoleQuery userRoleQuery4 = new UserRoleQuery();
userRoleQuery4.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725");
List<SysUserVo> list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery4).getData();
for (SysUserVo userVo : list2) {
recipientSidList.add(userVo.getSid());
}
query.setRecipientSidList(recipientSidList);
query.setAppMap(appMaps);
query.setMsgTitle("业务");
query.setMsgContent(userVos.getName() + "提交的欠款提车申请,请查阅");
query.setMsgSource("业务");
query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri());
query.setApp_type("2");
query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
query.setName("业务");
// 消息推送
messageFeign.sendAutoserviceMessage(query);
}
return rb.success().setData(resultBean1.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java

@ -109,4 +109,9 @@ public class BusDeliveredRest implements BusDeliveredFeign {
ResultBean<AppDeliveredDetailsVo> resultBean = busDeliveredService.getRetrievalApplyInfo(query);
return rb.setData(resultBean.getData());
}
@Override
public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) {
return busDeliveredService.addRetrievalApply(dto);
}
}

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@ -190,4 +190,12 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
vo.setCarList(appCarListVos);
return rb.success().setData(vo);
}
public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
BusDelivered busDelivered = new BusDelivered();
BeanUtil.copyProperties(dto, busDelivered);
save(busDelivered);
return rb.success();
}
}

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

@ -175,7 +175,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
List<String> getList(String saleOrderSid);
IPage<AppRovalContractPageVo> getApprovalContractList(IPage<AppRovalContractPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppRovalContractPageVo> qw);
IPage<AppRovalContractPageVo> getApprovalContractList(IPage<AppRovalContractPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppRovalContractPageVo> qw, @Param("name") String name);
List<AppRovalContractPageVo> selectByContractNo(@Param("contractNo") String contractNo);
}

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

@ -242,6 +242,14 @@
LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bo.contractNo
, '')
, ifnull(bo.customerName
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
and length(bo.contractNo) > 1
</where>
</select>

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

@ -2075,8 +2075,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//验证总订金是否正确
//结转金额是否超过订金合计、需补交金额是否是负数
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
if(busSalesOrderDeposit.getMakeUpDeposit() != null){
if(busSalesOrderDeposit.getMakeUpDeposit().compareTo(new BigDecimal("0"))<0){
if (busSalesOrderDeposit.getMakeUpDeposit() != null) {
if (busSalesOrderDeposit.getMakeUpDeposit().compareTo(new BigDecimal("0")) < 0) {
return rb.setMsg("订金信息存在错误,请检查");
}
}
@ -2789,7 +2789,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
qw.eq("bo.staffSid", sysUserVo.getStaffSid());
IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppRovalContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw);
IPage<AppRovalContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw, params.getName());
for (AppRovalContractPageVo record : iPage.getRecords()) {
String busSid = record.getBusSid();
CommonContractVo commonContract = commonContractFeign.getContractBySalesOrderSid(busSid).getData();

37
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java

@ -0,0 +1,37 @@
package com.yxt.anrui.fin.api.finbillapplication;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AddInvoicedApplyDto implements Dto {
private static final long serialVersionUID = -2942692578331132685L;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("申请日期")
private String applyDate;
@ApiModelProperty("开票类型key")
private String billTypeKey;
@ApiModelProperty("开票类型value")
private String billTypeValue;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("车辆集合")
private List<AppVinListDto> vinList;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java

@ -54,6 +54,8 @@ public class FinBillApplication extends BaseEntity {
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("合同sid")

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@ -156,4 +156,9 @@ public interface FinBillApplicationFeign {
@ResponseBody
public ResultBean saveInvoicedApplyInfo(@Valid @RequestBody AppBillApplicationIInfoDto dto);
@ApiOperation("提前开票推送接口")
@PostMapping("/addInvoicedApply")
@ResponseBody
public ResultBean addInvoicedApply(@Valid @RequestBody AddInvoicedApplyDto dto);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@ -125,4 +125,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) {
return null;
}
@Override
public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) {
return null;
}
}

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java

@ -155,4 +155,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) {
return finBillApplicationService.saveInvoicedApplyInfo(dto);
}
@Override
public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) {
return finBillApplicationService.addInvoicedApply(dto);
}
}

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -78,6 +78,7 @@ 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 io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -968,8 +969,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
IPage<AppBillApplicationPageVo> iPage = baseMapper.getInvoicedApplyList(page, qw);
List<AppBillApplicationPageVo> records = iPage.getRecords();
for (AppBillApplicationPageVo record : records) {
String contractSid = record.getContractSid();
SysUserVo data = sysUserFeign.fetchBySid(contractSid).getData();
String createBySid = record.getCreateBySid();
SysUserVo data = sysUserFeign.fetchBySid(createBySid).getData();
record.setApplyName(data.getName());
}
return iPage;
@ -1118,6 +1119,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
FinBillApplication finBillApplication = new FinBillApplication();
BeanUtil.copyProperties(dto, finBillApplication, "sid");
List<AppVinListDto> vinList = dto.getVinList();
for (AppVinListDto appVinListDto : vinList) {
FinBillVehicle finBillVehicle = new FinBillVehicle();
BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid");
finBillVehicle.setBillAppSid(finBillApplication.getSid());
finBillVehicleService.save(finBillVehicle);
}
finBillApplication.setNum(vinList.size());
save(finBillApplication);
return rb.success();
}
/* public ResultBean submitFinBillApplicationPageList(SubmitFinBillApplicationPageListDto dto) {
ResultBean rb = ResultBean.fireFail();

Loading…
Cancel
Save