luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches '0507' and 'release' of http://192.168.12.182/invoice/pt into 0507

Browse Source
release
yishiqihuasheng 2 years ago
parent 9fb7c065a3 6ddf899f17
commit 925768611e
14 changed files with 291 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java
  2. 22
      dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java
  3. 2
      dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java
  4. 1
      dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java
  5. 97
      dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
  6. 60
      dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java
  7. 39
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  8. 18
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
  9. 1
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java
  10. 3
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
  11. 44
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
  12. 2
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java
  13. 21
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
  14. 9
      pom.xml

4
dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java
Unescape View File

@ -173,7 +173,9 @@ public class LoginServiceImpl implements LoginService {
List<String> orgs = new ArrayList<>();
if (sysCompanyEntities != null && sysCompanyEntities.size() > 0){
for (SysCompanyEntity sysCompanyEntity : sysCompanyEntities) {
orgs.add(sysCompanyEntity.getCompanyCode());
if (sysCompanyEntity != null){
orgs.add(sysCompanyEntity.getCompanyCode());
}
}
}
log.info("封装的组织机构编码{}",orgs);

22
dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java
Unescape View File

@ -74,15 +74,25 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl<BaseTDxTaxCu
String selectStartDate = current.getSelectStartDate();
String selectEndDate = current.getSelectEndDate();
String operationEndDate = current.getOperationEndDate();
selectStartDate = LocalDate.parse(selectStartDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
selectEndDate = LocalDate.parse(selectEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
operationEndDate = LocalDate.parse(operationEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
if (StringUtils.isNotBlank(selectStartDate)){
selectStartDate = LocalDate.parse(selectStartDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
}
if (StringUtils.isNotBlank(selectEndDate)){
selectEndDate = LocalDate.parse(selectEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
}
if (StringUtils.isNotBlank(operationEndDate)){
operationEndDate = LocalDate.parse(operationEndDate, DateTimeFormatter.ofPattern("yyyyMMdd"))
.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
}
current.setSelectStartDate(selectStartDate);
current.setSelectEndDate(selectEndDate);
current.setOperationEndDate(operationEndDate);
}
JSONObject json = new JSONObject();
json.put("current", current);

2
dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java
Unescape View File

@ -128,6 +128,8 @@ public class InvoiceCheckVehicleDetailModel {
*/
private String taxRate;
private String taxCode;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column
* t_dx_check_vehicle_sale_invoice.tax_bureau_name

1
dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java
Unescape View File

@ -41,6 +41,7 @@ public class InvoiceDetailInfo extends BasePojo {
private String detailAmount;
private String taxRate;
private String taxCode;
private String taxAmount;

97
dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
Unescape View File

@ -403,6 +403,10 @@ public class CheckTaskServiceImpl implements CheckTaskService {
invoiceDetailInfo.setTxrqz(invoiceDetail.getTxrqz());
// 税率
invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate());
//山能项目 增加税码字段
if(invoiceDetail.getTaxRate() != null){
invoiceDetailInfo.setTaxCode(getZSM(invoiceDetail.getTaxRate()));
}
// 单位
invoiceDetailInfo.setUnit(invoiceDetail.getUnit());
// 金额
@ -417,6 +421,98 @@ public class CheckTaskServiceImpl implements CheckTaskService {
return invoiceDetailInfoList;
}
private String getZSM(String taxRate) {
String sm = "";
switch (taxRate) {
// 发票采集
case "0":
sm = "J0";
break;
case "不征税":
sm = "J0";
break;
case "0.00":
sm = "J0";
break;
case "0.000":
sm = "J0";
break;
case "免税":
sm = "J0";
break;
case "0.16":
sm = "J1";
break;
case "0.13":
sm = "J2";
break;
case "0.10":
sm = "J3";
break;
case "0.09":
sm = "J4";
break;
case "0.06":
sm = "J5";
break;
case "0.05":
sm = "J6";
break;
case "0.03":
sm = "J7";
break;
case "0.02":
sm = "J8";
break;
case "0.01":
sm = "J9";
break;
case "0.17":
sm = "JC";
break;
case "16":
sm = "J1";
break;
case "13":
sm = "J2";
break;
case "10":
sm = "J3";
break;
case "9":
sm = "J4";
break;
case "6":
sm = "J5";
break;
case "5":
sm = "J6";
break;
case "3":
sm = "J7";
break;
case "2":
sm = "J8";
break;
case "1.5":
sm = "JA";
break;
case "1":
sm = "J9";
break;
case "17":
sm = "JC";
break;
default:
sm = "";
break;
}
return sm;
}
/**
* 构建统计实体集
*
@ -627,6 +723,7 @@ public class CheckTaskServiceImpl implements CheckTaskService {
invoiceCheckVehicleDetailModel.setEngineNo(responseInvoice.getEngineNo());
invoiceCheckVehicleDetailModel.setVehicleNo(responseInvoice.getVehicleNo());
invoiceCheckVehicleDetailModel.setTaxRate(responseInvoice.getTaxRate());
invoiceCheckVehicleDetailModel.setTaxCode(getZSM(responseInvoice.getTaxRate()));
invoiceCheckVehicleDetailModel.setTaxBureauName(responseInvoice.getTaxBureauName());
invoiceCheckVehicleDetailModel.setTaxBureauCode(responseInvoice.getTaxBureauCode());
invoiceCheckVehicleDetailModel.setTaxRecords(responseInvoice.getTaxRecords());

60
dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java
Unescape View File

@ -622,34 +622,73 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
case "免税":
sm = "J0";
break;
case "16%":
case "不征税":
sm = "J0";
break;
case "0.16":
sm = "J1";
break;
case "0.13":
sm = "J2";
break;
case "0.10":
sm = "J3";
break;
case "0.09":
sm = "J4";
break;
case "0.06":
sm = "J5";
break;
case "0.05":
sm = "J6";
break;
case "0.03":
sm = "J7";
break;
case "0.02":
sm = "J8";
break;
case "0.01":
sm = "J9";
break;
case "0.17":
sm = "JC";
break;
case "0.000":
sm = "J0";
break;
case "16":
sm = "J1";
break;
case "13%":
case "13":
sm = "J2";
break;
case "10%":
case "10":
sm = "J3";
break;
case "9%":
case "9":
sm = "J4";
break;
case "6%":
case "6":
sm = "J5";
break;
case "5%":
case "5":
sm = "J6";
break;
case "3%":
case "3":
sm = "J7";
break;
case "2%":
case "2":
sm = "J8";
break;
case "1%":
case "1.5":
sm = "JA";
break;
case "1":
sm = "J9";
break;
case "17%":
case "17":
sm = "JC";
break;
default:
@ -659,5 +698,4 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
}
return sm;
}
}

39
dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
Unescape View File

@ -207,7 +207,7 @@ public class SDNYMainProcessController extends AbstractController {
if (!checkInvoiceResult.containsKey("code")) {
if (checkInvoiceResult.containsKey("cyjg")) {
if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) {
R data = new R();
data = errorInfo(checkInvoiceResult, data);
return ResponseEntity.ok(JSONObject.toJSONString(data));
@ -588,6 +588,7 @@ public class SDNYMainProcessController extends AbstractController {
}
}
} catch (Exception exception) {
log.error("同步SAP失败,报错信息为:{}",exception);
exception.printStackTrace();
}
return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)));
@ -970,6 +971,9 @@ public class SDNYMainProcessController extends AbstractController {
case "免税":
sm = "J0";
break;
case "不征税":
sm = "J0";
break;
case "0.16":
sm = "J1";
break;
@ -1000,6 +1004,39 @@ public class SDNYMainProcessController extends AbstractController {
case "0.17":
sm = "JC";
break;
case "16":
sm = "J1";
break;
case "13":
sm = "J2";
break;
case "10":
sm = "J3";
break;
case "9":
sm = "J4";
break;
case "6":
sm = "J5";
break;
case "5":
sm = "J6";
break;
case "3":
sm = "J7";
break;
case "2":
sm = "J8";
break;
case "1.5":
sm = "JA";
break;
case "1":
sm = "J9";
break;
case "17":
sm = "JC";
break;
default:
sm = "";
break;

18
dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
Unescape View File

@ -779,14 +779,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
InvoiceInfo invoice = new InvoiceInfo();
invoice.setInvoiceTypeCode(snInvoice.getInvoiceType());
Date date = new Date();
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
try {
date = ft.parse(snInvoice.getBillingDate());
} catch (ParseException e) {
e.printStackTrace();
if(snInvoice.getBillingDate() != null) {
Date date = new Date();
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
try {
date = ft.parse(snInvoice.getBillingDate());
} catch (ParseException e) {
e.printStackTrace();
}
invoice.setInvoiceDate(date);
}else{
log.error("开票日期为空");
}
invoice.setInvoiceDate(date);
invoice.setIdentityNumber(snInvoice.getIdcardNo());
invoice.setPassenger(snInvoice.getRiderName());

1
dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java
Unescape View File

@ -810,6 +810,7 @@ public class GatherServiceImpl extends MpBaseServiceImpl<TdxRecordInvoiceDao, Td
} catch (Exception e) {
e.printStackTrace();
log.error("发生异常,报错信息为:{}",e);
run.setReturnCode("2011");
run.setReturnMessage("其他异常");
String globalJson = null;

3
dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
Unescape View File

@ -378,6 +378,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
updateWrapper.set("bzdh",zdata1.getZBZDH());
//入账状态
updateWrapper.set("inaccount_status",zdata1.getZYWZT());
updateWrapper.set("company_code",zdata1.getZGSDM());
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
int update = tDxrecordInvoiceDao.update(null, updateWrapper);
if(update>0){
@ -412,6 +413,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
updateWrapper.set("bzdh",zdata1.getZBZDH());
//入账状态
updateWrapper.set("inaccount_status",zdata1.getZYWZT());
updateWrapper.set("company_code",zdata1.getZGSDM());
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
}
@ -422,6 +424,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
updateWrapper.set("account_period",zdata1.getBUDAT().substring(0,7));
updateWrapper.set("bzdh",zdata1.getZBZDH());
updateWrapper.set("inaccount_status",zdata1.getZYWZT());
updateWrapper.set("company_code",zdata1.getZGSDM());
updateWrapper.eq("uuid",uuid);
tdxSaleRecordInvoiceDao.update(null,updateWrapper);
if(!flag){

44
dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java
Unescape View File

@ -378,6 +378,42 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
case "0.17":
sm = "JC";
break;
case "0.000":
sm = "J0";
break;
case "16":
sm = "J1";
break;
case "13":
sm = "J2";
break;
case "10":
sm = "J3";
break;
case "9":
sm = "J4";
break;
case "6":
sm = "J5";
break;
case "5":
sm = "J6";
break;
case "3":
sm = "J7";
break;
case "2":
sm = "J8";
break;
case "1.5":
sm = "JA";
break;
case "1":
sm = "J9";
break;
case "17":
sm = "JC";
break;
default:
sm = "";
break;
@ -449,8 +485,12 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
}
if (queryInvoiceResult.getString("totalTax") != null && StringUtils.isNoneBlank(queryInvoiceResult.getString("totalTax"))) {
BigDecimal taxAmount = new BigDecimal(queryInvoiceResult.getString("totalTax"));
invoice.setTaxAmount(taxAmount);
if(queryInvoiceResult.getString("totalTax").contains("*")){
invoice.setTaxAmount(new BigDecimal(0));
}else {
BigDecimal taxAmount = new BigDecimal(queryInvoiceResult.getString("totalTax"));
invoice.setTaxAmount(taxAmount);
}
}
if (queryInvoiceResult.getString("amountTax") != null && StringUtils.isNoneBlank(queryInvoiceResult.getString("amountTax"))) {

2
dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java
Unescape View File

@ -47,7 +47,9 @@ public class ExtIndexController extends AbstractController {
if (gfshList.size() > 0) {
DynamicContextHolder.push(getUserInfo().getDbName() + DbConstant.BUSINESS_READ);
Integer orgNum = indexStatisticsService.getOrgType(gfshList);
log.info("查询到的数量为：{}",orgNum);
if (orgNum != null && orgNum > 0) {
log.info("查询数量不为空");
return ResponseEntity.ok(R.ok().put("data", "1"));
}
return ResponseEntity.ok(R.ok().put("data", "0"));

21
dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
Unescape View File

@ -14,6 +14,7 @@ import com.dxhy.common.util.StringHelper;
import com.dxhy.common.vo.TaxOrgCode;
import com.dxhy.common.vo.UserInfo;
import com.dxhy.extend.entity.PullRecordReq;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -289,6 +290,16 @@ public class ExtInvoicePoolController extends AbstractController {
pullRecordReq.setOrgCode(collect);
pullRecordReq.setCompanyCode("");
}
if(pullRecordReq.getAccountPeriod()!=null && pullRecordReq.getAccountPeriod()!=""){
String accountPeriod = pullRecordReq.getAccountPeriod();
if(accountPeriod != null && StringUtils.isNoneBlank(accountPeriod) && accountPeriod.contains("-")) {
String[] split = accountPeriod.split("-");
if (split[1].startsWith("0")) {
String replace = split[1].replace("0", "");
pullRecordReq.setAccountPeriod(split[0] + "-" + replace);
}
}
}
return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq)));
}catch (Exception e){
e.printStackTrace();
@ -298,4 +309,14 @@ public class ExtInvoicePoolController extends AbstractController {
}
}
public static void main(String[] args) {
String str ="2022-04";
String[] split = str.split("-");
if(split[1].startsWith("0")){
String replace = split[1].replace("0", "");
System.out.println(replace);
}
}
}

9
pom.xml
Unescape View File

@ -187,10 +187,7 @@
<deployType>test</deployType>
<logging.file>/home/dxhy/logs/</logging.file>
</properties>
<!-- 默认激活 -->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!-- 伊利测试环境 -->
<profile>
@ -223,6 +220,10 @@
<deployType>std</deployType>
<logging.file>/home/dxhy/logs/</logging.file>
</properties>
<!-- 默认激活 -->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
</profiles>

Write Preview
Loading…
Cancel
Save