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

返利凭证对接

master
fanzongzhe0036 5 months ago
parent
5038ad2ced
commit
48fafad6f3
17 changed files with 326 additions and 58 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. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
  3. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusOrderAndVehInfo.java
  4. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
  5. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
  6. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
  7. 9
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  8. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
  9. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  10. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  11. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  12. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
  13. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  14. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  15. 6
      anrui-scm/anrui-scm-biz/pom.xml
  16. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java
  17. 270
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
View File

@ -26,7 +26,6 @@
package com.yxt.anrui.buscenter.api.busdeliveredapply;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -35,7 +34,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.util.List;
@ -247,4 +245,8 @@ public interface BusDeliveredApplyFeign {
@ApiOperation("根据车辆sid和已办结流程状态查询是否为欠款出库")
@GetMapping("/selByVinSidAndYBJ/{vinSid}")
ResultBean<Integer> selByVinSidAndYBJ(@RequestParam("vinSid") String vinSid);
@ApiOperation("根据销售订单车辆sid查询客户sid")
@PostMapping("/selCustomerByBusVinSid")
ResultBean<String> selCustomerByBusVinSid(@RequestParam("busVinSid") String busVinSid);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
View File

@ -201,6 +201,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
return null;
}
@Override
public ResultBean<String> selCustomerByBusVinSid(String busVinSid) {
return null;
}
@Override
public ResultBean complete(BusDeliveredApplyCompleteDto query) {
return null;

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusOrderAndVehInfo.java
View File

@ -0,0 +1,11 @@
package com.yxt.anrui.buscenter.api.bussalesordervehicle;
import lombok.Data;
@Data
public class BusOrderAndVehInfo {
private String busVinSid; //销售订单车辆sid
private String orderSid; //销售订单sid
private String deptSid;//销售部门sid
}

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
View File

@ -33,7 +33,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Max;
import java.util.List;
/**
@ -152,7 +151,7 @@ public interface BusSalesOrderVehicleFeign {
@ApiOperation("根据销售订单sid和贷款人sid和贷款合同sid查车辆信息")
@PostMapping("/selectListByOrderSidAndDkrSidAndLoanContractSid")
@ResponseBody
ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid,@RequestParam("loanContractSid") String loanContractSid);
ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid, @RequestParam("loanContractSid") String loanContractSid);
@ApiOperation("根据销售订单sid和消贷合同sid查车辆信息")
@ -180,7 +179,7 @@ public interface BusSalesOrderVehicleFeign {
@ApiOperation("根据订单sid车架号查询")
@GetMapping("/selByOrderSidAndVinNo")
ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(@RequestParam("salesOrderSid")String salesOrderSid, @RequestParam("vinNo")String vinNo);
ResultBean<BusSalesOrderVehicle> selByOrderSidAndVinNo(@RequestParam("salesOrderSid") String salesOrderSid, @RequestParam("vinNo") String vinNo);
@ApiOperation("批量保存")
@PostMapping("/saveList")
@ -189,4 +188,8 @@ public interface BusSalesOrderVehicleFeign {
@ApiOperation("批量修改")
@PostMapping("/updateVehiclesList")
ResultBean updateVehiclesList(@RequestBody List<BusSalesOrderVehicle> updateVehicles);
@ApiOperation("根据车架号后八位关联查询车辆及订单信息")
@PostMapping("/selVehOrderInfoByVinNo")
ResultBean<BusOrderAndVehInfo> selVehOrderInfoByVinNo(@RequestParam("vinNo") String vinNo);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
View File

@ -188,4 +188,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
return null;
}
@Override
public ResultBean<BusOrderAndVehInfo> selVehOrderInfoByVinNo(String vinNo) {
return null;
}
}

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

@ -124,4 +124,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
int selectCountByVinSid(@Param("vinSid") String vinSid,@Param("contractNo") String contractNo);
int selByVinSidAndYBJ(String vinSid);
String selCustomerByBusVinSid(@Param("busVinSid") String busVinSid);
}

9
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
View File

@ -209,4 +209,13 @@
WHERE bdad.`vinSid` = #{vinSid}
AND bda.`nodeState` = '已办结'
</select>
<select id="selCustomerByBusVinSid" resultType="java.lang.String">
SELECT a.customerSid
FROM bus_delivered_apply_details as d
LEFT JOIN bus_delivered_apply as a ON d.applySid = a.sid
WHERE d.busVinSid = #{busVinSid}
AND a.nodeState = '已办结'
ORDER BY a.createTime DESC
LIMIT 1
</select>
</mapper>

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
View File

@ -272,6 +272,13 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
return busDeliveredApplyService.selByVinSidAndYBJ(vinSid);
}
@Override
public ResultBean<String> selCustomerByBusVinSid(String busVinSid) {
ResultBean rb = ResultBean.fireFail();
String customerSid = busDeliveredApplyService.selCustomerByBusVinSid(busVinSid);
return rb.success().setData(customerSid);
}
@Override
public ResultBean complete(BusDeliveredApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();

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

@ -4928,4 +4928,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
int i = baseMapper.selByVinSidAndYBJ(vinSid);
return rb.success().setData(i);
}
public String selCustomerByBusVinSid(String busVinSid) {
return baseMapper.selCustomerByBusVinSid(busVinSid);
}
}

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

@ -190,4 +190,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
int saveList(@Param("list") List<BusSalesOrderVehicle> list);
void updateVehiclesList(@Param("list") List<BusSalesOrderVehicle> list);
BusOrderAndVehInfo selVehOrderInfoByVinNo(@Param("vinNo") String vinNo);
}

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
View File

@ -420,4 +420,18 @@
where bv.`salesOrderSid` = #{salesOrderSid} and
bv.linkNo LIKE CONCAT( '%', #{vinNo}, '%' )
</select>
<select id="selVehOrderInfoByVinNo"
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo">
SELECT
bv.sid busVinSid,
o.sid orderSid,
o.orgSid deptSid
FROM
bus_sales_order_vehicle bv
LEFT JOIN bus_sales_order as o ON bv.salesOrderSid = o.sid
WHERE
bv.linkNo LIKE CONCAT('%',#{vinNo}, '%' ) AND o.nodeState = '已办结'
ORDER BY o.createTime DESC
LIMIT 1
</select>
</mapper>

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
View File

@ -221,4 +221,9 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
busSalesOrderVehicleService.updateVehiclesList(updateVehicles);
return rb.success();
}
@Override
public ResultBean<BusOrderAndVehInfo> selVehOrderInfoByVinNo(String vinNo) {
return busSalesOrderVehicleService.selVehOrderInfoByVinNo(vinNo);
}
}

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
View File

@ -29,26 +29,19 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basetrailer.TrailerVo;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo;
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.commoncontract.ContractPageVo;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
@ -71,7 +64,6 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* Project: anrui-buscenter(业务管理) <br/>
@ -682,4 +674,11 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
public void updateVehiclesList(List<BusSalesOrderVehicle> updateVehicles) {
baseMapper.updateVehiclesList(updateVehicles);
}
public ResultBean<BusOrderAndVehInfo> selVehOrderInfoByVinNo(String vinNo) {
ResultBean rb = ResultBean.fireFail();
BusOrderAndVehInfo busOrderAndVehInfo = baseMapper.selVehOrderInfoByVinNo(vinNo);
return rb.success().setData(busOrderAndVehInfo);
}
}

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -305,7 +305,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
resultDetails.add(dto1);
}
} else {
}
if (voucherDetail.getRemarks().equals("返利上传")) {
if (voucherDetail.getSceneCode().equals("1161.01.16")) {
Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传");
@ -316,8 +317,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
resultDetails.add(dto1);
}
if (voucherDetail.getSceneCode().equals("1161.02.15") ||
voucherDetail.getSceneCode().equals("1161.01.15") ||
voucherDetail.getSceneCode().equals("1161.04.00")) {
voucherDetail.getSceneCode().equals("1161.01.15") ||
voucherDetail.getSceneCode().equals("1161.04.00")) {
Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传");
dto1.setSubjectNo(voucherDetail.getSceneCode());
@ -326,6 +327,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
resultDetails.add(dto1);
}
}
if (voucherDetail.getRemarks().equals("预留费用调整")) {
if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
dto1.setSummary(voucherDetail.getTimeFlag() + "返利上传预留费用调整");
@ -344,6 +348,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
resultDetails.add(dto1);
}
}
}
newVoucher.setResultDetails(resultDetails);
}

6
anrui-scm/anrui-scm-biz/pom.xml
View File

@ -83,7 +83,11 @@
<artifactId>message-center-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<artifactId>anrui-crm-api</artifactId>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java
View File

@ -50,7 +50,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
})
@EnableFeignClients(basePackages = {"com.yxt.anrui.buscenter",
"com.yxt.anrui.portal","com.yxt.anrui.flowable","com.yxt.anrui.base"
,"com.yxt.anrui.fin","com.yxt.messagecenter"})
,"com.yxt.anrui.fin","com.yxt.messagecenter", "com.yxt.anrui.crm"})
public class AnruiScmApplication {
public static void main(String[] args) {

270
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
View File

@ -31,6 +31,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@ -89,6 +94,10 @@ import java.util.stream.Collectors;
@Service
public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehrebateCheckapplyMapper, ScmVehrebateCheckapply> {
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private BusDeliveredApplyFeign busDeliveredApplyFeign;
@Autowired
ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
@Autowired
@ -109,6 +118,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
public PagerVo<ScmVehrebateCheckapplyVo> listPageVo(PagerQuery<ScmVehrebateCheckapplyQuery> pq) {
ScmVehrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmVehrebateCheckapply> qw = new QueryWrapper<>();
@ -417,6 +428,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
}
scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
}
pushVehRebateWithVoucher(bv.getBusinessSid(),"0"); //推送返利核对凭证
}
return rb.success().setData(resultBean.getData());
} else {
@ -426,17 +439,18 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
/**
* 推送单车返利核对凭证
*
* @param sid,tag (0代表核对申请通过推送，1代表重推功能)
*/
public void pushVehRebateWithVoucher(String sid,String tag) {
public void pushVehRebateWithVoucher(String sid, String tag) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar=Calendar.getInstance();
int month=calendar.get(Calendar.MONTH);
calendar.set(Calendar.MONTH, month-1);
Calendar calendar = Calendar.getInstance();
int month = calendar.get(Calendar.MONTH);
calendar.set(Calendar.MONTH, month - 1);
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
Date endTime = calendar.getTime();//上个月最后一天
String format = sdf.format(endTime);
String summaryTag = "";//摘要前缀
String summaryTag = "";//摘要前缀
ScmVehrebateCheckapply entity = fetchBySid(sid);
if (null != entity) {
if (StringUtils.isNotBlank(entity.getCheckApply())) {
@ -480,8 +494,25 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
if (StringUtils.isNotBlank(vehicle.getManufacturerCode())) {
gysCode = vehicle.getManufacturerCode();
}
vinCode = vehicle.getVinNo().substring(vehicle.getVinNo().length() - 8);
}
BusOrderAndVehInfo vehInfo = busSalesOrderVehicleFeign.selVehOrderInfoByVinNo(vinCode).getData();
if (null != vehInfo) {
String deptSid = vehInfo.getDeptSid();
SysOrganizationVo salesData = sysOrganizationFeign.fetchBySid(deptSid).getData();
if (null != salesData) {
salesDeptCode = salesData.getOrgCode();
}
String busVinSid = vehInfo.getBusVinSid();
String customerSid = busDeliveredApplyFeign.selCustomerByBusVinSid(busVinSid).getData();
if (StringUtils.isNotBlank(customerSid)) {
CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(customerSid).getData();
if (null != customerTemp) {
customerCode = customerTemp.getCustomerNo();
}
}
}
if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
String useOrgSid = rebate.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@ -489,50 +520,209 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
}
}
if (tag.equals("0")) {
if (!rebate.getRebateTypeValue().equals("金融贴息")) {
//确认调整时
if (rebate.getOnceCheckState().intValue() == 0) {
//没有进行过核对申请
if (StringUtils.isNotBlank(rebate.getUploadMoney())) {
//一次上传金额
BigDecimal oneMoney = new BigDecimal(rebate.getUploadMoney());
if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(oneMoney);
voucherDetails.add(voucherDetail);
// String palceGenDate = rebate.getPalceGenDate();
// String[] palceGenDateSplit = palceGenDate.split("-");
// String y2 = palceGenDateSplit[0];//所属年份
// if (y1.equals(y2)) {
// voucherDetail.setSceneCode("本年");
// } else {
// voucherDetail.setSceneCode("上年");
// }
}
BigDecimal yicifanli = BigDecimal.ZERO;//一次上传返利
BigDecimal yicidaizhifu= BigDecimal.ZERO;//一次待支付
BigDecimal yicidaiqueding = BigDecimal.ZERO;//一次待确定
// if (StringUtils.isNotBlank())
if (!rebate.getRebateTypeValue().equals("金融贴息")) {
if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) {
//没有进行过核对申请
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
BigDecimal yicifanli = BigDecimal.ZERO;//一次应收返利返利
BigDecimal yicididing = BigDecimal.ZERO;//一次抵顶费用
if (StringUtils.isNotBlank(rebate.getUploadMoney())) {
oneMoney = new BigDecimal(rebate.getUploadMoney());
if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(oneMoney);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
}
if (null != rebate.getOnceSuppCost()) {
yicididing = rebate.getOnceSuppCost();
}
yicifanli = oneMoney.subtract(yicididing);
if (yicifanli.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yicifanli);
String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份
if (y1.equals(y2)) {
voucherDetail.setSceneCode("1161.01.15");
} else {
voucherDetail.setSceneCode("1161.02.15");
}
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
if (yicididing.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yicididing);
voucherDetail.setSceneCode("1161.04.00");
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
}
BigDecimal twoMoney = BigDecimal.ZERO;//二次次上传金额
BigDecimal ercifanli = BigDecimal.ZERO;//二次应收返利返利
BigDecimal ercididing = BigDecimal.ZERO;//二次抵顶费用
if (StringUtils.isNotBlank(rebate.getSecondaryUploadMoney())) {
twoMoney = new BigDecimal(rebate.getSecondaryUploadMoney());
if (twoMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(twoMoney);
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
}
if (null != rebate.getSecondSuppCost()) {
ercididing = rebate.getSecondSuppCost();
}
ercifanli = twoMoney.subtract(ercididing);
if (ercifanli.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(ercifanli);
String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份
if (y1.equals(y2)) {
voucherDetail.setSceneCode("1161.01.15");
} else {
voucherDetail.setSceneCode("1161.02.15");
}
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
if (ercididing.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(ercididing);
voucherDetail.setSceneCode("1161.04.00");
voucherDetail.setRemarks("返利上传");
voucherDetails.add(voucherDetail);
}
//确认调整时
if (StringUtils.isNotBlank(rebate.getIsAdjustment())) {
if (rebate.getIsAdjustment().equals("是")) {
if (StringUtils.isNotBlank(rebate.getAdjustmentMoney())) {
BigDecimal adMoney = new BigDecimal(rebate.getAdjustmentMoney());
if (adMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail1.setTimeFlag(finalSummaryTag);
voucherDetail1.setDeptCode(deptCode); //部门编码赋值
voucherDetail1.setManufacturer(gysCode);
voucherDetail1.setAmount(adMoney);
String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份
if (y1.equals(y2)) {
voucherDetail1.setSceneCode("1161.01.15");
} else {
voucherDetail1.setSceneCode("1161.02.15");
}
voucherDetail1.setRemarks("预留费用调整");
voucherDetails.add(voucherDetail1);
GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail2.setTimeFlag(finalSummaryTag);
voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
voucherDetail2.setAmount(adMoney);
voucherDetail2.setSceneCode("1161.04.00");
voucherDetail2.setRemarks("预留费用调整");
voucherDetails.add(voucherDetail2);
}
}
}
}
} else {
} else {
if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) {
//没有进行过核对申请
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
if (StringUtils.isNotBlank(rebate.getUploadMoney())) {
oneMoney = new BigDecimal(rebate.getUploadMoney());
if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(oneMoney);
voucherDetail.setRemarks("金融贴息");
voucherDetails.add(voucherDetail);
GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail2.setTimeFlag(finalSummaryTag);
voucherDetail2.setDeptCode(salesDeptCode); //部门编码赋值
voucherDetail2.setManufacturer(gysCode);
voucherDetail2.setCustomerCode(customerCode);
voucherDetail2.setMaterial(vinCode);
voucherDetail2.setAmount(oneMoney);
String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份
if (y1.equals(y2)) {
voucherDetail2.setSceneCode("1161.01.19");
} else {
voucherDetail2.setSceneCode("1161.02.19");
}
voucherDetail2.setRemarks("金融贴息");
voucherDetails.add(voucherDetail2);
}
}
}
BigDecimal twoMoney = BigDecimal.ZERO;//二次次上传金额
if (StringUtils.isNotBlank(rebate.getSecondaryUploadMoney())) {
twoMoney = new BigDecimal(rebate.getSecondaryUploadMoney());
if (twoMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(twoMoney);
voucherDetail.setRemarks("金融贴息");
voucherDetails.add(voucherDetail);
GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail2.setTimeFlag(finalSummaryTag);
voucherDetail2.setDeptCode(salesDeptCode); //部门编码赋值
voucherDetail2.setManufacturer(gysCode);
voucherDetail2.setCustomerCode(customerCode);
voucherDetail2.setMaterial(vinCode);
voucherDetail2.setAmount(twoMoney);
String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份
if (y1.equals(y2)) {
voucherDetail2.setSceneCode("1161.01.19");
} else {
voucherDetail2.setSceneCode("1161.02.19");
}
voucherDetail2.setRemarks("金融贴息");
voucherDetails.add(voucherDetail2);
}
}
}
if (tag.equals("1")) {
}
}
if (!voucherDetails.isEmpty()) {
generalVoucher.setVoucherDetails(voucherDetails);

Write Preview
Loading…
Cancel
Save