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

出库申请推送车辆利润报表

master
dimengzhe 4 weeks ago
parent
d8eadbbb83
commit
7ab3972328
7 changed files with 116 additions and 29 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. 10
      anrui-buscenter/anrui-buscenter-biz/pom.xml
  2. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java
  3. 69
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  4. 6
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
  5. 4
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java
  6. 6
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java
  7. 6
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java

10
anrui-buscenter/anrui-buscenter-biz/pom.xml
View File

@ -8,6 +8,11 @@
<version>0.0.1</version>
<relativePath/>
</parent>
<!-- <parent>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-buscenter</artifactId>
<version>0.0.1</version>
</parent>-->
<modelVersion>4.0.0</modelVersion>
@ -16,6 +21,11 @@
<version>0.0.1</version>
<dependencies>
<dependency>
<artifactId>anrui-reportcenter-api</artifactId>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yxt.messagecenter</groupId>
<artifactId>message-center-api</artifactId>

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java
View File

@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
})
@EnableScheduling
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin","com.yxt.anrui.scm"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin","com.yxt.anrui.scm","com.yxt.anrui.reportcenter"})
public class BusCenterApplication {
public static void main(String[] args) {

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

@ -145,6 +145,8 @@ 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.reportcenter.api.carsSoldProfit.CarsSoldProfitDto;
import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign;
import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine;
import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign;
@ -303,6 +305,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private CarsSoldProfitFeign carsSoldProfitFeign;
/**
* 构造出库申请的查询条件
*
@ -1184,6 +1189,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
Future future10 = pool.submit(() -> {
pushOtherDocument(busDeliveredApply, detailsList);
});
/*Future future13 = pool.submit(() -> {
pushCarSoldProfit(busDeliveredApply, detailsList);
});*/
//推送单车返利管理
String concatNo = busDeliveredApply.getContractNo();
BusSalesOrder busSalesOrder = busSalesOrderService.selectOrderByContractNo(concatNo).getData();
@ -1367,6 +1375,67 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
}
private void pushCarSoldProfit(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList) {
List<CarsSoldProfitDto> dtoList = new ArrayList<>();
detailsList.removeAll(Collections.singleton(null));
if(!detailsList.isEmpty()){
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
for (int i = 0; i < detailsList.size(); i++) {
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(busDeliveredApplyDetails.getVinSid()).getData();
CarsSoldProfitDto carsSoldProfitDto = new CarsSoldProfitDto();
carsSoldProfitDto.setStaffSid(busSalesOrder.getStaffSid());//销售专员
carsSoldProfitDto.setStaffName(busSalesOrder.getStaffName());
carsSoldProfitDto.setCustomerSid(busSalesOrder.getCustomerSid());
carsSoldProfitDto.setCustomerName(busSalesOrder.getCustomerName());
//金融服务费
//中介返利
//车辆台账中取
carsSoldProfitDto.setOrgSidPath(baseVehicle.getOrgSidPath());
//分公司
carsSoldProfitDto.setUseOrgSid(baseVehicle.getUseOrgSid());
carsSoldProfitDto.setUseOrgName(baseVehicle.getUseOrgName());
//销售日期
carsSoldProfitDto.setSaleDate(baseVehicle.getSalesDate());
//车架号
carsSoldProfitDto.setVinNo(baseVehicle.getVinNo());
//车型
carsSoldProfitDto.setVehModelSid(baseVehicle.getModelSid());
carsSoldProfitDto.setVehMConfigSid(baseVehicle.getModelConfigSid());
carsSoldProfitDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
carsSoldProfitDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
//入库价
//出库价
carsSoldProfitDto.setExStockPrice(baseVehicle.getContractPrice().toString());
//存放地点
carsSoldProfitDto.setLocationSid(baseVehicle.getLocation());
carsSoldProfitDto.setLocationName(baseVehicle.getLocationName());
//厂家结算价
carsSoldProfitDto.setMakersSettlementPrice(baseVehicle.getSettlePrice().toString());
//排产订单编号
//变速箱
//数据日期
carsSoldProfitDto.setCreateDate(new Date());
dtoList.add(carsSoldProfitDto);
}
}
if(!dtoList.isEmpty()){
ResultBean resultBean = carsSoldProfitFeign.saveOrUpdate(dtoList);
}
}
private void pushVehRebateAdjustBill(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList, SolutionsDetailsVo solutionsDetailsVo) {
BigDecimal cjtx = BigDecimal.ZERO;//厂家贴息
BigDecimal txdck = BigDecimal.ZERO;//贴息抵车款

6
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java
View File

@ -24,7 +24,7 @@ public class CarsSoldProfitDto {
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("销售日期")
private String saleDate;
private Date saleDate;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
@ -72,7 +72,7 @@ public class CarsSoldProfitDto {
@ApiModelProperty("变速箱")
private String gearbox;
@ApiModelProperty("数据日期")
private String createDate;
private Date createDate;
@ApiModelProperty("更新日期")
private String updateDate;
private Date updateDate;
}

4
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java
View File

@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -23,7 +25,7 @@ public interface CarsSoldProfitFeign {
@PostMapping("saveOrUpdate")
@ResponseBody
ResultBean saveOrUpdate(@RequestBody CarsSoldProfitDto dto);
ResultBean saveOrUpdate(@RequestBody List<CarsSoldProfitDto> dtoList);
@PostMapping("list")
@ResponseBody

6
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java
View File

@ -13,6 +13,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;
/**
* @description:
* @author: dimengzhe
@ -27,8 +29,8 @@ public class CarsSoldProfitRest implements CarsSoldProfitFeign {
private CarsSoldProfitService carsSoldProfitService;
@Override
public ResultBean saveOrUpdate(CarsSoldProfitDto dto) {
return carsSoldProfitService.saveProfit(dto);
public ResultBean saveOrUpdate(List<CarsSoldProfitDto> dtoList) {
return carsSoldProfitService.saveProfit(dtoList);
}
@Override

6
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
View File

@ -34,8 +34,10 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
@Autowired
private SysUserFeign sysUserFeign;
public ResultBean saveProfit(CarsSoldProfitDto dto) {
public ResultBean saveProfit(List<CarsSoldProfitDto> dtoList) {
ResultBean rb = ResultBean.fireFail();
for (int i = 0; i < dtoList.size(); i++) {
CarsSoldProfitDto dto = dtoList.get(i);
CarsSoldProfit carsSoldProfit = baseMapper.selectByVinSid(dto.getVinSid());
if (carsSoldProfit != null) {
//预计毛利
@ -60,6 +62,8 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
BeanUtil.copyProperties(dto, carsSoldProfit);
baseMapper.insert(carsSoldProfit);
}
}
return rb.success();
}

Write Preview
Loading…
Cancel
Save