root
/
jianshui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

销项合并：蓝字发票

Browse Source 
用户登记接口
beta-prop
dongxiaoke 2 years ago
parent c879bef252
commit d45b10e571
4 changed files with 59 additions and 28 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
      jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java
  2. 46
      jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java
  3. 25
      jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java
  4. 12
      jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml

4
jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java
Unescape View File

@ -101,7 +101,8 @@ public class InvoiceAllImpl implements IInvoiceAll {
InvoiceAllYhdj yhdj = BeanUtil.copyProperties(yhdjDTO.getJsonData(), InvoiceAllYhdj.class);
QueryWrapper<InvoiceAllYhdj> yhdjQueryWrapper = new QueryWrapper<>();
yhdjQueryWrapper.eq("dlzh", yhdj.getDlzh());
yhdjQueryWrapper.eq("nsrsbh", yhdj.getNsrsbh());
yhdjQueryWrapper.eq("identity", companyservice.getIdentity());
InvoiceAllYhdj yhdjTemp = yhdjMapper.selectOne(yhdjQueryWrapper);
if (BeanUtil.isNotEmpty(yhdjTemp)) {
yhdjTemp = BeanUtil.copyProperties(yhdj, InvoiceAllYhdj.class);
@ -109,6 +110,7 @@ public class InvoiceAllImpl implements IInvoiceAll {
yhdjMapper.updateInvoiceAllYhdj(yhdjTemp);
} else {
yhdj.setCreateTime(new Date());
yhdj.setIdentityid(companyservice.getIdentity());
yhdjMapper.insertInvoiceAllYhdj(yhdj);
}
} else {

46
jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java
Unescape View File

@ -137,7 +137,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
return new HXResponse(msg);
}
BillInfo billInfoRes = billInfoMapper.selectBillInfoById(billInfoID);
billInfoRes.setOriginSystemOrderno(requestId);
billInfoRes.setOutTradeOrderno(requestId);
billInfoMapper.updateBillInfo(billInfoRes);
// 保存日志
@ -214,35 +214,31 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
@Override
public HXResponse queryInvoice(QueryBillInfoDTO billInfo, Companyservice companyservice) {
// TODO: 2023/3/28 查询存库Invoice表
String systemOrderNo = billInfo.getSystemOrderno();
BillInfo billInfoResult = billInfoMapper.selectBySystemOrderNo(companyservice.getCompanyid(),systemOrderNo);
// requestId=OutTradeOrderno
if(StrUtil.isEmpty(billInfoResult.getOutTradeOrderno())){
return new HXResponse("未获取到开票记录！");
}
// 查询用户登记参数
QueryWrapper<InvoiceAllYhdj> yhdjQueryWrapper = new QueryWrapper<>();
yhdjQueryWrapper.eq("nsrsbh",companyservice.getSellertax());
yhdjQueryWrapper.eq("identity",companyservice.getIdentity());
InvoiceAllYhdj invoiceAllYhdj = yhdjMapper.selectOne(yhdjQueryWrapper);
if(BeanUtil.isEmpty(invoiceAllYhdj)){
if(BeanUtil.isEmpty(invoiceAllYhdj)) {
return new HXResponse("用户未登记！");
}
// TODO: 2023/3/28 用户登记表有问题，数据有重复的，看下什么问题1
QueryTwoDTO queryDTO = new QueryTwoDTO();
queryDTO.setDqbm(invoiceAllYhdj.get);
queryDTO.setAsync("");
queryDTO.setBsrysfzjhm("");
queryDTO.setNsrsbh("");
queryDTO.setRequestId("");
// TODO: 2023/3/28 ...
queryDTO.setDqbm(invoiceAllYhdj.getDqbm());
queryDTO.setAsync("false");
queryDTO.setBsrysfzjhm(invoiceAllYhdj.getBsrysfzjhm());
queryDTO.setNsrsbh(invoiceAllYhdj.getNsrsbh());
queryDTO.setRequestId("tycxjk");
ValidateUtils.validate(queryDTO);
String requestId = queryDTO.getRequestId();
@ -259,8 +255,6 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
if ("0000".equals(code) && StrUtil.isNotEmpty(data)) {
// 2022/12/13 这里所有的接口都走，需要根据具体的id判断接口来存库。
QueryWrapper<InvoiceAllApiLog> apiLogQueryWrapper = new QueryWrapper<>();
apiLogQueryWrapper.eq("request_id",requestId);
InvoiceAllApiLog allApiLog = allApiLogMapper.selectOne(apiLogQueryWrapper);
@ -278,8 +272,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
if(BeanUtil.isNotEmpty(addInvoiceVO)){
QueryWrapper<BillInfo> billInfoQueryWrapper = new QueryWrapper<>();
billInfoQueryWrapper.eq("out_trade_orderno", requestId);
BillInfo billInfo = billInfoMapper.selectOne(billInfoQueryWrapper);
if (BeanUtil.isNotEmpty(billInfo)) {
BillInfo billInfoR = billInfoMapper.selectOne(billInfoQueryWrapper);
if (BeanUtil.isNotEmpty(billInfoR)) {
QueryWrapper<Invoice> invoiceQueryWrapper = new QueryWrapper<>();
invoiceQueryWrapper.eq("out_trade_orderno", requestId);
Invoice invoice = invoiceMapper.selectOne(invoiceQueryWrapper);
@ -299,8 +293,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
invoice.setcOfdUrl(addInvoiceVO.getXmlUrl());
invoice.setState(2);
invoiceMapper.updateInvoice(invoice);
billInfo.setState(2);
billInfoMapper.updateById(billInfo);
billInfoR.setState(2);
billInfoMapper.updateById(billInfoR);
} else {
invoice = BeanUtil.copyProperties(billInfo, Invoice.class);
invoice.setFphm(addInvoiceVO.getFphm());
@ -317,8 +311,8 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService {
invoice.setcOfdUrl(addInvoiceVO.getXmlUrl());
invoice.setState(2);
invoiceMapper.insertInvoice(invoice);
billInfo.setState(2);
billInfoMapper.updateById(billInfo);
billInfoR.setState(2);
billInfoMapper.updateById(billInfoR);
}
// 返回数据
response.put("data", invoice);

25
jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java
Unescape View File

@ -86,4 +86,29 @@ public class InvoiceAllYhdj implements Serializable
private String remark;
/** identityid */
private String identityid;
/** 地区编码 */
private String dqbm;
}

12
jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml
Unescape View File

@ -22,10 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="identityid" column="identityid" />
<result property="dqbm" column="dqbm" />
</resultMap>
<sql id="selectInvoiceAllYhdjVo">
select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark from invoice_all_yhdj
select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark,identityid,dqbm from invoice_all_yhdj
</sql>
<select id="selectInvoiceAllYhdjList" parameterType="InvoiceAllYhdj" resultMap="InvoiceAllYhdjResult">
@ -42,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bsrysfzjhm != null and bsrysfzjhm != ''"> and bsrysfzjhm = #{bsrysfzjhm}</if>
<if test="bsrysjhm != null and bsrysjhm != ''"> and bsrysjhm = #{bsrysjhm}</if>
<if test="zjh != null and zjh != ''"> and zjh = #{zjh}</if>
<if test="identityid != null and identityid != ''"> and identityid = #{identityid}</if>
<if test="dqbm != null and dqbm != ''"> and dqbm = #{dqbm}</if>
</where>
</select>
@ -70,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="identityid != null">identityid,</if>
<if test="dqbm != null">dqbm,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -89,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="identityid != null">#{identityid},</if>
<if test="dqbm != null">#{dqbm},</if>
</trim>
</insert>
@ -111,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="identityid != null">identityid = #{identityid},</if>
<if test="dqbm != null">dqbm = #{dqbm},</if>
</trim>
where id = #{id}
</update>

Write Preview
Loading…
Cancel
Save