Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java

@@ -11,6 +11,7 @@ import com.bonus.canteen.core.account.domain.vo.AccOperationListVO;
 import com.bonus.canteen.core.account.domain.vo.AccTradeVo;
 import com.bonus.canteen.core.account.mapper.AccTradeMapper;
 import com.bonus.canteen.core.account.service.IAccTradeService;
+import com.bonus.canteen.core.pay.constants.PayStateEnum;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.houqin.utils.SM4EncryptUtils;
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 账户交易记录Service业务层处理
@@ -150,6 +152,9 @@ public class AccTradeServiceImpl implements IAccTradeService {
     @Override
     public List<AccOperationListVO> queryAccOperationList(AccWalletOperationQueryParam param) {
         String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
+        if(Objects.isNull(param.getPayState())) {
+            param.setPayState(PayStateEnum.PAY_SUCC.getKey());
+        }
         List<AccOperationListVO> list = accTradeMapper.queryAccOperationList(param, encryptedSearchValue);
         if(CollUtil.isNotEmpty(list)) {
             for(AccOperationListVO vo : list) {