Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreHealthOrderScrmController.java

@@ -103,6 +103,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
         if ("北京卓美".equals(signProjectName)) {
           param.setIsHealth("1");
         }
+        trimBlankQueryFields(param);
         fsStoreOrderService.applyHealthStoreQueryFlags(param);
         List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
         //金牛需求 区别其他项目 status = 6 (金牛代服管家) ,其他项目请避免使用订单状态status = 6
@@ -520,9 +521,28 @@ public class FsStoreHealthOrderScrmController extends BaseController {
             String[] arr = param.getOrderCodeList().split("[,，\\s]+");
             param.setOrderCodes(new ArrayList<>(Arrays.asList(arr)));
         }
+        trimBlankQueryFields(param);
         fsStoreOrderService.applyHealthStoreQueryFlags(param);
     }
 
+    /** 空白字符串查询条件按未传处理，避免列表/导出筛选不一致 */
+    private void trimBlankQueryFields(FsStoreOrderParam param) {
+        if (param == null) {
+            return;
+        }
+        if (param.getCateName() != null && param.getCateName().trim().isEmpty()) {
+            param.setCateName(null);
+        } else if (param.getCateName() != null) {
+            param.setCateName(param.getCateName().trim());
+        }
+        if (param.getNickname() != null && param.getNickname().trim().isEmpty()) {
+            param.setNickname(null);
+        }
+        if (param.getProductName() != null && param.getProductName().trim().isEmpty()) {
+            param.setProductName(null);
+        }
+    }
+
     // 检查文件是否为有效的Excel文件
     private boolean isValidExcelFile(String fileName) {
         for (String ext : ALLOWED_EXCEL_EXTENSIONS) {

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderItemScrmMapper.java

@@ -178,6 +178,9 @@ public interface FsStoreOrderItemScrmMapper
             "<if test=\"maps.productName != null and  maps.productName !=  '' \">" +
             " and psps.product_name like concat('%', #{maps.productName}, '%') " +
             "</if>" +
+            "<if test=\"maps.cateName != null and maps.cateName != ''\">" +
+            " and fspcs.cate_name like concat('%', #{maps.cateName}, '%') " +
+            "</if>" +
             "<if test = 'maps.orderType != null and maps.orderType != -1    '> " +
             "and o.order_type =#{maps.orderType} " +
             "</if>" +
@@ -256,6 +259,7 @@ public interface FsStoreOrderItemScrmMapper
             "left join company_user cu on cu.user_id=o.company_user_id " +
             "left join company_tcm_schedule cts on cts.id = o.schedule_id " +
             " left join fs_store_product_scrm psps on i.product_id=psps.product_id " +
+            " left join fs_store_product_category_scrm fspcs on fspcs.cate_id=psps.cate_id " +
             " LEFT JOIN (" +
             " SELECT sp.*, ROW_NUMBER() OVER (PARTITION BY sp.business_code ORDER BY sp.create_time DESC) as rn" +
             " FROM fs_store_payment_scrm sp WHERE sp.business_code IS NOT NULL" +
@@ -343,6 +347,9 @@ public interface FsStoreOrderItemScrmMapper
             "<if test=\"maps.productName != null and  maps.productName !=  '' \">" +
             " and psps.product_name like concat('%', #{maps.productName}, '%') " +
             "</if>" +
+            "<if test=\"maps.cateName != null and maps.cateName != ''\">" +
+            " and fspcs.cate_name like concat('%', #{maps.cateName}, '%') " +
+            "</if>" +
             "<if test = 'maps.orderType != null and maps.orderType != -1    '> " +
             "and o.order_type =#{maps.orderType} " +
             "</if>" +

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -779,6 +779,9 @@ public interface FsStoreOrderScrmMapper
             "<if test = 'maps.productName != null and maps.productName != \"\" '> " +
             "and EXISTS (select 1 from fs_store_order_item_scrm oi2 join fs_store_product_scrm fsp2 on oi2.product_id = fsp2.product_id where oi2.order_id = o.id and fsp2.product_name like CONCAT('%', #{maps.productName}, '%')) " +
             "</if>" +
+            "<if test=\"maps.cateName != null and maps.cateName != ''\">" +
+            "and EXISTS (select 1 from fs_store_order_item_scrm oi2 join fs_store_product_scrm fsp2 on oi2.product_id = fsp2.product_id join fs_store_product_category_scrm fspc2 on fspc2.cate_id = fsp2.cate_id where oi2.order_id = o.id and fspc2.cate_name like CONCAT('%', #{maps.cateName}, '%')) " +
+            "</if>" +
             "<if test = 'maps.orderType != null and maps.orderType != -1    '> " +
             "and o.order_type =#{maps.orderType} " +
             "</if>" +

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -1243,8 +1243,8 @@ public class QwUserServiceImpl implements IQwUserService
         }
         WxWorkSetCallbackUrlDTO wxWorkSetCallbackUrlDTO = new WxWorkSetCallbackUrlDTO();
         System.out.println("回调地址"+aiHostProper.getIpadUrl()+"/msg/callback/"+serverId);
-//        wxWorkSetCallbackUrlDTO.setUrl(aiHostProper.getIpadUrl()+"/msg/callback/"+serverId+"/"+loginParam.getIsNewVersion());
-        wxWorkSetCallbackUrlDTO.setUrl(aiHostProper.getIpadUrl()+"/msg/callback/"+serverId+"/"+true);
+        wxWorkSetCallbackUrlDTO.setUrl(aiHostProper.getIpadUrl()+"/msg/callback/"+serverId+"/"+loginParam.getIsNewVersion());
+//        wxWorkSetCallbackUrlDTO.setUrl(aiHostProper.getIpadUrl()+"/msg/callback/"+serverId+"/"+true);
         wxWorkSetCallbackUrlDTO.setUuid(data.getUuid());
         wxWorkService.SetCallbackUrl(wxWorkSetCallbackUrlDTO,serverId);