ccjgmwz 3 lat temu
rodzic
commit
5cb014c659

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

@@ -106,11 +106,11 @@ public class AdminCheckQuartz {
     @Transactional(rollbackFor = Exception.class)
     public void dealOrder() throws Exception {
         Wrapper wrapper = new EntityWrapper();
-        wrapper.ne("order_status_name","卖家已发货");
+//        wrapper.ne("order_status_name","卖家已发货");
         wrapper.eq("dang_order_status","未发货");
         List<ShopOrder> list = shopOrderMapper.selectList(wrapper);
         for (ShopOrder shopOrder: list
-             ) {
+        ) {
             ShopAccount shopAccount = shopAccountMapper.selectById(shopOrder.getAccountId());
             flushCookie(shopAccount);
             CloseableHttpClient httpClient = HttpClientBuilder.create().build();
@@ -132,13 +132,14 @@ public class AdminCheckQuartz {
                     tmp = shopOrderMapper.selectOne(tmp);
                     data.setAccountId(shopAccount.getId());
                     if(tmp == null){
-                        data.setDangOrder(shopOrder.getOrderId());
+                        data.setDangOrder(shopOrder.getDangOrder());
                         data.setGmtCreate(new Date());
                         data.setGmtUpdate(new Date());
                         shopOrderMapper.insert(data);
                     }
                     else{
-                        data.setDangOrder(shopOrder.getOrderId());
+                        data.setDangOrder(shopOrder.getDangOrder());
+                        data.setOrderStatusName(shopOrder.getOrderStatusName());
                         data.setGmtUpdate(new Date());
                         shopOrderMapper.update(data,new EntityWrapper<ShopOrder>().eq("order_id",tmp.getOrderId()));
                     }

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

@@ -168,50 +168,50 @@ public class AdminUserServiceImpl implements AdminUserService {
     @Override
     public String test(String param) throws Exception {
 
-//        Wrapper wrapper = new EntityWrapper();
+        Wrapper wrapper = new EntityWrapper();
 //        wrapper.ne("order_status_name","卖家已发货");
-//        wrapper.eq("dang_order_status","未发货");
-//        List<ShopOrder> list = shopOrderMapper.selectList(wrapper);
-//        for (ShopOrder shopOrder: list
-//        ) {
-//            ShopAccount shopAccount = shopAccountMapper.selectById(shopOrder.getAccountId());
-//            flushCookie(shopAccount);
-//            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-//            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/getOrderInfo/?orderId="+shopOrder.getOrderId());
-//            try{
-//                //这里可以设置请求参数,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());
-//                HttpResponse response = httpClient.execute(get);//执行获取响应
-//                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
-//                    //返回字符串
-//                    String res = unicodeToString(EntityUtils.toString(response.getEntity(),"UTF-8"));
-//                    System.out.println(res);
-//                    JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-//                    Boolean status = (Boolean) datas.get("status");//获取返回数据状态,get获取的字段需要根据提供的返回值去获取
-//                    ShopOrder data = JSONObject.parseObject(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
-//                    ShopOrder tmp = new ShopOrder();
-//                    tmp.setOrderId(data.getOrderId());
-//                    tmp = shopOrderMapper.selectOne(tmp);
-//                    data.setAccountId(shopAccount.getId());
-//                    if(tmp == null){
-//                        data.setDangOrder(shopOrder.getOrderId());
-//                        data.setGmtCreate(new Date());
-//                        data.setGmtUpdate(new Date());
-//                        shopOrderMapper.insert(data);
-//                    }
-//                    else{
-//                        data.setDangOrder(shopOrder.getOrderId());
-//                        data.setGmtUpdate(new Date());
-//                        shopOrderMapper.update(data,new EntityWrapper<ShopOrder>().eq("order_id",tmp.getOrderId()));
-//                    }
-//                }
-//
-//            } catch (IOException e) {
-//                e.printStackTrace();
-//                return "";
-//            }
-//        }
+        wrapper.eq("dang_order_status","未发货");
+        List<ShopOrder> list = shopOrderMapper.selectList(wrapper);
+        for (ShopOrder shopOrder: list
+        ) {
+            ShopAccount shopAccount = shopAccountMapper.selectById(shopOrder.getAccountId());
+            flushCookie(shopAccount);
+            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
+            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/getOrderInfo/?orderId="+shopOrder.getOrderId());
+            try{
+                //这里可以设置请求参数,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());
+                HttpResponse response = httpClient.execute(get);//执行获取响应
+                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
+                    //返回字符串
+                    String res = unicodeToString(EntityUtils.toString(response.getEntity(),"UTF-8"));
+                    System.out.println(res);
+                    JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
+                    Boolean status = (Boolean) datas.get("status");//获取返回数据状态,get获取的字段需要根据提供的返回值去获取
+                    ShopOrder data = JSONObject.parseObject(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
+                    ShopOrder tmp = new ShopOrder();
+                    tmp.setOrderId(data.getOrderId());
+                    tmp = shopOrderMapper.selectOne(tmp);
+                    data.setAccountId(shopAccount.getId());
+                    if(tmp == null){
+                        data.setDangOrder(shopOrder.getDangOrder());
+                        data.setGmtCreate(new Date());
+                        data.setGmtUpdate(new Date());
+                        shopOrderMapper.insert(data);
+                    }
+                    else{
+                        data.setDangOrder(shopOrder.getDangOrder());
+                        data.setOrderStatusName(shopOrder.getOrderStatusName());
+                        data.setGmtUpdate(new Date());
+                        shopOrderMapper.update(data,new EntityWrapper<ShopOrder>().eq("order_id",tmp.getOrderId()));
+                    }
+                }
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
         Wrapper wrapper1 = new EntityWrapper();
         wrapper1.eq("order_status_name","卖家已发货");
         wrapper1.eq("dang_order_status","未发货");