优惠券关键字优化

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -106,6 +106,9 @@ public class DfOrderServiceImpl implements IErpOrderService
         String orderCode = order.getOrderCode();
         FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
         FsStoreOrderDf df = fsStoreOrderDfMapper.selectFsStoreOrderDfByOrderId(fsStoreOrder.getOrderId());
+        if (df == null){
+            return null;
+        }
         Integer sfAccountIndex = getSFAccountIndex(fsStoreOrder.getOrderId());
         HashMap<String, Object> map = new HashMap<>();
         map.put("loginAccount", df.getLoginAccount());
@@ -622,7 +625,7 @@ public class DfOrderServiceImpl implements IErpOrderService
                 }
 
             } else {
-                throw new RuntimeException(String.format("查询订单失败,原因: %s", dfApiResponse.getMsg()));
+                log.info(String.format("查询订单失败,原因: %s", dfApiResponse.getMsg()));
             }
         } catch (IOException e) {
             e.printStackTrace();

fs-service/src/main/java/com/fs/his/mapper/FsCouponMapper.java

@@ -84,7 +84,7 @@ public interface FsCouponMapper
     @Select({"<script> " +
             "select c.*  from   fs_coupon c   " +
             "where c.status=1  " +
-            "<if test = 'maps.keyword != null     '> " +
+            "<if test = 'maps.keyword != null and  maps.keyword != \"\"   '> " +
             "and c.title like CONCAT('%',#{maps.keyword},'%')" +
             "</if>"+
             "<if test = 'maps.couponType != null     '> " +