Merge remote-tracking branch 'origin/master'

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackServiceImpl.java

@@ -78,7 +78,7 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
 //        );
 //        wrapper.eq("jb", JdBackVo::getType, dto.getType());
 //        wrapper.eq("jb", JdBackVo::getStatus, dto.getStatus());
-        wrapper.eq("jd", JdBackVo::getReturnStateName, dto.getReturnStateName());
+        wrapper.eq("jb", JdBackVo::getReturnStateName, dto.getReturnStateName());
         wrapper.like("jb", JdBackVo::getReturnId, dto.getReturnId());
 
         wrapper.orderByDesc("jb", JdBack::getId);

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -129,13 +129,14 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         wrapper.eq("jo", JdOrder::getState, dto.getState());
         wrapper.eq("jo", JdOrder::getConfirmState, dto.getConfirmState());
 
-//        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
-//            wrapper.keyword(dto.getKeyword(),
-//                    new SqlField("jo", JdOrderVo::getCode)
-////                    new SqlField("pi.custom_code"),
-////                    new SqlField("pi.name")
-//            );
-//        }
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            wrapper.keyword(dto.getKeyword(),
+                    new SqlField("jo", JdOrderVo::getOrderId),
+                    new SqlField("jo", JdOrderVo::getProviderName),
+                    new SqlField("jo", JdOrderVo::getDeliverCenterName),
+                    new SqlField("jo", JdOrderVo::getTotalPrice)
+            );
+        }
 //
 //        //添加权限过滤
 //        DynamicDataSourceContextHolder.push(SourceConstant.BASE);