zhaoyun
/
zc3in1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
master
ymnets 11 months ago
parent 4bfaee2ba6
commit f70f4fb599
4 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File

21
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/config/util/InvoiceHelper.java
Unescape View File

@ -176,7 +176,20 @@ public class InvoiceHelper {
order.setBuyerPhone(userInvoices.getBuyerPhone());//购方手机（pushMode为1或2时，此项为 必填，同时受企业资质是否必填控制） order.setBuyerPhone(userInvoices.getBuyerPhone());//购方手机（pushMode为1或2时，此项为 必填，同时受企业资质是否必填控制）
order.setEmail(userInvoices.getBuyerEmail());//推送邮箱（pushMode为0或2时，此项为必填，同时受企业资质是否必填控制） order.setEmail(userInvoices.getBuyerEmail());//推送邮箱（pushMode为0或2时，此项为必填，同时受企业资质是否必填控制）
order.setInvoiceType("1");//开票类型：1:蓝票;2:红票 （数电票冲红请 对接数电快捷冲红接口） order.setInvoiceType("1");//开票类型：1:蓝票;2:红票 （数电票冲红请 对接数电快捷冲红接口）
order.setInvoiceLine("p");//开票种类 //发票种类：p,普通发票(电票)(默认);c,普通
//发票(纸票);s,专用发票;e,收购发票(电票);f,
//收购发票(纸质);r,普通发票(卷式);b,增值税
//电子专用发票;j,机动车销售统一发票;u,二手
//车销售统一发票;bs:电子发票(增值税专用
//发票)-即数电专票(电子),pc:电子发票(普通
//发票)-即数电普票(电子),es:数电纸质发票(
//增值税专用发票)-即数电专票(纸质);ec:数
//电纸质发票(普通发票)-即数电普票(纸质)
if(userInvoices.getInvoicesType()==0 || userInvoices.getInvoicesType()==1) {
order.setInvoiceLine("pc");//开票种类
}else {
order.setInvoiceLine("bs");//开票种类
}
order.setCallBackUrl(_callBackUrl);//回调地址 order.setCallBackUrl(_callBackUrl);//回调地址
order.setSalerTaxNum(_salerTaxNum);//销方税号 order.setSalerTaxNum(_salerTaxNum);//销方税号
order.setSalerTel(_salerTel);//销方电话 order.setSalerTel(_salerTel);//销方电话
@ -221,7 +234,11 @@ public class InvoiceHelper {
order.setBuyerPhone(userInvoices.getBuyerPhone());//购方手机（pushMode为1或2时，此项为 必填，同时受企业资质是否必填控制） order.setBuyerPhone(userInvoices.getBuyerPhone());//购方手机（pushMode为1或2时，此项为 必填，同时受企业资质是否必填控制）
order.setEmail(userInvoices.getBuyerEmail());//推送邮箱（pushMode为0或2时，此项为必填，同时受企业资质是否必填控制） order.setEmail(userInvoices.getBuyerEmail());//推送邮箱（pushMode为0或2时，此项为必填，同时受企业资质是否必填控制）
order.setInvoiceType("2");//开票类型：1:蓝票;2:红票 （数电票冲红请 对接数电快捷冲红接口） order.setInvoiceType("2");//开票类型：1:蓝票;2:红票 （数电票冲红请 对接数电快捷冲红接口）
order.setInvoiceLine("p");//开票种类 if(userInvoices.getInvoicesType()==0 || userInvoices.getInvoicesType()==1) {
order.setInvoiceLine("pc");//开票种类
}else {
order.setInvoiceLine("bs");//开票种类
}
order.setCallBackUrl(_callBackUrl);//回调地址 order.setCallBackUrl(_callBackUrl);//回调地址
order.setSalerTaxNum(_salerTaxNum);//销方税号 order.setSalerTaxNum(_salerTaxNum);//销方税号
order.setSalerTel(_salerTel);//销方电话 order.setSalerTel(_salerTel);//销方电话

28
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/app/AppUserInvoicesController.java
Unescape View File

@ -99,7 +99,7 @@ public class AppUserInvoicesController {
userInvoices.setStatus(1); userInvoices.setStatus(1);
//1.进行远程开票(蓝票，普票) //1.进行远程开票(蓝票，普票)
if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) { //if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) {
InvoiceHelper invoiceHelper = new InvoiceHelper(redisUtil); InvoiceHelper invoiceHelper = new InvoiceHelper(redisUtil);
ClassConfig classConfig = classConfigService.queryById(userInvoices.getClassId()); ClassConfig classConfig = classConfigService.queryById(userInvoices.getClassId());
String json = invoiceHelper.GetKPJsonStr(userInvoices,classConfig); String json = invoiceHelper.GetKPJsonStr(userInvoices,classConfig);
@ -118,10 +118,10 @@ public class AppUserInvoicesController {
String result2 = object.getString("describe"); String result2 = object.getString("describe");
return Result.exception(511, result2); return Result.exception(511, result2);
} }
} else { // } else {
//3,专票只进行记录 // //3,专票只进行记录
userInvoices.setSyncStatus(-1); // userInvoices.setSyncStatus(-1);
} // }
//3.结束返回 //3.结束返回
UserInvoices entity = userInvoicesService.insert(userInvoices); UserInvoices entity = userInvoicesService.insert(userInvoices);
orders.setUserInvoicesId(entity.getUserInvoicesId()); orders.setUserInvoicesId(entity.getUserInvoicesId());
@ -148,8 +148,8 @@ public class AppUserInvoicesController {
return Result.exception(511, "发票不存在"); return Result.exception(511, "发票不存在");
} }
//如果发票是普通发票 //如果发票是普通发票
if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0) // if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0)
{ // {
//0申请中 10申请成功，20开票完成，30开票失败，40开票成功签章失败 //0申请中 10申请成功，20开票完成，30开票失败，40开票成功签章失败
if(userInvoices.getSyncStatus().equals(20) || userInvoices.getSyncStatus().equals(40)) if(userInvoices.getSyncStatus().equals(20) || userInvoices.getSyncStatus().equals(40))
{ {
@ -179,13 +179,13 @@ public class AppUserInvoicesController {
ordersService.update(orders); ordersService.update(orders);
} }
}else { // }else {
userInvoices.setSyncStatus(90); // userInvoices.setSyncStatus(90);
orders.setUserInvoicesId(0); // orders.setUserInvoicesId(0);
Orders update = ordersService.update(orders); // Orders update = ordersService.update(orders);
userInvoicesService.update(userInvoices); // userInvoicesService.update(userInvoices);
//
} // }
return Result.success(null); return Result.success(null);
} }

28
JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/front/FrontUserInvoicesController.java
Unescape View File

@ -98,7 +98,7 @@ public class FrontUserInvoicesController {
userInvoices.setStatus(1); userInvoices.setStatus(1);
//1.进行远程开票(蓝票，普票) //1.进行远程开票(蓝票，普票)
if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) { //if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) {
InvoiceHelper invoiceHelper = new InvoiceHelper(redisUtil); InvoiceHelper invoiceHelper = new InvoiceHelper(redisUtil);
ClassConfig classConfig = classConfigService.queryById(userInvoices.getClassId()); ClassConfig classConfig = classConfigService.queryById(userInvoices.getClassId());
String json = invoiceHelper.GetKPJsonStr(userInvoices,classConfig); String json = invoiceHelper.GetKPJsonStr(userInvoices,classConfig);
@ -117,10 +117,10 @@ public class FrontUserInvoicesController {
String result2 = object.getString("describe"); String result2 = object.getString("describe");
return Result.exception(511, result2); return Result.exception(511, result2);
} }
} else { // } else {
//3,专票只进行记录 // //3,专票只进行记录
userInvoices.setSyncStatus(-1); // userInvoices.setSyncStatus(-1);
} // }
//3.结束返回 //3.结束返回
UserInvoices entity = userInvoicesService.insert(userInvoices); UserInvoices entity = userInvoicesService.insert(userInvoices);
orders.setUserInvoicesId(entity.getUserInvoicesId()); orders.setUserInvoicesId(entity.getUserInvoicesId());
@ -147,8 +147,8 @@ public class FrontUserInvoicesController {
return Result.exception(511, "发票不存在"); return Result.exception(511, "发票不存在");
} }
//如果发票是普通发票 //如果发票是普通发票
if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0) // if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0)
{ // {
//0申请中 10申请成功，20开票完成，30开票失败，40开票成功签章失败 //0申请中 10申请成功，20开票完成，30开票失败，40开票成功签章失败
if(userInvoices.getSyncStatus().equals(20) || userInvoices.getSyncStatus().equals(40)) if(userInvoices.getSyncStatus().equals(20) || userInvoices.getSyncStatus().equals(40))
{ {
@ -178,13 +178,13 @@ public class FrontUserInvoicesController {
ordersService.update(orders); ordersService.update(orders);
} }
}else { // }else {
userInvoices.setSyncStatus(90); // userInvoices.setSyncStatus(90);
orders.setUserInvoicesId(0); // orders.setUserInvoicesId(0);
Orders update = ordersService.update(orders); // Orders update = ordersService.update(orders);
userInvoicesService.update(userInvoices); // userInvoicesService.update(userInvoices);
//
} // }
return Result.success(null); return Result.success(null);
} }

22
JAVA_MYSQL_WEBSITE/.idea/workspace.xml
Unescape View File

@ -5,18 +5,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment=""> <list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment="">
<change afterPath="$PROJECT_DIR$/.idea/easyCodeTableSetting.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebQrCodeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebQrCode.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebQrCodeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebQrCodeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebQrCodeMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontQrCodeController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-web/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/resources/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gp-web/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/resources/application.yml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -117,7 +106,7 @@
<workItem from="1731396372121" duration="90000" /> <workItem from="1731396372121" duration="90000" />
<workItem from="1731396540755" duration="630000" /> <workItem from="1731396540755" duration="630000" />
<workItem from="1731404423787" duration="15000" /> <workItem from="1731404423787" duration="15000" />
<workItem from="1732161369130" duration="3297000" /> <workItem from="1732161369130" duration="4217000" />
</task> </task>
<task id="LOCAL-00001" summary="更改表名字"> <task id="LOCAL-00001" summary="更改表名字">
<created>1730470371982</created> <created>1730470371982</created>
@ -161,7 +150,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1731396452654</updated> <updated>1731396452654</updated>
</task> </task>
<option name="localTasksCounter" value="7" /> <task id="LOCAL-00007" summary="测试修正">
<created>1732172204275</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1732172204275</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">

Write Preview
Loading…
Cancel
Save