优化接口返回处理

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java

@@ -127,7 +127,7 @@ public class PddOrderApiController {
             logs.setPullTime(currDateTime);
             logs.setDuration(System.currentTimeMillis() - beginTime);
             pullLogsService.save(logs);
-            return AjaxResult.error("接口拉取错误："+upResult.getMsg());
+            return AjaxResult.error(upResult.getMsg());
         }
 
 

core/common/src/main/java/cn/qihangerp/common/AjaxResult.java

@@ -145,6 +145,14 @@ public class AjaxResult extends HashMap<String, Object>
     {
         return AjaxResult.error(msg, null);
     }
+    public static AjaxResult paramError(String msg)
+    {
+        return AjaxResult.error(ResultVoEnum.ParamsError.getIndex(),msg, null);
+    }
+    public static AjaxResult apiError(String msg)
+    {
+        return AjaxResult.error(ResultVoEnum.API_FAIL.getIndex(),msg, null);
+    }
 
     public static AjaxResult error(int code, String msg, Object data)
     {
@@ -169,7 +177,8 @@ public class AjaxResult extends HashMap<String, Object>
      */
     public static AjaxResult error(String msg, Object data)
     {
-        return new AjaxResult(HttpStatus.ERROR, msg, data);
+//        return new AjaxResult(HttpStatus.ERROR, msg, data);
+        return new AjaxResult(ResultVoEnum.API_FAIL.getIndex(), msg, data);
     }
 
     /**

core/common/src/main/java/cn/qihangerp/common/enums/HttpStatus.java

@@ -82,6 +82,7 @@ public class HttpStatus
      */
     public static final int ERROR = 500;
 
+
     /**
      * 接口未实现
      */

service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java

@@ -24,6 +24,8 @@ import org.springframework.util.StringUtils;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -51,14 +53,14 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
     private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN);
     @Override
     public PageResult<DouOrder> queryPageList(DouOrderBo bo, PageQuery pageQuery) {
-        long startTimeStamp = 0;
+        Long startTimestamp = null;
-        long endTimeStamp = 0;
+        Long endTimestamp = null;
         if(StringUtils.hasText(bo.getStartTime())){
             Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime());
             boolean b = matcher.find();
             if(b){
                 bo.setStartTime(bo.getStartTime()+" 00:00:00");
-                startTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getStartTime());
+//                startTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getStartTime());
             }
         }
         if(StringUtils.hasText(bo.getEndTime())){
@@ -66,16 +68,23 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
             boolean b = matcher.find();
             if(b){
                 bo.setEndTime(bo.getEndTime()+" 23:59:59");
-                endTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getEndTime());
+//                endTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getEndTime());
             }
         }
+        if(StringUtils.hasText(bo.getStartTime())) {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            LocalDateTime startTime = LocalDateTime.parse(bo.getStartTime(), formatter);
+            LocalDateTime endTime = LocalDateTime.parse(bo.getEndTime(), formatter);
 
+            startTimestamp = startTime.toEpochSecond(ZoneOffset.ofHours(8));
+            endTimestamp = endTime.toEpochSecond(ZoneOffset.ofHours(8));
+        }
         LambdaQueryWrapper<DouOrder> queryWrapper = new LambdaQueryWrapper<DouOrder>()
                 .eq(bo.getShopId()!=null,DouOrder::getSShopId,bo.getShopId())
                 .eq(StringUtils.hasText(bo.getOrderId()),DouOrder::getOrderId,bo.getOrderId())
                 .eq(StringUtils.hasText(bo.getOrderStatus()),DouOrder::getOrderStatus,bo.getOrderStatus())
-                .ge(StringUtils.hasText(bo.getStartTime()),DouOrder::getCreateTime, startTimeStamp)
+                .ge(StringUtils.hasText(bo.getStartTime()),DouOrder::getCreateTime, startTimestamp)
-                .le(StringUtils.hasText(bo.getEndTime()),DouOrder::getCreateTime,endTimeStamp)
+                .le(StringUtils.hasText(bo.getEndTime()),DouOrder::getCreateTime,endTimestamp)
                 ;
         pageQuery.setOrderByColumn("create_time");
         pageQuery.setIsAsc("desc");

vue/src/views/order/order_list.vue

@@ -19,11 +19,10 @@
             <span style="float: left">{{ item.name }}</span>
            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 500">微信小店</span>
            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 200">京东POP</span>
-           <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 280">京东自营</span>
            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 100">淘宝天猫</span>
            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 300">拼多多</span>
            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 400">抖店</span>
-           <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 999">线下渠道</span>
+           <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 999">其他</span>
           </el-option>
         </el-select>
       </el-form-item>

vue/src/views/pdd/order/index.vue

@@ -475,9 +475,11 @@ export default {
               });
 
             // return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-          }else{
+          }else if(response.code === 200){
             this.$modal.msgSuccess(JSON.stringify(response));
             this.getList()
+          }else{
+            this.$modal.msgError(response.msg)
           }
           this.pullLoading = false
         })