优化pdd订单拉取

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

@@ -80,11 +80,12 @@ public class PddOrderApiController {
                 if (!b1) {
                     return AjaxResult.error("结束时间格式错误");
                 }
-            }
                 // 判断开始时间，结束时间 是不是一天
                 if(!req.getStartTime().equals(req.getEndTime())){
                     return AjaxResult.error("开始时间-结束时间不能超过1天");
                 }
+            }
+
             orderDate = req.getStartTime();
         }else{
             return AjaxResult.error("请选择订单时间");

api/oms-api/src/main/resources/application.yml

@@ -87,5 +87,5 @@ spring:
 mybatis-plus:
   mapper-locations: classpath*:mapper/**/*Mapper.xml
   type-aliases-package: cn.qihangerp.open.domain;cn.qihangerp.security.entity;
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志

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

@@ -59,15 +59,19 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
         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");
+            if(!b){
+                bo.setStartTime("");
             }
         }
         if(StringUtils.hasText(bo.getEndTime())){
             Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime());
             boolean b = matcher.find();
-            if(b){
-                bo.setEndTime(bo.getEndTime()+" 23:59:59");
+            if(!b){
+                bo.setEndTime("");
+            }
+        }else{
+            if(StringUtils.hasText(bo.getStartTime())) {
+                bo.setEndTime(bo.getStartTime());
             }
         }
 
@@ -75,8 +79,8 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
                 .eq(bo.getShopId()!=null,PddOrder::getShopId,bo.getShopId())
                 .eq(StringUtils.hasText(bo.getOrderSn()),PddOrder::getOrderSn,bo.getOrderSn())
                 .eq(StringUtils.hasText(bo.getOrderStatus()),PddOrder::getOrderStatus,bo.getOrderStatus())
-                .ge(StringUtils.hasText(bo.getStartTime()),PddOrder::getCreateTime,bo.getStartTime())
-                .le(StringUtils.hasText(bo.getEndTime()),PddOrder::getCreateTime,bo.getEndTime())
+                .ge(StringUtils.hasText(bo.getStartTime()),PddOrder::getCreatedTime,bo.getStartTime()+" 00:00:00")
+                .le(StringUtils.hasText(bo.getEndTime()),PddOrder::getCreatedTime,bo.getEndTime()+" 23:59:59")
                 ;
         pageQuery.setOrderByColumn("created_time");
         pageQuery.setIsAsc("desc");

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

@@ -19,13 +19,10 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="下单时间" prop="orderTime">
-        <el-date-picker clearable
-                        v-model="orderTime" value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
+      <el-form-item label="下单时间" prop="startTime">
+        <el-date-picker clearable @change="handleQuery"
+                        v-model="queryParams.startTime" value-format="yyyy-MM-dd"
+                        type="date" placeholder="下单时间">
         </el-date-picker>
       </el-form-item>
 
@@ -403,9 +400,11 @@ export default {
         this.queryParams.startTime = this.orderTime[0]
         this.queryParams.endTime = this.orderTime[1]
       }else {
+        if(!this.queryParams.startTime){
           this.queryParams.startTime = null
           this.queryParams.endTime = null
         }
+      }
       this.loading = true;
       listOrder(this.queryParams).then(response => {
         this.orderList = response.rows;
@@ -459,9 +458,16 @@ export default {
       }
     },
     handlePull() {
-      if(this.queryParams.shopId){
+      if(!this.queryParams.shopId) {
+        this.$modal.msgError("请选择店铺");
+        return
+      }
+      if(!this.queryParams.startTime) {
+        this.$modal.msgError("请选择下单时间");
+        return
+      }
         this.pullLoading = true
-        pullOrder({shopId:this.queryParams.shopId,updType:0}).then(response => {
+        pullOrder({shopId:this.queryParams.shopId,updType:0,startTime:this.queryParams.startTime}).then(response => {
           console.log('拉取PDD订单接口返回=====',response)
           if(response.code === 1401) {
               MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => {
@@ -483,11 +489,6 @@ export default {
           }
           this.pullLoading = false
         })
-      }else{
-        this.$modal.msgSuccess("请先选择店铺");
-      }
-
-      // this.$modal.msgSuccess("请先配置API");
     },
     handlePullUpdate(row) {
       // 接口拉取订单并更新