Merge remote-tracking branch 'origin/test' into test

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -1536,7 +1536,7 @@
         in_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -1545,7 +1545,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -1682,7 +1682,7 @@
         in_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -1691,7 +1691,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -4493,7 +4493,7 @@
         in_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -4502,7 +4502,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -4619,7 +4619,7 @@
         in_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -4628,7 +4628,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -4771,7 +4771,7 @@
         in_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -4780,7 +4780,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -4909,7 +4909,7 @@
         in_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -4918,7 +4918,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -5016,7 +5016,7 @@
         in_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -5025,7 +5025,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -5136,7 +5136,7 @@
         o.is_exception,
         o.create_time,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -5145,7 +5145,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -7073,7 +7073,7 @@
         o.create_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -7082,7 +7082,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,
@@ -7172,7 +7172,7 @@
         o.create_time,
         if(#{query.userType} = 1, 1, 2) as user_type,
         nor.customer_id as consignor_customer_id,
-        if(nor.customer_id != null and nor.customer_id > 0,
+        if(nor.customer_id is not null and nor.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
         "") as consignor_follow_customerService,
         nor.customer_number as consignor_customer_number,
@@ -7181,7 +7181,7 @@
         nor.phone as consignor_phone,
         nor.country_code as consignor_country_code,
         nee.customer_id as consignee_customer_id,
-        if(nee.customer_id != null and nee.customer_id > 0,
+        if(nee.customer_id is not null and nee.customer_id > 0,
         (SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
         "") as consignee_follow_customerService,
         nee.customer_number as consignee_customer_number,

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/reward/RewardServiceImpl.java

@@ -238,7 +238,7 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
         }
         //提货点id，领取方式，状态
         lambdaQuery.eqIfPresent(RewardDO::getNodeId, query.getNodeId())
-                .eq(StringUtils.isNotBlank(query.getPickMethod()), RewardDO::getPickMethod, query.getPickMethod())
+                .likeIfPresent(RewardDO::getPickMethod, query.getPickMethod())
                 .eqIfPresent(RewardDO::getStatus, query.getStatus());
         //判断memberId，筛选会员所在城市网点礼品
         if (query.getMemberId() != null && query.getNodeId() == null) {