Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -96,4 +96,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
     private String pi_seller;
 
     private Double pi_rate;
+
+    private Double b2bStatus;
 }

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/PurchaseDTO.java

@@ -76,4 +76,6 @@ public class PurchaseDTO extends CommonBaseDTO implements Serializable{
     private String pu_currency;
 
     private Double pu_rate;
+
+    private String b2bStatus;
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -1117,8 +1117,13 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
      */
     @Override
     public IPage<DeviceDTO> getDevice(DeviceReqDTO deviceReqDTO) {
-        SearchComponentResp searchComponentResp = searchApi.getInquiry(deviceReqDTO.getKeyword(),deviceReqDTO.getCount(),deviceReqDTO.getSorting(),
-                deviceReqDTO.getType(),deviceReqDTO.getPage(),deviceReqDTO.getFilter());
+        SearchComponentResp searchComponentResp = null;
+        try {
+            searchComponentResp = searchApi.getInquiry(deviceReqDTO.getKeyword(), deviceReqDTO.getCount(), deviceReqDTO.getSorting(),
+                    deviceReqDTO.getType(), deviceReqDTO.getPage(), deviceReqDTO.getFilter());
+        }catch (Exception e){
+            throw new BizException(78001, "系统错误");
+        }
         List<ProductEntity> productEntities = searchComponentResp.getFutures().getContent();
         if (CollectionUtils.isEmpty(productEntities)){
             return null;

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -49,6 +49,7 @@
     <result column="pi_sellercode" jdbcType="VARCHAR" property="pi_sellercode" />
     <result column="pi_seller" jdbcType="VARCHAR" property="pi_seller" />
     <result column="pi_nettotal" jdbcType="DOUBLE" property="pi_nettotal"/>
+    <result column="b2bStatus" jdbcType="VARCHAR" property="b2bStatus"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -384,7 +384,7 @@
         pu_rate = #{pu_rate,jdbcType=DOUBLE},
       </if>
       <if test="b2bStatus != null">
-        b2bStatus = #{b2bStatus,jdbcType=DOUBLE}
+        b2bStatus = #{b2bStatus,jdbcType=VARCHAR}
       </if>
     </set>
     where pu_id = #{id,jdbcType=INTEGER}