Merge branch 'dev-blbzd' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java

@@ -51,7 +51,7 @@ public interface OrderProcessInfoMapper {
      */
     OrderProcessInfo queryOrderProcessInfoByFpqqlsh(@Param("fpqqlsh") String fpqqlsh, @Param("shList") List<String> shList);
 
-    List<OrderProcessInfo> queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh,String zfbz,  @Param("shList")List<String> shList);
+    List<OrderProcessInfo> queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh,@Param("zfbz") String zfbz,  @Param("shList")List<String> shList);
 
     List<OrderProcessInfo> queryOrderProcessInfoByBzdhs(@Param("bzdhs") List<String> bzdhs,  @Param("shList")List<String> shList);
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java

@@ -188,8 +188,11 @@ public class OrderInfoController {
 
             return R.ok();
         } catch (Exception e) {
+            if(e instanceof OrderReceiveException){
+                return R.error(e.getMessage());
+            }
             log.error(e.getMessage());
-            return R.error(e.getMessage());
+            return R.error(OrderInfoContentEnum.INTERNAL_SERVER_ERROR);
         }
     }
     

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

@@ -149,7 +149,7 @@
           op.*
         FROM
            order_process_info op
-           inner join order_invoice_info oii on oii.order_info_id = op.order_info_id
+           left join order_invoice_info oii on oii.order_info_id = op.order_info_id
         WHERE
         op.bzdh = #{bzdh,jdbcType=VARCHAR}
         <if test="shList != null and shList.size() == 0">