Merge branch 'dev-snyx' into test

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

@@ -2141,7 +2141,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                     }
                 }
                 if(StringUtils.isNotBlank(sb.toString())){
-                    return R.error(sb.toString());
+                    return R.error(sb.toString().substring(0,sb.toString().length()-1));
                 }
                 break;
             case "1":
@@ -2154,6 +2154,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
                     return R.error("根据报账单号未查询到数据");
                 }
+                if(orderProcessInfos.stream().filter(t->OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(t.getXtly())).count() == 0){
+                    return R.ok();
+                }
                 collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh()));
                 StringBuffer sb1 = new StringBuffer();
                 List<String> fpqqlsh = new ArrayList<>();
@@ -2191,12 +2194,14 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                  */
                 List<String> list = Arrays.asList(params.split(","));
                 List<String> yFpdmHm = list.stream().map(t->{
-                    String[] split = t.split("-");
-                    return "('" + split[0] + "','" + split[1] + "')";
+                    return t.replace("-","");
                 }).collect(Collectors.toList());
                 orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByYFpdmHm(yFpdmHm, Arrays.asList(nsrsbh));
                 if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
-                    return R.error("根据报账单号未查询到数据");
+                    return R.error("根据原发票代码号码未查询到数据");
+                }
+                if(orderProcessInfos.stream().filter(t->OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(t.getXtly())).count() == 0){
+                    return R.ok();
                 }
                 collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh()));
                 StringBuffer sb2 = new StringBuffer();

order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml

@@ -1385,7 +1385,7 @@
     </select>
     <select id="selectOrderProcessByFpqqlshs" resultType="com.dxhy.order.model.OrderProcessInfo">
         SELECT
-            op.fpqqlsh,op.bzdh,op.ddzt
+            op.fpqqlsh,op.bzdh,op.ddzt,op.xtly
         FROM
             order_process_info op
         WHERE
@@ -1415,14 +1415,13 @@
                             #{item}
                         </foreach>
                     </if>
-                    AND t.xtly = 'SNYXX'
                     AND t.order_status = '0'
                     AND t.fpzl_dm in ('0','2')
             )
     </select>
     <select id="selectOrderProcessByYFpdmHm" resultType="com.dxhy.order.model.OrderProcessInfo">
         SELECT
-            op.fpqqlsh,op.bzdh,op.ddzt
+            op.fpqqlsh,op.bzdh,op.ddzt,op.xtly
         FROM
             order_process_info op
         WHERE
@@ -1432,11 +1431,10 @@
             FROM
                 order_process_info op1 INNER JOIN order_invoice_info oii on op1.order_info_id = oii.order_info_id
             WHERE
-                (oii.fpdm,oii.fphm) IN
-                <foreach collection="yFpdmHms" item="yFpdmHm"  separator=",">
+                CONCAT(oii.fpdm,oii.fphm) IN
+                <foreach collection="yFpdmHms" item="yFpdmHm" open="(" separator="," close=")">
                     #{yFpdmHm}
                 </foreach>
-                AND op1.xtly = 'SNYXX'
                 AND op1.order_status = '0'
                 )
     </select>