feature:添加日志打印

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/PageOrderInvoiceDetail.java

@@ -86,4 +86,6 @@ public class PageOrderInvoiceDetail implements Serializable {
      * 前端使用,取值为特殊票种发票查询 特殊票种
      */
     private String fpcxTspz;
+
+    private String pzh;
 }

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -409,6 +409,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
 
     @Override
     public PageInfo<PageOrderInvoiceDetail> selectRedAndInvoiceByMap(Map<String, Object> paramMap, List<String> shList, List<String> entList) {
+
         log.info("MAP===={}", JsonUtils.getInstance().toJsonString(paramMap));
         int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
         int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));

order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml

@@ -136,6 +136,7 @@
         <result column="sykchje" property="sykchje" jdbcType="VARCHAR"/>
         <result column="sykchbhsje" jdbcType="VARCHAR" property="sykchbhsje"/>
         <result column="sykchse" jdbcType="VARCHAR" property="sykchse"/>
+        <result column="byzd2" jdbcType="VARCHAR" property="pzh"/>
     </resultMap>
 
 
@@ -1325,8 +1326,8 @@
         oii.qdfwlx,
         oii.qdyhm,
         oii.skcwdm,
-        oii.skcwms
+        oii.skcwms,
-
+        oi.byzd2
         FROM order_invoice_info oii
         LEFT JOIN order_info oi ON oii.fpqqlsh = oi.fpqqlsh
         LEFT JOIN order_process_info opi ON oii.fpqqlsh = opi.fpqqlsh
@@ -1648,6 +1649,12 @@
             <when test="map.orderBy !=null and map.orderBy == 'checkTime' ">
                 order by check_time desc
             </when>
+            <when test="map.orderBy !=null and map.orderBy == 'pzhAsc' ">
+                order by CONVERT(oi.byzd2, UNSIGNED) asc,kprq DESC
+            </when>
+            <when test="map.orderBy !=null and map.orderBy == 'pzhDesc' ">
+                order by CONVERT(oi.byzd2, UNSIGNED) desc,kprq DESC
+            </when>
             <otherwise>
                 ORDER BY kprq DESC
             </otherwise>

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java

@@ -97,6 +97,9 @@ public class YyOrderServiceImpl implements OrderService {
     @Resource
     private RedissonService redissonService;
 
+    @Value("${exculd.nsrsbh}")
+    private String exculdNsrsbh;
+
     //订单读入
     @Override
     public R orderRead(ReqParam reqParam) {
@@ -309,19 +312,28 @@ public class YyOrderServiceImpl implements OrderService {
             log.debug("cdlCodeList:{}", JSON.toJSONString(ddhList));
             for (String cdlCode : ddhList) {
                 DynamicContextHolder.push(nsrsbh);
-                List<InvoiceBpmmap> ddbhList = yyOrderMapper.getDdbh(cdlCode);
+                log.debug("exculdNsrsbh:{}", exculdNsrsbh);
-                log.debug("查询到中间表信息:{}", JSON.toJSONString(ddbhList));
+                if (StringUtils.isNotBlank(exculdNsrsbh) && Arrays.asList(exculdNsrsbh.split(",")).contains(nsrsbh)){
-                if (CollectionUtils.isNotEmpty(ddbhList)) {
+                    NewTable newTableFull = new NewTable();
-                    for (InvoiceBpmmap invoiceBpmmap : ddbhList) {
+                    BeanUtil.copyProperties(newTable, newTableFull);
-                        NewTable newTableFull = new NewTable();
+                    newTableFull.setCDLCode(cdlCode);
-                        BeanUtil.copyProperties(newTable, newTableFull);
+                    DynamicContextHolder.push(ConfigureConstant.MAIN);
-                        newTableFull.setBpmNo(invoiceBpmmap.getBpmno());
+                    count += tInvoiceInvmapMapper.insertBackMsg(newTableFull);
-                        newTableFull.setBpmlsNo(invoiceBpmmap.getBpmlsno());
+                }else {
-                        newTableFull.setCDLCode(cdlCode);
+                    List<InvoiceBpmmap> ddbhList = yyOrderMapper.getDdbh(cdlCode);
-                        DynamicContextHolder.push(ConfigureConstant.MAIN);
+                    log.debug("查询到中间表信息:{}", JSON.toJSONString(ddbhList));
-                        count += tInvoiceInvmapMapper.insertBackMsg(newTableFull);
+                    if (CollectionUtils.isNotEmpty(ddbhList)) {
-                    }
+                        for (InvoiceBpmmap invoiceBpmmap : ddbhList) {
+                            NewTable newTableFull = new NewTable();
+                            BeanUtil.copyProperties(newTable, newTableFull);
+                            newTableFull.setBpmNo(invoiceBpmmap.getBpmno());
+                            newTableFull.setBpmlsNo(invoiceBpmmap.getBpmlsno());
+                            newTableFull.setCDLCode(cdlCode);
+                            DynamicContextHolder.push(ConfigureConstant.MAIN);
+                            count += tInvoiceInvmapMapper.insertBackMsg(newTableFull);
+                        }
 
+                    }
                 }
             }
 
@@ -366,10 +378,10 @@ public class YyOrderServiceImpl implements OrderService {
         yyOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
         yyOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
         yyOrderInfo.setBz(bz.toString());
-        if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_26)) {
+        if (ConfigureConstant.STRING_26.equals(yyOrderInfo.getCvouchtype())) {
             yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_001);
         }
-        if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_27)) {
+        if (ConfigureConstant.STRING_27.equals(yyOrderInfo.getCvouchtype())) {
             yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_002);
         }
         yyOrderInfoMapper.insertYyOrderInfo(yyOrderInfo);
@@ -422,7 +434,7 @@ public class YyOrderServiceImpl implements OrderService {
 //        ddtxxBO.setSFZSXFYHZH(ebsOrderInfo.getSalebankAccountJud());
         ddtxxBO.setGMFLX("04");
         ddtxxBO.setBYZD1(yyOrderInfo.getYscdlcode());
-
+        ddtxxBO.setBYZD2(yyOrderInfo.getCpznum());
 
         String invoiceAmount = ConfigureConstant.STRING_0;
         String taxAmount = ConfigureConstant.STRING_0;