Merge branch 'store-plantform' of http://8.152.195.41:3000/alien/alien_cloud into sit

alien-store-platform/src/main/java/shop/alien/storeplatform/controller/LifeUserOrderPlatformController.java

@@ -1,10 +1,10 @@
 package shop.alien.storeplatform.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
@@ -69,8 +69,12 @@ public class LifeUserOrderPlatformController {
                                                         @RequestParam(value = "startTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd 00:00:00") String startTime,
                                                         @RequestParam(value = "endTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd 23:59:59") String endTime) {
         log.info("userOrder.queryUserOrderList:page={}&size={}&userId={}&storeId={}&orderType={}&orderStatus={}&name={}&startTime={}&endTime={}", pageNum, pageSize, userId, storeId, couponType, status, couponName, startTime, endTime);
-        if (StringUtils.isNotBlank(userId) && StringUtils.isNotBlank(storeId)) {
-            return R.fail("用户id和商户id不能同时为空");
+
+        if (storeId == null || storeId == "" ) {
+            return R.data(null);
+        }
+        if (userId == null || userId == "") {
+            return R.data(null);
         }
         return R.data(lifeUserOrderService.queryUserOrderList(pageNum, pageSize, userId, storeId, couponType, status, couponName, startTime, endTime, orderNo));
     }