Merge branch 'dev-hzfpxf' into test

release
高荣琳 2 years ago
commit 582f24f1d8
  1. 34
      order-management-common/src/main/java/com/dxhy/order/model/OrderInfoQdTdyw.java
  2. 3
      order-management-common/src/main/java/com/dxhy/order/model/qd/OrderInfoQd.java
  3. 22
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/controller/InvoiceReceiveController.java
  4. 31
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV3.java

@ -0,0 +1,34 @@
package com.dxhy.order.model;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class OrderInfoQdTdyw implements Serializable {
private static final long serialVersionUID = 3412872591093242393L;
private String id;
private String orderInfoQdId;
private String xhfNsrsbh;
private String yshwxh;
private String ysqyd;
private String ysddd;
private String ysgjzl;
private String ysgjph;
private String yshwmc;
private String bdcdz;
private String cqzsh;
private String bdcwqhtbh;
private String kdsbz;
private String tdzzsxmbh;
private String hdjsjg;
private String sjcjhsje;
private String mjdw;
private String zlqqz;
private String jzfwfsd;
private String jzfwmc;
private Date createTime;
private Date updateTime;
}

@ -1,5 +1,6 @@
package com.dxhy.order.model.qd;
import com.dxhy.order.model.OrderInfoQdTdyw;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -126,4 +127,6 @@ public class OrderInfoQd implements Serializable {
* 修改时间
*/
private Date updateTime;
private List<OrderInfoQdTdyw> orderInfoQdTdywList;
}

@ -191,6 +191,28 @@ public class InvoiceReceiveController {
}
}
public static void main(String[] args) {
String dd =
"<?xml version=\"1.0\" encoding=\"utf-8\" ?><interface xmlns=\"\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.chinatax.gov.cn/tirip/dataspec/interfaces.xsd\" version=\"DZFP1.0\" >\n" +
" <machineType>RPA</machineType>\n" +
" <key>1240165797PJo03yB4osQVSGQJWNiGdw==</key>\n" +
" <taxpayerNo>911506910755565050</taxpayerNo>\n" +
" <terminalCode>1</terminalCode>\n" +
" <machineNo></machineNo>\n" +
" <encryCode>2</encryCode>\n" +
" <data>H4sIAAAAAAAAAAFgBZ/6OT+6hQJy1UK1RkdAEIDzGjjhDYEXOK5wYwMxwzTah2s6ZkN71cmHG2Di6Bxw6Ga9uY6enLZkxK/9L0vZZGS03PNpGOur4ErFaY6Kk5ewnj6frbLE0k1zjfjmAdy1jfiAJ9upM6WbD6E3SQrpYxonyGJAcuX3MX6tpbUs8uvGWEH0jhibtX4H2BLcRX9wHqrs3UrLC5k8ECWPANfBies5PwOjRhM6kv3vKiUhjazwOvvigB4IPd14OUq7e9R/29TRmwa5IP4rSrKtz6qJ1hXEHGyAXmPV2hTBasblEDe4U/KE/u+ha4kgYpQNCJz6fiV+SezLFd/r5jS6k/fuVca8Ob4qJVkVeE8XZxRJe5IKVGJLR3xyLn8+ESlLH+0e9BJpJlkzQwLJW/BLIDzI/gsaOR5Fg6Q30zlSB7JW/db6ONtD+sFHZSIICOjDo6oxUDLb52CqCffQjhoCGDCoZA/agEBcSCoEBeVQYJHHL+DMGlX8A3qs+Z+2ETpwFlYS0rTwg6NZFiiNaAgT9l1AWGoHpUwkNL3DckUpH18VG97VHrY5PSX91ALVFhHAhcw+8Ivb+dyVMBkKNXn1mnVFmqWUJAQVfXvNcHF81iIwpV1OOOR3HF99YiX/2ja34pARBrx3lMLIOCIUknBEvSs4w5TtyjNuNlzLnvPW/kQGeNh7l4UHYxP8gCDUvfrut0r+OamXL99OAmgrPTcZR7k2Jnq4K0DJ8fp6ed9zjfiHACh55mEw7mRCUhPCHY7PXwHyvvJGd1nDmytcSU67uL0SogriQFrj0BLJbNXwyEFPJ3AvNa8AzVgvOAZznKbUppe1/GclYy6mt4JoJEj7t02lHgOg6W7P9uj+HLJrcsSBHrgMFQobJH2NkmRSFMVAw2yC8Z7uTd9pXSNiEVVg0YPcvyVs6C2+6QahytDrz4b9zmACtNKM51WWqk5NpIN06qC2itV85EeI/oseY/XzgSinW0UAcHb7nUIhXqwdbN1Vm8DIDz4/TDTFqAA4cSfeg3fac/auo5FsnXwab3XW1zdaMKuKsiW899qr+tQwD46zmAbLGuIwl8kNzuCPUwmhMgCG0StI/6v1qSWC9KnS/vJzmR5juo2EZFLVMgEpftdiuprPiuvPKfITVfuSHNpVrwgAhz8mpbUs8uvGWEH0jhibtX4H2EZqmbj7XU9iWqrem4lsVAFltIHA0qyOEiNxVhg+KrFnP96fkpTAcheVeYHwTqJJ2JUGISr/g+GTr592Ks3muAATSbBNHIz1OC2EOcpL+lkK0/X9WAp8y5Kz/8dg1FhEOz7CZvkAjO5bb2iJ1ghDWhrzpbEbEQi3npnK9e8D5VKGJbd8mTe6hNCl/liqXiOu8QLD2LHsQSxFuXz1lCH1mQFxZ5saSXTwXekdTSGnAmIanitdnM5W/uuaVftxv1PM4Onn+jMTlLgycl4LCEZon7wu18H45+aSo4pBOxqbUBuwCVv3b/TYSz2EYogEJxWOX9I1JVU9nzVmrYJs21JY8vhNWRnvcxVs76e/Yo/Xi6qjr/cff4ID/pMw30TGEXZsorVDHKa6qrsLNPnksSXKa9gaSAxoleesMwU2RJTcCxCtSSpKr/yWUMu+0Eb6BU5W+6HBmJc9loKTIrj1txqQ5KjI4/HX8BZAKLT8zfA+o2b1lr1s9fuR1YXy6D+y53HFb1YMz95trUavWpdAt32ZGWO7uaECn6FG7HYEO6CeWEuaejq3jJJG32nIy1r/UQHV4VuPUmYq57cbvC2LBda/ZuxGQNUDICDeNPZ0vE+LeG6LdwlW+Uq+YjWNuaZdBwaQcMIg7ED9qT1DBrtAwsERLQZUZXiHYAUAAA==</data>\n" +
" <version>1.3</version>\n" +
" <checkCode>FAAD</checkCode>\n" +
" <dataExchangeId>837287767230406953134111351889</dataExchangeId>\n" +
"</interface>";
try {
InterfaceData interfaceData = ProtocolUtil.decodeData(dd);
JsonUtils.getInstance().jsonToList(interfaceData.getData(), QdInvoicePushBackRequest.class);
} catch (Exception e) {
e.printStackTrace();
}
}
@ApiOperation(value = "接收税控发票修复数据", notes = "接收税控发票修复数据-接收税控底层修复的发票数据")
@PostMapping("/receiveRepairedInvoices")
public InterfaceData receiveRepairedInvoices(HttpServletRequest request) {

@ -2056,7 +2056,7 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
/**
* 全电发票业务bean
*/
List<OrderInfoQd> insertOrderInfoQd = buildOrderInfoQd(ddfpzxx);
List<OrderInfoQd> insertOrderInfoQd = buildOrderInfoQd(ddfpzxx,insertOrder.get(0));
/*
* 订单明细业务bean
@ -4944,10 +4944,37 @@ public class InterfaceServiceImplV3 implements InterfaceServiceV3 {
* @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
* @date 2022-10-20
*/
private List<OrderInfoQd> buildOrderInfoQd(DdfpzxxBO ddfpzxx) {
private List<OrderInfoQd> buildOrderInfoQd(DdfpzxxBO ddfpzxx, OrderInfo orderInfo) {
List<OrderInfoQd> orderInfoQdList = new ArrayList<>(5);
if (Objects.nonNull(ddfpzxx.getQDTXXBO())) {
OrderInfoQd orderInfoQd = BeanTransitionUtils.transitionOrderInfoQd(ddfpzxx.getQDTXXBO());
orderInfoQd.setId(DistributedKeyMaker.generateShotKey());
orderInfoQd.setOrderId(orderInfo.getId());
orderInfoQd.setProcessId(orderInfo.getProcessId());
orderInfoQd.setFpqqlsh(orderInfo.getFpqqlsh());
orderInfoQd.setXhfNsrsbh(orderInfo.getNsrsbh());
orderInfoQd.setCreateTime(new Date());
orderInfoQd.setUpdateTime(new Date());
if (CollectionUtil.isNotEmpty(orderInfoQd.getQdFjysList())) {
orderInfoQd.getQdFjysList().forEach(qdFjys -> {
qdFjys.setId(apiInvoiceCommonService.getGenerateShotKey());
qdFjys.setOrderInfoQdId(orderInfoQd.getId());
qdFjys.setCreateTime(new Date());
qdFjys.setUpdateTime(new Date());
});
}
if (CollectionUtil.isNotEmpty(orderInfoQd.getOrderInfoQdTdywList())) {
orderInfoQd.getOrderInfoQdTdywList().forEach(tdyw -> {
tdyw.setId(apiInvoiceCommonService.getGenerateShotKey());
tdyw.setOrderInfoQdId(orderInfoQd.getId());
tdyw.setXhfNsrsbh(orderInfoQd.getXhfNsrsbh());
tdyw.setCreateTime(new Date());
tdyw.setUpdateTime(new Date());
});
}
orderInfoQdList.add(orderInfoQd);
}
return orderInfoQdList;

Loading…
Cancel
Save