feat : 商户查询修改

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/PayMerchantServiceImpl.java

@@ -20,11 +20,11 @@ import com.zanxiang.manage.service.PayWayService;
 import com.zanxiang.mybatis.entity.PayMerchant;
 import com.zanxiang.mybatis.entity.PayWay;
 import com.zanxiang.mybatis.mapper.PayMerchantMapper;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -89,16 +89,14 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
 
     @Override
     public List<PayMerchantListNoPageVO> listNoPage(PayMerchantListNoPageParam bo) {
-        PayMerchant app = BeanUtils.copy(bo, PayMerchant.class);
-        app.setStatus(StatusEnum.YES.getCode());
-        List<PayMerchant> list = list(new QueryWrapper<PayMerchant>().setEntity(app));
-        if (list.isEmpty()) {
-            return null;
-        }
+        List<PayMerchant> list = this.list(new LambdaQueryWrapper<PayMerchant>()
+                .eq(Strings.isNotBlank(bo.getMerchantNo()), PayMerchant::getMerchantNo, bo.getMerchantNo())
+                .eq(Strings.isNotBlank(bo.getMerchantName()), PayMerchant::getMerchantName, bo.getMerchantName())
+                .eq(PayMerchant::getStatus, StatusEnum.YES.getCode())
+        );
         return BeanUtils.copyList(list, PayMerchantListNoPageVO.class);
     }
 
-
     private PayMerchantListVO toVo(PayMerchant payMerchant) {
         if (Objects.isNull(payMerchant)) {
             return null;