更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/AdminCheckQuartz.java

@@ -178,7 +178,7 @@ public class AdminCheckQuartz {
         ) {
             flushCookie(shopAccount);
             CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=1000&orderStatus=ShippedToReceipt");
+            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=9999&orderStatus=ShippedToReceipt");
             //这里可以设置请求参数，token等
             get.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36");
             get.addHeader("cookie",shopAccount.getFuziCookie());
@@ -208,6 +208,10 @@ public class AdminCheckQuartz {
                         tmp.setDangOrder(dangOrder);
                         tmp.setAccountId(shopAccount.getId());
                         tmp.setDeleteFlag(0);
+                        Long time  = Long.parseLong(tmp.getShippingTime());
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        String time1 = sdf.format(new Date(time));
+                        tmp.setShippingTime(time1);
                         tmp.setGmtUpdate(new Date());
                         tmp.setGmtCreate(new Date());
                         ShopOrder tt = new ShopOrder();
@@ -405,7 +409,7 @@ public class AdminCheckQuartz {
          * 组成OrderInfo
          */
         Wrapper wrapper = new EntityWrapper();
-        wrapper.like("fuzi_name",shopOrder.getShippingCom());
+        wrapper.like("fuzi_name",shopOrder.getShippingComName());
         List<ShopTran> list = shopTranMapper.selectList(wrapper);
         if(list.size() == 0 ){
             throw new Exception("物流公司不存在");

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/impl/ShopOrderServiceImpl.java

@@ -145,6 +145,7 @@ public class ShopOrderServiceImpl implements IShopOrderService {
             wrapper.eq("admin_id", adminId);
         }
         wrapper.eq("delete_flag", 0);
+        wrapper.orderBy("gmt_update",false);
         List<ShopOrder> list = shopOrderMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
         for (ShopOrder shopOrder: list
              ) {
@@ -468,7 +469,7 @@ public class ShopOrderServiceImpl implements IShopOrderService {
          * 组成OrderInfo
          */
         Wrapper wrapper = new EntityWrapper();
-        wrapper.like("fuzi_name",shopOrder.getShippingCom());
+        wrapper.like("fuzi_name",shopOrder.getShippingComName());
         List<ShopTran> list = shopTranMapper.selectList(wrapper);
         if(list.size() == 0 ){
             throw new Exception("物流公司不存在");

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -44,10 +44,8 @@ import java.net.CookieStore;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -153,7 +151,7 @@ public class AdminUserServiceImpl implements AdminUserService {
              ) {
             flushCookie(shopAccount);
             CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=1000&orderStatus=ShippedToReceipt");
+            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=9999&orderStatus=ShippedToReceipt");
             //这里可以设置请求参数，token等
             get.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36");
             get.addHeader("cookie",shopAccount.getFuziCookie());
@@ -182,6 +180,11 @@ public class AdminUserServiceImpl implements AdminUserService {
                         }
                         tmp.setDangOrder(dangOrder);
                         tmp.setAccountId(shopAccount.getId());
+                        Long time  = Long.parseLong(tmp.getShippingTime());
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+                        String time1 = sdf.format(new Date(time * 1000));
+                        tmp.setShippingTime(time1);
                         tmp.setDeleteFlag(0);
                         tmp.setGmtUpdate(new Date());
                         tmp.setGmtCreate(new Date());

unimall-admin/src/views/shop/order/index.vue

@@ -129,8 +129,8 @@
         width="120"
       />
       <!-- <el-table-column label="付款状态" align="center" prop="payStatus" /> -->
-      <el-table-column label="孔网付款时间" align="center" prop="createdTime" />
-      <el-table-column label="快递公司" align="center" prop="shippingCom" />
+      <el-table-column label="孔网付款时间" align="center" width="120" prop="createdTime" />
+      <el-table-column label="快递公司" align="center" prop="shippingComName" />
       <el-table-column label="快递单号" align="center" prop="shipmentNum" />
       <!-- <el-table-column label="运费" align="center" prop="shippingFee" /> -->
       <el-table-column label="发货时间" align="center" prop="shippingTime" />

unimall-data/src/main/java/com/iotechn/unimall/data/domain/shop/ShopOrder.java

@@ -107,7 +107,7 @@ public class ShopOrder extends BaseDO{
     private String shipmentNum;
     @Excel(name = "快递公司")
     @TableField("shipping_com")
-    private String shippingCom;
+    private String shippingComName;
     @Excel(name = "快递公司编码")
     @TableField("shipping_com_code")
     private String shippingComCode;