Merge branch 'master' of http://git.zthymaoyi.com/gongdc/wuye

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

@@ -1,773 +0,0 @@
-package com.iotechn.unimall.admin;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.dangdang.openplatform.openapi.sdk.ApiException;
-import com.dangdang.openplatform.openapi.sdk.SdkClient;
-import com.dangdang.openplatform.openapi.sdk.internal.util.FileItem;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrderDetailsGetRequest;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrderGoodsSendRequest;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrdersContentDecryptRequest;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.EncryptDTO;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.OrderDetailsGet;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrderDetailsGetResponse;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrderGoodsSendResponse;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrdersContentDecryptResponse;
-import com.dangdang.openplatform.openapi.sdk.responsemodel.order.CryptUserInfo;
-import com.dangdang.openplatform.openapi.sdk.responsemodel.order.OrdersContentDecryptDTO;
-import com.iotechn.unimall.admin.api.user.AdminUserServiceImpl;
-import com.iotechn.unimall.biz.service.order.OrderBizService;
-import com.iotechn.unimall.core.exception.AdminServiceException;
-import com.iotechn.unimall.core.exception.ExceptionDefinition;
-import com.iotechn.unimall.data.component.LockComponent;
-import com.iotechn.unimall.data.domain.GroupShopDO;
-import com.iotechn.unimall.data.domain.OrderDO;
-import com.iotechn.unimall.data.domain.SpuDO;
-import com.iotechn.unimall.data.domain.shop.ShopAccount;
-import com.iotechn.unimall.data.domain.shop.ShopLog;
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import com.iotechn.unimall.data.domain.shop.ShopTran;
-import com.iotechn.unimall.data.dto.shop.XmlObject.OrderDetail;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGood;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGoodsInfo;
-import com.iotechn.unimall.data.enums.GroupShopAutomaticRefundType;
-import com.iotechn.unimall.data.enums.OrderStatusType;
-import com.iotechn.unimall.data.enums.StatusType;
-import com.iotechn.unimall.data.mapper.GroupShopMapper;
-import com.iotechn.unimall.data.mapper.OrderMapper;
-import com.iotechn.unimall.data.mapper.SpuMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopAccountMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopLogMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopOrderMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopTranMapper;
-import com.iotechn.unimall.data.util.XMLUtil;
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.util.CollectionUtils;
-
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Created by rize on 2019/7/21.
- */
-@Component
-@EnableScheduling
-public class AdminCheckQuartz {
-
-    private static final Logger logger = LoggerFactory.getLogger(AdminCheckQuartz.class);
-    private static final String ORDER_STATUS_LOCK = "ORDER_STATUS_QUARTZ_LOCK";
-    private static final String GROUP_SHOP_START_LOCK = "GROUP_SHOP_START_LOCK";
-    private static final String GROUP_SHOP_END_LOCK = "GROUP_SHOP_END_LOCK";
-    private static final String GROUP_SHOP_LOCK_LOCK = "GROUP_SHOP_LOCK_LOCK";
-    @Autowired
-    private ShopOrderMapper shopOrderMapper;
-    @Autowired
-    private ShopAccountMapper shopAccountMapper;
-    @Autowired
-    private ShopTranMapper shopTranMapper;
-    @Autowired
-    private ShopLogMapper shopLogMapper;
-    ExecutorService pool = Executors.newFixedThreadPool(2);
-
-    /**
-     * 订单数据定时轮训处理 每小时执行一次
-     */
-    @Scheduled(cron = "0 0 7-22 * * ? ")
-    public void task1(){
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                doSomething1();
-            }
-        }).start();
-    }
-    /**
-     * 订单数据定时轮训处理 每3小时执行一次
-     */
-//    @Scheduled(cron = "0 0 0 1/1 * ? ")
-    public void task2(){
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                doSomething2();
-            }
-        }).start();
-    }
-    public void dealOrder() throws Exception {
-        try{
-            List<ShopOrder> shopOrders = shopOrderMapper.selectList(new EntityWrapper<ShopOrder>()
-                    .eq("dang_order_status","未发货")
-                    .eq("order_status_name","卖家已发货"));
-            for (ShopOrder qqq:shopOrders
-            ) {
-                ShopAccount shopAccount = shopAccountMapper.selectById(qqq.getAccountId());
-                flushCookie(shopAccount);
-                CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-                HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=9999&orderId="+qqq.getOrderId());
-                //这里可以设置请求参数，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());
-                get.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-                CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-                try{
-
-                    if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
-                        String strTmp= EntityUtils.toString(response.getEntity(),"UTF-8");
-                        //返回字符串
-                        String res = unicodeToString(strTmp);
-                        JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                        Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                        List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
-                        for (ShopOrder tmp: data
-                        ) {
-                            //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                            String regEx="[^0-9]+";
-                            Pattern pattern = Pattern.compile(regEx);
-                            //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                            String[] cs = pattern.split(tmp.getRemarkText());
-                            String dangOrder = "";
-                            for (String str:cs
-                            ) {
-                                if(dangOrder.length()>= 11 || str.equals("*")){
-                                    break;
-                                }
-                                dangOrder += str;
-                            }
-                            tmp.setDangOrder(dangOrder);
-                            tmp.setAccountId(shopAccount.getId());
-                            Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
-                            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());
-                            if(tmp.getShippingComName().equals("快递包裹")||tmp.getShippingComName().equals("挂号印刷品")){
-                                tmp.setShippingComName("中国邮政");
-                            }
-                            ShopOrder tt = new ShopOrder();
-                            tt.setOrderId(tmp.getOrderId());
-                            tt =  shopOrderMapper.selectOne(tt);
-                            if(tt == null){
-                                shopOrderMapper.insert(tmp);
-                            }
-                            else{
-                                if(!tt.getDangOrder().equals(tmp.getDangOrder())||!tt.getShippingComName().equals(tmp.getShippingComName())){
-                                    shopOrderMapper.update(tmp,new EntityWrapper<ShopOrder>().eq("order_id",tt.getOrderId()));
-                                }
-                                dangOrderDeal(shopAccount,qqq);
-                            }
-                        }
-
-                    }
-
-
-                } catch (IOException e) {
-                    throw e;
-                }
-                finally {
-                    response.close();
-                    httpClient.close();
-                }
-            }
-        }
-        catch (Exception e) {
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("同步定时任务异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-        }
-    }
-
-    public void pullOrderList() throws Exception {
-        try{
-            List<ShopAccount> listAccount = shopAccountMapper.selectList(new EntityWrapper<ShopAccount>().eq("delete_flag",0));
-            for (ShopAccount shopAccount:listAccount
-            ) {
-                flushCookie(shopAccount);
-                for(int i=1;i<=5;i++){
-                    CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-                    HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr="+i+"&pageShow=300&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());
-
-                    CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-                    try{
-
-                        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
-                            String strTmp= EntityUtils.toString(response.getEntity(),"UTF-8");
-                            //返回字符串
-                            String res = unicodeToString(strTmp);
-                            JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                            Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                            List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
-                            if(data.size() == 0){
-                                break;
-                            }
-                            for (ShopOrder tmp: data
-                            ) {
-                                //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                                String regEx="[^0-9]+";
-                                Pattern pattern = Pattern.compile(regEx);
-                                //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                                String[] cs = pattern.split(tmp.getRemarkText());
-                                String dangOrder = "";
-                                for (String str:cs
-                                ) {
-                                    if(dangOrder.length()>= 11 || str.equals("*")){
-                                        break;
-                                    }
-                                    dangOrder += str;
-                                }
-                                tmp.setDangOrder(dangOrder);
-                                tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
-                                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());
-                                if(tmp.getShippingComName().equals("快递包裹")||tmp.getShippingComName().equals("挂号印刷品")){
-                                    tmp.setShippingComName("中国邮政");
-                                }
-                                ShopOrder tt = new ShopOrder();
-                                tt.setOrderId(tmp.getOrderId());
-                                tt =  shopOrderMapper.selectOne(tt);
-                                if(tt == null){
-                                    shopOrderMapper.insert(tmp);
-                                }
-                                else{
-                                    if(tt.getDangOrderStatus().equals("未发货")&&!tt.getDangOrder().equals(tmp.getDangOrder())){
-                                        shopOrderMapper.update(tmp,new EntityWrapper<ShopOrder>().eq("order_id",tt.getOrderId()));
-                                    }
-                                }
-                            }
-
-                        }
-
-
-                    } catch (IOException e) {
-                        throw e;
-                    }
-                    finally {
-                        response.close();
-                        httpClient.close();
-                    }
-                }
-
-            }
-        }
-        catch (Exception e){
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("爬取定时任务异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-        }
-
-    }
-    public void flushCookie(ShopAccount shopAccount){
-        try{
-            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet getMethod = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=30");
-            getMethod.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");
-            getMethod.addHeader("cookie",shopAccount.getFuziCookie());
-
-            httpClient.execute(getMethod);
-            CloseableHttpResponse response = httpClient.execute(getMethod);//执行获取响应
-            try{
-                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {//根据状态码处理
-                    String strTmp= EntityUtils.toString(response.getEntity(),"UTF-8");
-                    JSONObject datas = JSONObject.parseObject(strTmp);//转换成JSON格式
-                    Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                    if(status){
-                        return;
-                    }
-                }
-            }
-            catch (Exception e){
-                throw e;
-            }
-            finally {
-                response.close();
-                httpClient.close();
-            }
-
-            System.out.println("原cookies = "+shopAccount.getFuziCookie());
-
-            // 登陆 Url
-            String loginUrl = "https://login.kongfz.com/Pc/Login/account";
-            BasicCookieStore store= new BasicCookieStore();
-            httpClient =HttpClients.custom().setDefaultCookieStore(store).build();
-            // 模拟登陆，按实际服务器端要求选用 Post 或 Get 请求方式
-            HttpPost httpPost = new HttpPost(loginUrl);
-
-            // 装填参数
-            List<BasicNameValuePair> nvps = new ArrayList<BasicNameValuePair>();
-            nvps.add(new BasicNameValuePair("loginName", shopAccount.getFuziAccount()));
-            nvps.add(new BasicNameValuePair("loginPass", shopAccount.getFuziPassword()));
-            // 设置参数到请求对象中
-            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
-
-            // 设置header信息
-            // 指定报文头【Content-type】、【User-Agent】
-            httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
-
-            // 执行请求操作，并拿到结果（同步阻塞）
-            response = httpClient.execute(httpPost);
-            if(response.getStatusLine().getStatusCode() == 302){
-                List<org.apache.http.cookie.Cookie> cookielist = store.getCookies();
-                String nCookie = "";
-                for(org.apache.http.cookie.Cookie cookie: cookielist){
-                    String name=cookie.getName();
-                    String value=cookie.getValue();
-                    nCookie += name + "="+value+";";
-                }
-                System.out.println("nCookie:" + nCookie);
-                shopAccount.setFuziCookie(nCookie);
-                shopAccountMapper.updateById(shopAccount);
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("更新cookie成功");
-                shopLog.setContent("账号："+shopAccount.getFuziAccount()+",cookie："+nCookie);
-                shopLogMapper.insert(shopLog);
-            }
-            else{
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("更新cookie失败");
-                shopLog.setContent(response.toString());
-                shopLogMapper.insert(shopLog);
-            }
-            // 释放链接
-            response.close();
-
-        }catch (Exception e) {
-            e.printStackTrace();
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("更新cookie异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-        }
-
-    }
-
-    /**
-     * Unicode转 汉字字符串
-     *
-     * @param str
-     *            \u6728
-     * @return '木' 26408
-     */
-    public static String unicodeToString(String str) {
-
-        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
-        Matcher matcher = pattern.matcher(str);
-        char ch;
-        while (matcher.find()) {
-            // group 6728
-            String group = matcher.group(2);
-            // ch:'木' 26408
-            ch = (char) Integer.parseInt(group, 16);
-            // group1 \u6728
-            String group1 = matcher.group(1);
-            str = str.replace(group1, ch + "");
-        }
-        return str;
-    }
-    public void dangOrderDeal(ShopAccount shopAccount, ShopOrder shopOrder) throws Exception {
-        try{
-            /**
-             * 获取一下店铺的所有静态参数
-             */
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-            SdkClient sdkClient = new SdkClient(shopAccount.getDangAppKey(),shopAccount.getDangAppSecret(),shopAccount.getDangSession(),shopAccount.getDangVersion());
-
-            OrderDetailsGetRequest ss = new OrderDetailsGetRequest();
-            OrderDetailsGet orderDetailsGet = new OrderDetailsGet();
-            orderDetailsGet.setO(shopOrder.getDangOrder());
-            ss.setOrderDetailsGet(orderDetailsGet);
-            OrderDetailsGetResponse resultt = null;
-            try {
-                resultt = sdkClient.excute(ss);
-                if(resultt.getOrderID() == null){
-                    shopOrder.setDangOrderStatus("订单错误");
-                    shopOrderMapper.updateById(shopOrder);
-                    ShopLog shopLog = new ShopLog();
-                    shopLog.setGmtCreate(new Date());
-                    shopLog.setTitle("当当订单编号错误");
-                    shopLog.setContent("店铺："+shopAccount.getDangName()+",孔网订单："+shopOrder.getOrderId()+",当当订单："+shopOrder.getDangOrder());
-                    shopLogMapper.insert(shopLog);
-                    return;
-                }
-            } catch (ApiException e) {
-                throw e;
-            }
-
-            /**
-             * 从当当获取订单内应当有的所有图书
-             */
-            OrderDetailsGetRequest odgr = new OrderDetailsGetRequest();
-            OrderDetailsGet ogg = new OrderDetailsGet();
-            ogg.setO(shopOrder.getDangOrder());
-            odgr.setOrderDetailsGet(ogg);
-            OrderDetailsGetResponse odgrp = null;
-            try {
-                odgrp = sdkClient.excute(odgr);
-            } catch (ApiException e) {
-                throw e;
-            }
-            SdkClient jiemi = new SdkClient(shopAccount.getDangAppKey(),shopAccount.getDangAppSecret(),shopAccount.getDangSession(),shopAccount.getDangVersion());
-            OrdersContentDecryptRequest ordersContentDecryptRequest=new OrdersContentDecryptRequest();
-
-            List<EncryptDTO> encryptVOS = new ArrayList<EncryptDTO>();
-
-            EncryptDTO encryptVO1 = new EncryptDTO();
-            encryptVO1.setO(resultt.getOrderID().toString());
-            encryptVO1.setEncrypt_content(resultt.getEncrypt_content());
-            encryptVOS.add(encryptVO1);
-
-            ordersContentDecryptRequest.setO_cryptStr(JSON.toJSONString(encryptVOS));
-            OrdersContentDecryptResponse ordersContentDecryptResponse = null;
-            try {
-                ordersContentDecryptResponse=jiemi.excute(ordersContentDecryptRequest);
-            } catch (ApiException e) {
-                throw e;
-            }
-            List<OrdersContentDecryptDTO> data = ordersContentDecryptResponse.getData();
-            CryptUserInfo cryptUserInfo = data.get(0).getCryptUserInfo();
-
-
-
-            OrderDetail o = (OrderDetail) XMLUtil.convertXmlStrToObject(OrderDetail.class, odgrp.getBody());
-            SendGoodsInfo sgi = new SendGoodsInfo();
-            sgi.setConsigneeAddr(cryptUserInfo.getConsigneeAddr());
-            sgi.setConsigneeMobileTel(cryptUserInfo.getConsigneeMobileTel());
-            sgi.setConsigneeTel(cryptUserInfo.getConsigneeTel());
-            sgi.setConsigneeName(cryptUserInfo.getConsigneeName());
-            o.setSendGoodsInfo(sgi);
-            List<com.iotechn.unimall.data.dto.shop.XmlObject.ItemInfo> itemInfo = o.getItemsList().getItemInfo();
-            /**
-             * 将多个图书拼接XML
-             */
-            String itemsStr = "";
-            for (com.iotechn.unimall.data.dto.shop.XmlObject.ItemInfo ii : itemInfo) {
-                Map<String, Object> hashMap = new HashMap<>();
-                hashMap.put("DANG_DANG_ITEM_ID", ii.getItemID());
-                hashMap.put("SHU_LIANG", ii.getOrderCount());
-                hashMap.put("PRODUCT_ID", ii.getProductItemId());
-                itemsStr += SendGood.processTemplate(SendGood.ONE_ITEM, hashMap);
-            }
-
-
-            /**
-             * 组成OrderInfo
-             */
-            Wrapper wrapper = new EntityWrapper();
-            wrapper.like("fuzi_name",shopOrder.getShippingComName());
-            wrapper.eq("delete_flag",0);
-            List<ShopTran> list = shopTranMapper.selectList(wrapper);
-            HashMap<String, Object> stringObjectHashMap = new HashMap<>();
-            stringObjectHashMap.put("DANG_DANG_ORDER", shopOrder.getDangOrder());
-            if(list.size() == 0 ){
-//                throw new Exception("物流公司不存在");
-                System.out.println("物流公司不存在");
-                stringObjectHashMap.put("KUAI_DI_GONG_SI", "99999");
-                stringObjectHashMap.put("KUAI_DI_BIANMA", "99999");
-                stringObjectHashMap.put("KUAI_DI_GONG_SI_DIAN_HUA", "99999");
-            }
-            else{
-                stringObjectHashMap.put("KUAI_DI_GONG_SI", list.get(0).getName());
-                stringObjectHashMap.put("KUAI_DI_BIANMA", list.get(0).getCode1());
-                stringObjectHashMap.put("KUAI_DI_GONG_SI_DIAN_HUA", list.get(0).getPhone());
-            }
-            stringObjectHashMap.put("KUAI_DI_DAN_HAO", shopOrder.getShipmentNum());
-            stringObjectHashMap.put("SEND_ITEMS", itemsStr);
-
-            String orderListStr = SendGood.processTemplate(SendGood.ONE_ORDER, stringObjectHashMap);
-            HashMap<String, Object> tmplHash = new HashMap<>();
-            tmplHash.put("SEND_TIME", dateFormat.format(new Date()));
-            tmplHash.put("ORDER_LIST", orderListStr);
-
-            String xmlFileStr = SendGood.processTemplate(SendGood.TMPL, tmplHash);
-            System.out.println(xmlFileStr);
-            PrintWriter out = null;
-            try {
-                out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream("sendGoodNotPlat.xml"), "GBK")));
-            }catch (Exception e) {
-                throw e;
-            }
-            out.write(xmlFileStr);
-            out.close();
-            System.out.println("XML文件创建成功！");
-
-
-            /**
-             * 发货！！
-             */
-            OrderGoodsSendRequest sendGoodsRequest = new OrderGoodsSendRequest();
-            sendGoodsRequest.setSendGoodsFile(new FileItem(new File("sendGoodNotPlat.xml")));
-            OrderGoodsSendResponse result = null;
-            try {
-                result = sdkClient.excute(sendGoodsRequest);
-            } catch (ApiException e) {
-                throw e;
-            }
-            System.out.println(result.toString());
-            if(result.getResult().getOrdersList().get(0).getOrderOperCode() == 0 || result.getResult().getOrdersList().get(0).getOrderOperCode() == 605){
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("当当订单发货成功");
-                shopLog.setContent("店铺："+shopAccount.getDangName()+",孔网订单："+shopOrder.getOrderId()+",当当订单："+shopOrder.getDangOrder());
-                shopLogMapper.insert(shopLog);
-                shopOrder.setDangOrderStatus("已发货");
-                shopOrderMapper.update(shopOrder,new EntityWrapper<ShopOrder>().eq("order_id",shopOrder.getOrderId()));
-            }
-            else{
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("当当订单发货失败");
-                shopLog.setContent("店铺："+shopAccount.getDangName()+",孔网订单："+shopOrder.getOrderId()+",当当订单："+shopOrder.getDangOrder()+",快递："+shopOrder.getShippingComName());
-                shopLogMapper.insert(shopLog);
-            }
-        }
-        catch (Exception e){
-            e.printStackTrace();
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("当当发货异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-        }
-
-    }
-    /**
-     * 需要处理的任务
-     * */
-    private void doSomething1() {
-        try{
-            List<ShopAccount> list = shopAccountMapper.selectList(new EntityWrapper<>());
-            for (ShopAccount shopAccount:list
-            ) {
-                flushCookie(shopAccount);
-                List<ShopOrder> shopOrders = shopOrderMapper.selectList(new EntityWrapper<ShopOrder>()
-                        .eq("dang_order_status","未发货")
-                        .eq("account_id",shopAccount.getId())
-                        .eq("order_status_name","卖家已发货"));
-                for (ShopOrder qqq:shopOrders
-                ) {
-                    CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-                    HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=9999&orderId="+qqq.getOrderId());
-                    //这里可以设置请求参数，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());
-                    get.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-                    CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-                    try{
-
-                        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
-                            String strTmp= EntityUtils.toString(response.getEntity(),"UTF-8");
-                            //返回字符串
-                            String res = unicodeToString(strTmp);
-                            JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                            Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                            List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
-                            for (ShopOrder tmp: data
-                            ) {
-                                //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                                String regEx="[^0-9]+";
-                                Pattern pattern = Pattern.compile(regEx);
-                                //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                                String[] cs = pattern.split(tmp.getRemarkText());
-                                String dangOrder = "";
-                                for (String str:cs
-                                ) {
-                                    if(dangOrder.length()>= 11 || str.equals("*")){
-                                        break;
-                                    }
-                                    dangOrder += str;
-                                }
-                                tmp.setDangOrder(dangOrder);
-                                tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
-                                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());
-                                if(tmp.getShippingComName().equals("快递包裹")||tmp.getShippingComName().equals("挂号印刷品")){
-                                    tmp.setShippingComName("中国邮政");
-                                }
-                                ShopOrder tt = new ShopOrder();
-                                tt.setOrderId(tmp.getOrderId());
-                                tt =  shopOrderMapper.selectOne(tt);
-                                if(tt == null){
-                                    shopOrderMapper.insert(tmp);
-                                }
-                                else{
-                                    if(!tt.getDangOrder().equals(tmp.getDangOrder())||!tt.getShippingComName().equals(tmp.getShippingComName())){
-                                        shopOrderMapper.update(tmp,new EntityWrapper<ShopOrder>().eq("order_id",tt.getOrderId()));
-                                    }
-                                    dangOrderDeal(shopAccount,qqq);
-                                }
-                            }
-
-                        }
-
-
-                    } catch (IOException e) {
-                        throw e;
-                    }
-                    finally {
-                        response.close();
-                        httpClient.close();
-                    }
-                }
-            }
-
-        }
-        catch (Exception e) {
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("同步定时任务异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-        }
-
-    }
-    private void doSomething2() {
-        try{
-            List<ShopAccount> list = shopAccountMapper.selectList(new EntityWrapper<>());
-            for (ShopAccount shopAccount:list
-            ) {
-                flushCookie(shopAccount);
-                for (int i = 1; i <= 5; i++) {
-                    CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-                    HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=" + i + "&pageShow=300&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());
-
-                    CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-                    try {
-                        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {//根据状态码处理
-                            String strTmp = EntityUtils.toString(response.getEntity(), "UTF-8");
-                            //返回字符串
-                            String res = unicodeToString(strTmp);
-                            JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                            Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                            List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(), ShopOrder.class);//"data"是根据返回值设定
-                            if (data.size() == 0) {
-                                break;
-                            }
-                            for (ShopOrder tmp : data
-                            ) {
-                                //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                                String regEx = "[^0-9]+";
-                                Pattern pattern = Pattern.compile(regEx);
-                                //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                                String[] cs = pattern.split(tmp.getRemarkText());
-                                String dangOrder = "";
-                                for (String str : cs
-                                ) {
-                                    if (dangOrder.length() >= 11 || str.equals("*")) {
-                                        break;
-                                    }
-                                    dangOrder += str;
-                                }
-                                tmp.setDangOrder(dangOrder);
-                                tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
-                                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());
-                                if (tmp.getShippingComName().equals("快递包裹") || tmp.getShippingComName().equals("挂号印刷品")) {
-                                    tmp.setShippingComName("中国邮政");
-                                }
-                                ShopOrder tt = new ShopOrder();
-                                tt.setOrderId(tmp.getOrderId());
-                                tt = shopOrderMapper.selectOne(tt);
-                                if (tt == null) {
-                                    shopOrderMapper.insert(tmp);
-                                } else {
-                                    if (tt.getDangOrderStatus().equals("未发货") && !tt.getDangOrder().equals(tmp.getDangOrder())) {
-                                        shopOrderMapper.update(tmp, new EntityWrapper<ShopOrder>().eq("order_id", tt.getOrderId()));
-                                    }
-                                }
-                            }
-                        }
-                    } catch (IOException e) {
-                        throw e;
-                    } finally {
-                        response.close();
-                        httpClient.close();
-                    }
-                }
-            }
-            doSomething2();
-        }
-        catch (Exception e){
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("爬取定时任务异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-        }
-
-    }
-
-}

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

@@ -1,279 +0,0 @@
-package com.iotechn.unimall.admin;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.dangdang.openplatform.openapi.sdk.ApiException;
-import com.dangdang.openplatform.openapi.sdk.SdkClient;
-import com.dangdang.openplatform.openapi.sdk.internal.util.FileItem;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrderDetailsGetRequest;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrderGoodsSendRequest;
-import com.dangdang.openplatform.openapi.sdk.request.order.OrdersContentDecryptRequest;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.EncryptDTO;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.OrderDetailsGet;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrderDetailsGetResponse;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrderGoodsSendResponse;
-import com.dangdang.openplatform.openapi.sdk.response.order.OrdersContentDecryptResponse;
-import com.dangdang.openplatform.openapi.sdk.responsemodel.order.CryptUserInfo;
-import com.dangdang.openplatform.openapi.sdk.responsemodel.order.OrdersContentDecryptDTO;
-import com.iotechn.unimall.data.domain.shop.ShopAccount;
-import com.iotechn.unimall.data.domain.shop.ShopLog;
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import com.iotechn.unimall.data.domain.shop.ShopTran;
-import com.iotechn.unimall.data.dto.shop.XmlObject.OrderDetail;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGood;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGoodsInfo;
-import com.iotechn.unimall.data.mapper.shop.ShopAccountMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopLogMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopOrderMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopTranMapper;
-import com.iotechn.unimall.data.util.XMLUtil;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Component;
-
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @Author:chengchangjiang
- * @Description:
- * @Date:Created in 12:34 2022-06-16
- */
-@Component
-public class MyApplicationLisenter implements ApplicationListener<ContextRefreshedEvent> {
-
-    private static Logger logger = LoggerFactory.getLogger(MyApplicationLisenter.class);
-
-    @Autowired
-    private ShopAccountMapper shopAccountMapper;
-
-    @Autowired
-    private ShopLogMapper shopLogMapper;
-    @Autowired
-    private ShopOrderMapper shopOrderMapper;
-    @Autowired
-    private ShopTranMapper shopTranMapper;
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent e) {
-        logger.info("实现了ApplicationListener的onApplicationEvent方法");
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                doSomething2();
-            }
-        }).start();
-    }
-    private void doSomething2() {
-        try{
-            List<ShopAccount> list = shopAccountMapper.selectList(new EntityWrapper<ShopAccount>().orderBy("id",false));
-            for (ShopAccount shopAccount:list
-            ) {
-                flushCookie(shopAccount);
-                for (int i = 1; i <= 5; i++) {
-                    CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-                    HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=" + i + "&pageShow=300&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());
-
-                    CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-                    try {
-                        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {//根据状态码处理
-                            String strTmp = EntityUtils.toString(response.getEntity(), "UTF-8");
-                            //返回字符串
-                            String res = unicodeToString(strTmp);
-                            JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                            Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                            List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(), ShopOrder.class);//"data"是根据返回值设定
-                            if (data.size() == 0) {
-                                break;
-                            }
-                            for (ShopOrder tmp : data
-                            ) {
-                                //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                                String regEx = "[^0-9]+";
-                                Pattern pattern = Pattern.compile(regEx);
-                                //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                                String[] cs = pattern.split(tmp.getRemarkText());
-                                String dangOrder = "";
-                                for (String str : cs
-                                ) {
-                                    if (dangOrder.length() >= 11 || str.equals("*")) {
-                                        break;
-                                    }
-                                    dangOrder += str;
-                                }
-                                tmp.setDangOrder(dangOrder);
-                                tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
-                                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());
-                                if (tmp.getShippingComName().equals("快递包裹") || tmp.getShippingComName().equals("挂号印刷品")) {
-                                    tmp.setShippingComName("中国邮政");
-                                }
-                                ShopOrder tt = new ShopOrder();
-                                tt.setOrderId(tmp.getOrderId());
-                                tt = shopOrderMapper.selectOne(tt);
-                                if (tt == null) {
-                                    shopOrderMapper.insert(tmp);
-                                } else {
-                                    if (tt.getDangOrderStatus().equals("未发货") && !tt.getDangOrder().equals(tmp.getDangOrder())) {
-                                        shopOrderMapper.update(tmp, new EntityWrapper<ShopOrder>().eq("order_id", tt.getOrderId()));
-                                    }
-                                }
-                            }
-                        }
-                    } catch (IOException e) {
-                        throw e;
-                    } finally {
-                        response.close();
-                        httpClient.close();
-                    }
-                }
-            }
-            doSomething2();
-        }
-        catch (Exception e){
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("爬取定时任务异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-        }
-
-    }
-    public void flushCookie(ShopAccount shopAccount) {
-        try {
-            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet getMethod = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=30");
-            getMethod.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");
-            getMethod.addHeader("cookie", shopAccount.getFuziCookie());
-
-            httpClient.execute(getMethod);
-            CloseableHttpResponse response = httpClient.execute(getMethod);//执行获取响应
-            try {
-                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {//根据状态码处理
-                    String strTmp = EntityUtils.toString(response.getEntity(), "UTF-8");
-                    JSONObject datas = JSONObject.parseObject(strTmp);//转换成JSON格式
-                    Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                    if (status) {
-                        return;
-                    }
-                }
-            } catch (Exception e) {
-                throw e;
-            } finally {
-                response.close();
-                httpClient.close();
-            }
-
-            System.out.println("原cookies = " + shopAccount.getFuziCookie());
-
-            // 登陆 Url
-            String loginUrl = "https://login.kongfz.com/Pc/Login/account";
-            BasicCookieStore store = new BasicCookieStore();
-            httpClient = HttpClients.custom().setDefaultCookieStore(store).build();
-            // 模拟登陆，按实际服务器端要求选用 Post 或 Get 请求方式
-            HttpPost httpPost = new HttpPost(loginUrl);
-
-            // 装填参数
-            List<BasicNameValuePair> nvps = new ArrayList<BasicNameValuePair>();
-            nvps.add(new BasicNameValuePair("loginName", shopAccount.getFuziAccount()));
-            nvps.add(new BasicNameValuePair("loginPass", shopAccount.getFuziPassword()));
-            // 设置参数到请求对象中
-            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
-
-            // 设置header信息
-            // 指定报文头【Content-type】、【User-Agent】
-            httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
-
-            // 执行请求操作，并拿到结果（同步阻塞）
-            response = httpClient.execute(httpPost);
-            if (response.getStatusLine().getStatusCode() == 302) {
-                List<org.apache.http.cookie.Cookie> cookielist = store.getCookies();
-                String nCookie = "";
-                for (org.apache.http.cookie.Cookie cookie : cookielist) {
-                    String name = cookie.getName();
-                    String value = cookie.getValue();
-                    nCookie += name + "=" + value + ";";
-                }
-                System.out.println("nCookie:" + nCookie);
-                shopAccount.setFuziCookie(nCookie);
-                shopAccountMapper.updateById(shopAccount);
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("更新cookie成功");
-                shopLog.setContent("账号：" + shopAccount.getFuziAccount() + ",cookie：" + nCookie);
-                shopLogMapper.insert(shopLog);
-            } else {
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("更新cookie失败");
-                shopLog.setContent(response.toString());
-                shopLogMapper.insert(shopLog);
-            }
-            // 释放链接
-            response.close();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("更新cookie异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-        }
-
-    }
-
-
-    /**
-     * Unicode转 汉字字符串
-     *
-     * @param str \u6728
-     * @return '木' 26408
-     */
-    public static String unicodeToString(String str) {
-
-        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
-        Matcher matcher = pattern.matcher(str);
-        char ch;
-        while (matcher.find()) {
-            // group 6728
-            String group = matcher.group(2);
-            // ch:'木' 26408
-            ch = (char) Integer.parseInt(group, 16);
-            // group1 \u6728
-            String group1 = matcher.group(1);
-            str = str.replace(group1, ch + "");
-        }
-        return str;
-    }
-
-}

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

@@ -79,7 +79,7 @@ public class AdminServiceImpl implements AdminService {
 //            throw new AdminServiceException(ExceptionDefinition.ADMIN_VERIFYCODE_ERROR);
 //        }
 
-		if (!MD5Util.verify(password, username, adminDO.getPassword())) {
+		if (!password.equals(adminDO.getPassword())) {
 			throw new AdminServiceException(ExceptionDefinition.ADMIN_PASSWORD_ERROR);
 		}
 		List<Long> ids = JSONObject.parseArray(adminDO.getRoleIds(), Long.class);

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

@@ -1,76 +0,0 @@
-package com.iotechn.unimall.admin.api.shop;
-
-
-import com.iotechn.unimall.data.domain.shop.ShopAccount;
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 电商账户表Service接口
- *
- * @author jlb
- * @date 2022-05-28
- */
-@HttpOpenApi(group = "admin.shop.shopAccount", description = "电商账户表")
-public interface IShopAccountService {
-    @HttpMethod(description = "新增", permission = "admin:shop:shopAccount:add", permissionParentName = "账户管理", permissionName = "电商账户表管理")
-    public Boolean add(@NotNull @HttpParam(name = "shopAccount", type = HttpParamType.COMMON, description = "电商账户表") ShopAccount shopAccount,
-                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "列表", permission = "admin:shop:shopAccount:list", permissionParentName = "账户管理", permissionName = "电商账户表管理")
-    public Page<ShopAccount> list(
-            @HttpParam(name = "dangAccount", type = HttpParamType.COMMON, description = "当当账号") String dangAccount,
-            @HttpParam(name = "dangPassword", type = HttpParamType.COMMON, description = "当当密码") String dangPassword,
-            @HttpParam(name = "fuziAccount", type = HttpParamType.COMMON, description = "夫子账号") String fuziAccount,
-            @HttpParam(name = "fuziPassword", type = HttpParamType.COMMON, description = "夫子密码") String fuziPassword,
-            @HttpParam(name = "fuziCookie", type = HttpParamType.COMMON, description = "夫子cookie") String fuziCookie,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "") Long adminId,
-            @HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-            throws ServiceException;
-
-    @HttpMethod(description = "删除", permission = "admin:shop:shopAccount:delete", permissionParentName = "账户管理", permissionName = "电商账户表管理")
-    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "修改", permission = "admin:shop:shopAccount:update", permissionParentName = "账户管理", permissionName = "电商账户表管理")
-    public Boolean update(@NotNull @HttpParam(name = "shopAccount", type = HttpParamType.COMMON, description = "电商账户表") ShopAccount shopAccount,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-    @HttpMethod(description = "修改", permission = "admin:shop:shopAccount:edit", permissionParentName = "账户管理", permissionName = "电商账户表管理")
-    public Boolean edit(@NotNull @HttpParam(name = "shopAccount", type = HttpParamType.COMMON, description = "电商账户表") ShopAccount shopAccount,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "查询", permission = "admin:shop:shopAccount:get", permissionParentName = "账户管理", permissionName = "电商账户表管理")
-    public ShopAccount get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "导出excl表", permission = "admin:shop:shopAccount:export", permissionParentName = "账户管理", permissionName = "电商账户表管理")
-    public String export(
-            @HttpParam(name = "dangAccount", type = HttpParamType.COMMON, description = "当当账号") String dangAccount,
-            @HttpParam(name = "dangPassword", type = HttpParamType.COMMON, description = "当当密码") String dangPassword,
-            @HttpParam(name = "fuziAccount", type = HttpParamType.COMMON, description = "夫子账号") String fuziAccount,
-            @HttpParam(name = "fuziPassword", type = HttpParamType.COMMON, description = "夫子密码") String fuziPassword,
-            @HttpParam(name = "fuziCookie", type = HttpParamType.COMMON, description = "夫子cookie") String fuziCookie,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
-    @HttpMethod(description = "角色枚举")
-    public List<Map<String,Object>> options(
-            @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "管理员ID") Long adminId) throws ServiceException;
-
-}

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

@@ -1,61 +0,0 @@
-package com.iotechn.unimall.admin.api.shop;
-
-
-import com.iotechn.unimall.data.domain.shop.ShopLog;
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.model.Page;
-import java.util.Date;
-
-/**
- * 同步日志Service接口
- * 
- * @author jlb
- * @date 2022-06-08
- */
-@HttpOpenApi(group = "admin.shop.shopLog", description = "同步日志")
-public interface IShopLogService{
-	@HttpMethod(description = "新增", permission = "admin:shop:shopLog:add", permissionParentName = "同步日志", permissionName = "同步日志管理")
-	public Boolean add(@NotNull @HttpParam(name = "shopLog", type = HttpParamType.COMMON, description = "同步日志") ShopLog shopLog,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "列表", permission = "admin:shop:shopLog:list",permissionParentName = "同步日志", permissionName = "同步日志管理")
-	public Page<ShopLog> list(
-								@HttpParam(name = "title", type = HttpParamType.COMMON, description = "标题") String title,
-							@HttpParam(name = "content", type = HttpParamType.COMMON, description = "内容") String content,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-					@HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-		@HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-		throws ServiceException;
-
-	@HttpMethod(description = "删除", permission = "admin:shop:shopLog:delete",permissionParentName = "同步日志", permissionName = "同步日志管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-
-	@HttpMethod(description = "修改", permission = "admin:shopLog:shopLog:update",permissionParentName = "同步日志", permissionName = "同步日志管理")
-	public Boolean update(@NotNull @HttpParam(name = "shopLog", type = HttpParamType.COMMON, description = "同步日志") ShopLog shopLog,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "查询", permission = "admin:shop:shopLog:get",permissionParentName = "同步日志", permissionName = "同步日志管理")
-	public ShopLog get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:shop:shopLog:export",permissionParentName = "同步日志", permissionName = "同步日志管理")
-	public String export(
-								@HttpParam(name = "title", type = HttpParamType.COMMON, description = "标题") String title,
-							@HttpParam(name = "content", type = HttpParamType.COMMON, description = "内容") String content,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
-	
-}

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

@@ -1,99 +0,0 @@
-package com.iotechn.unimall.admin.api.shop;
-
-
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.dto.shop.ShopDTO;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-/**
- * 电商订单表Service接口
- *
- * @author jlb
- * @date 2022-05-28
- */
-@HttpOpenApi(group = "admin.shop.shopOrder", description = "电商订单表")
-public interface IShopOrderService {
-    @HttpMethod(description = "新增", permission = "admin:shop:shopOrder:add", permissionParentName = "电商管理", permissionName = "电商订单表管理")
-    public Boolean add(@NotNull @HttpParam(name = "shopOrder", type = HttpParamType.COMMON, description = "电商订单表") ShopOrder shopOrder,
-                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "列表", permission = "admin:shop:shopOrder:list", permissionParentName = "电商管理", permissionName = "电商订单表管理")
-    public Page<ShopOrder> list(
-            @HttpParam(name = "accountId", type = HttpParamType.COMMON, description = "账户表id") Long accountId,
-            @HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "当当订单号") String orderId,
-            @HttpParam(name = "dangOrder", type = HttpParamType.COMMON, description = "夫子订单号") String dangOrder,
-            @HttpParam(name = "dangOrderStatus", type = HttpParamType.COMMON, description = "当当发货状态") String dangOrderStatus,
-            @HttpParam(name = "address", type = HttpParamType.COMMON, description = "详细地址") String address,
-            @HttpParam(name = "provName", type = HttpParamType.COMMON, description = "省") String provName,
-            @HttpParam(name = "cityName", type = HttpParamType.COMMON, description = "市") String cityName,
-            @HttpParam(name = "areaName", type = HttpParamType.COMMON, description = "区") String areaName,
-            @HttpParam(name = "orderStatus", type = HttpParamType.COMMON, description = "订单状态") String orderStatus,
-            @HttpParam(name = "orderStatusName", type = HttpParamType.COMMON, description = "订单状态") String orderStatusName,
-            @HttpParam(name = "payStatus", type = HttpParamType.COMMON, description = "付款状态") String payStatus,
-            @HttpParam(name = "payName", type = HttpParamType.COMMON, description = "付款状态") String payName,
-            @HttpParam(name = "receiverName", type = HttpParamType.COMMON, description = "收件人") String receiverName,
-            @HttpParam(name = "mobile", type = HttpParamType.COMMON, description = "收件人电话") String mobile,
-            @HttpParam(name = "receiver", type = HttpParamType.COMMON, description = "收件人详细信息") String receiver,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "shopName", type = HttpParamType.COMMON, description = "店铺名称") String shopName,
-            @HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-            throws ServiceException;
-
-    @HttpMethod(description = "删除", permission = "admin:shop:shopOrder:delete", permissionParentName = "电商管理", permissionName = "电商订单表管理")
-    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
-
-    @HttpMethod(description = "修改", permission = "admin:shopOrder:shopOrder:update", permissionParentName = "电商管理", permissionName = "电商订单表管理")
-    public Boolean update(@NotNull @HttpParam(name = "shopOrder", type = HttpParamType.COMMON, description = "电商订单表") ShopOrder shopOrder,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "查询", permission = "admin:shop:shopOrder:get", permissionParentName = "电商管理", permissionName = "电商订单表管理")
-    public ShopOrder get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "导出excl表", permission = "admin:shop:shopOrder:export", permissionParentName = "电商管理", permissionName = "电商订单表管理")
-    public String export(
-            @HttpParam(name = "accountId", type = HttpParamType.COMMON, description = "账户表id") Long accountId,
-            @HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "当当订单号") String orderId,
-            @HttpParam(name = "dangOrder", type = HttpParamType.COMMON, description = "夫子订单号") String dangOrder,
-            @HttpParam(name = "address", type = HttpParamType.COMMON, description = "详细地址") String address,
-            @HttpParam(name = "provName", type = HttpParamType.COMMON, description = "省") String provName,
-            @HttpParam(name = "cityName", type = HttpParamType.COMMON, description = "市") String cityName,
-            @HttpParam(name = "areaName", type = HttpParamType.COMMON, description = "区") String areaName,
-            @HttpParam(name = "orderStatus", type = HttpParamType.COMMON, description = "订单状态") String orderStatus,
-            @HttpParam(name = "orderStatusName", type = HttpParamType.COMMON, description = "订单状态") String orderStatusName,
-            @HttpParam(name = "payStatus", type = HttpParamType.COMMON, description = "付款状态") String payStatus,
-            @HttpParam(name = "payName", type = HttpParamType.COMMON, description = "付款状态") String payName,
-            @HttpParam(name = "receiverName", type = HttpParamType.COMMON, description = "收件人") String receiverName,
-            @HttpParam(name = "mobile", type = HttpParamType.COMMON, description = "收件人电话") String mobile,
-            @HttpParam(name = "receiver", type = HttpParamType.COMMON, description = "收件人详细信息") String receiver,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
-    @HttpMethod(description = "同步订单信息")
-    public String syncOrderInfoList(
-            @NotNull @HttpParam(name = "shopDTO", type = HttpParamType.COMMON, description = "参数列表") ShopDTO shopDTO) throws Exception;
-    @HttpMethod(description = "获取订单信息")
-    public ShopOrder syncOrderInfo(
-            @NotNull @HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "夫子订单编号") String orderId,
-            @NotNull @HttpParam(name = "dangId", type = HttpParamType.COMMON, description = "当当店铺id") String dangId,
-            @NotNull @HttpParam(name = "dangOrder", type = HttpParamType.COMMON, description = "当当订单编号") String dangOrder) throws Exception;
-    @HttpMethod(description = "百度智能外呼调用")
-    public ShopOrder callPhone(@NotNull @HttpParam(name = "mobile", type = HttpParamType.COMMON, description = "电话") String mobile) throws Exception;
-
-}

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

@@ -1,65 +0,0 @@
-package com.iotechn.unimall.admin.api.shop;
-
-
-import com.iotechn.unimall.data.domain.shop.ShopTran;
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.model.Page;
-import java.util.Date;
-
-/**
- * 物流公司Service接口
- * 
- * @author jlb
- * @date 2022-05-29
- */
-@HttpOpenApi(group = "admin.shop.shopTran", description = "物流公司")
-public interface IShopTranService{
-	@HttpMethod(description = "新增", permission = "admin:shop:shopTran:add", permissionParentName = "宠物管理", permissionName = "物流公司管理")
-	public Boolean add(@NotNull @HttpParam(name = "shopTran", type = HttpParamType.COMMON, description = "物流公司") ShopTran shopTran,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "列表", permission = "admin:shop:shopTran:list",permissionParentName = "宠物管理", permissionName = "物流公司管理")
-	public Page<ShopTran> list(
-								@HttpParam(name = "name", type = HttpParamType.COMMON, description = "物流公司名称") String name,
-							@HttpParam(name = "code1", type = HttpParamType.COMMON, description = "物流公司编码") String code1,
-							@HttpParam(name = "code2", type = HttpParamType.COMMON, description = "物流公司编码") String code2,
-							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "物流公司电话") String phone,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Integer deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-		throws ServiceException;
-
-	@HttpMethod(description = "删除", permission = "admin:shop:shopTran:delete",permissionParentName = "宠物管理", permissionName = "物流公司管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-
-	@HttpMethod(description = "修改", permission = "admin:shopTran:shopTran:update",permissionParentName = "宠物管理", permissionName = "物流公司管理")
-	public Boolean update(@NotNull @HttpParam(name = "shopTran", type = HttpParamType.COMMON, description = "物流公司") ShopTran shopTran,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "查询", permission = "admin:shop:shopTran:get",permissionParentName = "宠物管理", permissionName = "物流公司管理")
-	public ShopTran get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:shop:shopTran:export",permissionParentName = "宠物管理", permissionName = "物流公司管理")
-	public String export(
-								@HttpParam(name = "name", type = HttpParamType.COMMON, description = "物流公司名称") String name,
-							@HttpParam(name = "code1", type = HttpParamType.COMMON, description = "物流公司编码") String code1,
-							@HttpParam(name = "code2", type = HttpParamType.COMMON, description = "物流公司编码") String code2,
-							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "物流公司电话") String phone,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Integer deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
-	
-}

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

@@ -1,177 +0,0 @@
-package com.iotechn.unimall.admin.api.shop.impl;
-
-import java.util.*;
-
-import com.iotechn.unimall.data.domain.AdminDO;
-import com.iotechn.unimall.data.domain.RoleDO;
-import com.iotechn.unimall.data.mapper.AdminMapper;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.shop.ShopAccountMapper;
-import com.iotechn.unimall.data.domain.shop.ShopAccount;
-import com.iotechn.unimall.admin.api.shop.IShopAccountService;
-import com.iotechn.unimall.data.model.Page;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 电商账户表Service业务层处理
- *
- * @author jlb
- * @date 2022-05-28
- */
-@Service
-public class ShopAccountServiceImpl implements IShopAccountService {
-    @Autowired
-    private ShopAccountMapper shopAccountMapper;
-    @Autowired
-    private AdminMapper adminMapper;
-
-    @Override
-    public Boolean add(ShopAccount shopAccount, Long adminId) throws ServiceException {
-        Date now = new Date();
-        shopAccount.setGmtCreate(now);
-        shopAccount.setGmtUpdate(now);
-        shopAccount.setAdminId(adminId);
-        return shopAccountMapper.insert(shopAccount) > 0;
-    }
-
-    @Override
-    public Page<ShopAccount> list(String dangAccount, String dangPassword, String fuziAccount, String fuziPassword, String fuziCookie, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<ShopAccount> wrapper = new EntityWrapper<ShopAccount>();
-        if (!StringUtils.isEmpty(dangAccount)) {
-            wrapper.eq("dang_account", dangAccount);
-        }
-        if (!StringUtils.isEmpty(dangPassword)) {
-            wrapper.eq("dang_password", dangPassword);
-        }
-        if (!StringUtils.isEmpty(fuziAccount)) {
-            wrapper.eq("fuzi_account", fuziAccount);
-        }
-        if (!StringUtils.isEmpty(fuziPassword)) {
-            wrapper.eq("fuzi_password", fuziPassword);
-        }
-        if (!StringUtils.isEmpty(fuziCookie)) {
-            wrapper.eq("fuzi_cookie", fuziCookie);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (adminId != 1) {
-            wrapper.eq("user_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<ShopAccount> list = shopAccountMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        for (ShopAccount shopAccount:list
-             ) {
-            if(shopAccount.getUserId() != null){
-                AdminDO adminDO = adminMapper.selectById(shopAccount.getUserId());
-                if(adminDO != null){
-                    shopAccount.setUserName(adminDO.getUsername());
-                }
-            }
-        }
-        Integer count = shopAccountMapper.selectCount(wrapper);
-        return new Page<ShopAccount>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(Long id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            ShopAccount tmp = shopAccountMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                shopAccountMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(ShopAccount shopAccount, Long adminId) throws ServiceException {
-        Date now = new Date();
-        shopAccount.setGmtUpdate(now);
-        shopAccount.setAdminId(adminId);
-        return shopAccountMapper.updateById(shopAccount) > 0;
-    }
-    @Override
-    public Boolean edit(ShopAccount shopAccount, Long adminId) throws ServiceException {
-        Date now = new Date();
-        shopAccount.setGmtUpdate(now);
-        shopAccount.setAdminId(adminId);
-        return shopAccountMapper.updateById(shopAccount) > 0;
-    }
-    @Override
-    public ShopAccount get(Long id) throws ServiceException {
-        return shopAccountMapper.selectById(id);
-    }
-
-    @Override
-    public String export(String dangAccount, String dangPassword, String fuziAccount, String fuziPassword, String fuziCookie, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<ShopAccount> wrapper = new EntityWrapper<ShopAccount>();
-        if (!StringUtils.isEmpty(dangAccount)) {
-            wrapper.eq("dang_account", dangAccount);
-        }
-        if (!StringUtils.isEmpty(dangPassword)) {
-            wrapper.eq("dang_password", dangPassword);
-        }
-        if (!StringUtils.isEmpty(fuziAccount)) {
-            wrapper.eq("fuzi_account", fuziAccount);
-        }
-        if (!StringUtils.isEmpty(fuziPassword)) {
-            wrapper.eq("fuzi_password", fuziPassword);
-        }
-        if (!StringUtils.isEmpty(fuziCookie)) {
-            wrapper.eq("fuzi_cookie", fuziCookie);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<ShopAccount> list = shopAccountMapper.selectList(wrapper);
-        ExcelUtil<ShopAccount> util = new ExcelUtil<ShopAccount>(ShopAccount.class);
-        return util.exportExcel(list, "操作日志");
-    }
-    @Override
-    public List<Map<String, Object>> options(Long adminId) throws ServiceException {
-        List<AdminDO> roleDOS = adminMapper.selectList(new EntityWrapper<>());
-        List<Map<String,Object>> list = new LinkedList<>();
-        roleDOS.forEach(item -> {
-            Map<String,Object> map = new HashMap<>();
-            map.put("value", item.getId());
-            map.put("label", item.getUsername());
-            list.add(map);
-        });
-        return list;
-    }
-
-}

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

@@ -1,129 +0,0 @@
-package com.iotechn.unimall.admin.api.shop.impl;
-
-import java.util.List;
-
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.shop.ShopLogMapper;
-import com.iotechn.unimall.data.domain.shop.ShopLog;
-import com.iotechn.unimall.admin.api.shop.IShopLogService;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 同步日志Service业务层处理
- *
- * @author jlb
- * @date 2022-06-08
- */
-@Service
-public class ShopLogServiceImpl implements IShopLogService {
-    @Autowired
-    private ShopLogMapper shopLogMapper;
-
-    @Override
-    public Boolean add(ShopLog shopLog, Long adminId) throws ServiceException {
-        Date now = new Date();
-        shopLog.setGmtCreate(now);
-        shopLog.setGmtUpdate(now);
-        shopLog.setAdminId(adminId);
-        return shopLogMapper.insert(shopLog) > 0;
-    }
-
-    @Override
-    public Page<ShopLog> list(String title, String content, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<ShopLog> wrapper = new EntityWrapper<ShopLog>();
-        if (!StringUtils.isEmpty(title)) {
-            wrapper.like("title", title);
-        }
-        if (!StringUtils.isEmpty(content)) {
-            wrapper.like("content", content);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-		wrapper.orderBy("gmt_create", false);
-        List<ShopLog> list = shopLogMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        Integer count = shopLogMapper.selectCount(wrapper);
-        return new Page<ShopLog>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(Long id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            ShopLog tmp = shopLogMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                shopLogMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(ShopLog shopLog, Long adminId) throws ServiceException {
-        Date now = new Date();
-        shopLog.setGmtUpdate(now);
-        shopLog.setAdminId(adminId);
-        return shopLogMapper.updateById(shopLog) > 0;
-    }
-
-    @Override
-    public ShopLog get(Long id) throws ServiceException {
-        return shopLogMapper.selectById(id);
-    }
-
-    @Override
-    public String export(String title, String content, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<ShopLog> wrapper = new EntityWrapper<ShopLog>();
-        if (!StringUtils.isEmpty(title)) {
-            wrapper.eq("title", title);
-        }
-        if (!StringUtils.isEmpty(content)) {
-            wrapper.eq("content", content);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<ShopLog> list = shopLogMapper.selectList(wrapper);
-        ExcelUtil<ShopLog> util = new ExcelUtil<ShopLog>(ShopLog.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}

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

@@ -1,620 +0,0 @@
-package com.iotechn.unimall.admin.api.shop.impl;
-
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.baidu.ccc.auth.api.token.ApiTokenV1;
-import com.dangdang.openplatform.openapi.sdk.ApiException;
-import com.dangdang.openplatform.openapi.sdk.SdkClient;
-import com.dangdang.openplatform.openapi.sdk.internal.util.FileItem;
-import com.dangdang.openplatform.openapi.sdk.request.order.*;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.EncryptDTO;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.OrderDetailsGet;
-import com.dangdang.openplatform.openapi.sdk.response.order.*;
-import com.dangdang.openplatform.openapi.sdk.responsemodel.order.*;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.iotechn.unimall.data.domain.shop.ShopAccount;
-import com.iotechn.unimall.data.domain.shop.ShopLog;
-import com.iotechn.unimall.data.domain.shop.ShopTran;
-import com.iotechn.unimall.data.dto.shop.ShopDTO;
-import com.iotechn.unimall.data.dto.shop.XmlObject.OrderDetail;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGood;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGoodsInfo;
-import com.iotechn.unimall.data.mapper.shop.ShopAccountMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopLogMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopTranMapper;
-import com.iotechn.unimall.data.util.XMLUtil;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.shop.ShopOrderMapper;
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import com.iotechn.unimall.admin.api.shop.IShopOrderService;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 电商订单表Service业务层处理
- *
- * @author jlb
- * @date 2022-05-28
- */
-@Service
-public class ShopOrderServiceImpl implements IShopOrderService {
-    @Autowired
-    private ShopOrderMapper shopOrderMapper;
-    @Autowired
-    private ShopAccountMapper shopAccountMapper;
-    @Autowired
-    private ShopTranMapper shopTranMapper;
-
-    @Autowired
-    private ShopLogMapper shopLogMapper;
-
-    @Override
-    public Boolean add(ShopOrder shopOrder, Long adminId) throws ServiceException {
-        Date now = new Date();
-        shopOrder.setGmtCreate(now);
-        shopOrder.setGmtUpdate(now);
-        shopOrder.setAdminId(adminId);
-        return shopOrderMapper.insert(shopOrder) > 0;
-    }
-
-    @Override
-    public Page<ShopOrder> list(Long accountId, String orderId, String dangOrder, String dangOrderStatus, String address, String provName, String cityName, String areaName, String orderStatus, String orderStatusName, String payStatus, String payName, String receiverName, String mobile, String receiver, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, String shopName, Integer page, Integer limit) throws ServiceException {
-        Wrapper<ShopOrder> wrapper = new EntityWrapper<ShopOrder>();
-        List<Long> param = new ArrayList<>();
-        if (!StringUtils.isEmpty(shopName)) {
-            Wrapper<ShopAccount> wrapper1 = new EntityWrapper<ShopAccount>();
-            wrapper1.like("dang_name", shopName);
-            List<ShopAccount> list = shopAccountMapper.selectList(wrapper1);
-            for (ShopAccount shopAccount : list
-            ) {
-                param.add(shopAccount.getId());
-            }
-            wrapper.in("account_id", param);
-        }
-        if (!StringUtils.isEmpty(orderId)) {
-            wrapper.eq("order_id", orderId);
-        }
-        if (!StringUtils.isEmpty(dangOrder)) {
-            wrapper.eq("dang_order", dangOrder);
-        }
-        if (!StringUtils.isEmpty(address)) {
-            wrapper.eq("address", address);
-        }
-        if (!StringUtils.isEmpty(provName)) {
-            wrapper.eq("prov_name", provName);
-        }
-        if (!StringUtils.isEmpty(cityName)) {
-            wrapper.eq("city_name", cityName);
-        }
-        if (!StringUtils.isEmpty(areaName)) {
-            wrapper.eq("area_name", areaName);
-        }
-        if (!StringUtils.isEmpty(orderStatus)) {
-            wrapper.eq("order_status", orderStatus);
-        }
-        if (!StringUtils.isEmpty(orderStatusName)) {
-            wrapper.like("order_status_name", orderStatusName);
-        }
-        if (!StringUtils.isEmpty(payStatus)) {
-            wrapper.eq("pay_status", payStatus);
-        }
-        if (!StringUtils.isEmpty(payName)) {
-            wrapper.eq("pay_name", payName);
-        }
-        if (!StringUtils.isEmpty(receiverName)) {
-            wrapper.eq("receiver_name", receiverName);
-        }
-        if (!StringUtils.isEmpty(mobile)) {
-            wrapper.eq("mobile", mobile);
-        }
-        if (!StringUtils.isEmpty(receiver)) {
-            wrapper.eq("receiver", receiver);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        if (!StringUtils.isEmpty(dangOrderStatus)) {
-            wrapper.like("dang_order_status", dangOrderStatus);
-        }
-        wrapper.eq("delete_flag", 0);
-        wrapper.orderBy("created_time", false);
-        List<ShopOrder> list = shopOrderMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        for (ShopOrder shopOrder : list
-        ) {
-            ShopAccount shopAccount = shopAccountMapper.selectById(shopOrder.getAccountId());
-            shopOrder.setShopAccount(shopAccount);
-        }
-        Integer count = shopOrderMapper.selectCount(wrapper);
-        return new Page<ShopOrder>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            ShopOrder tmp = shopOrderMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                shopOrderMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(ShopOrder shopOrder, Long adminId) throws ServiceException {
-        Date now = new Date();
-        shopOrder.setGmtUpdate(now);
-        shopOrder.setAdminId(adminId);
-        return shopOrderMapper.updateById(shopOrder) > 0;
-    }
-
-    @Override
-    public ShopOrder get(Long id) throws ServiceException {
-        return shopOrderMapper.selectById(id);
-    }
-
-    @Override
-    public String export(Long accountId, String orderId, String dangOrder, String address, String provName, String cityName, String areaName, String orderStatus, String orderStatusName, String payStatus, String payName, String receiverName, String mobile, String receiver, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<ShopOrder> wrapper = new EntityWrapper<ShopOrder>();
-        if (!StringUtils.isEmpty(accountId)) {
-            wrapper.eq("account_id", accountId);
-        }
-        if (!StringUtils.isEmpty(orderId)) {
-            wrapper.eq("order_id", orderId);
-        }
-        if (!StringUtils.isEmpty(dangOrder)) {
-            wrapper.eq("dang_order", dangOrder);
-        }
-        if (!StringUtils.isEmpty(address)) {
-            wrapper.eq("address", address);
-        }
-        if (!StringUtils.isEmpty(provName)) {
-            wrapper.eq("prov_name", provName);
-        }
-        if (!StringUtils.isEmpty(cityName)) {
-            wrapper.eq("city_name", cityName);
-        }
-        if (!StringUtils.isEmpty(areaName)) {
-            wrapper.eq("area_name", areaName);
-        }
-        if (!StringUtils.isEmpty(orderStatus)) {
-            wrapper.eq("order_status", orderStatus);
-        }
-        if (!StringUtils.isEmpty(orderStatusName)) {
-            wrapper.like("order_status_name", orderStatusName);
-        }
-        if (!StringUtils.isEmpty(payStatus)) {
-            wrapper.eq("pay_status", payStatus);
-        }
-        if (!StringUtils.isEmpty(payName)) {
-            wrapper.eq("pay_name", payName);
-        }
-        if (!StringUtils.isEmpty(receiverName)) {
-            wrapper.eq("receiver_name", receiverName);
-        }
-        if (!StringUtils.isEmpty(mobile)) {
-            wrapper.eq("mobile", mobile);
-        }
-        if (!StringUtils.isEmpty(receiver)) {
-            wrapper.eq("receiver", receiver);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<ShopOrder> list = shopOrderMapper.selectList(wrapper);
-        ExcelUtil<ShopOrder> util = new ExcelUtil<ShopOrder>(ShopOrder.class);
-        return util.exportExcel(list, "操作日志");
-    }
-
-    @Override
-    public String syncOrderInfoList(ShopDTO shopDTO) throws Exception {
-        for (ShopDTO tmp : shopDTO.getShopDTOS()
-        ) {
-            syncOrderInfo(tmp.getOrderId(), tmp.getDangId(), tmp.getDangOrder());
-        }
-        return "ok";
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ShopOrder syncOrderInfo(String orderId, String dangId, String dangOrder) throws Exception {
-        try {
-
-            ShopAccount shopAccount = new ShopAccount();
-            if (dangId != null) {
-                shopAccount.setDangId(dangId);
-            }
-            //        if(fuziId != null){
-            //            shopAccount.setFuziId(fuziId);
-            //        }
-            shopAccount = shopAccountMapper.selectOne(shopAccount);
-            flushCookie(shopAccount);
-            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/getOrderInfo/?orderId=" + orderId);
-            //这里可以设置请求参数，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(dangOrder);
-                    data.setGmtCreate(new Date());
-                    data.setGmtUpdate(new Date());
-                    shopOrderMapper.insert(data);
-                } else {
-                    data.setDangOrder(dangOrder);
-                    data.setGmtUpdate(new Date());
-                    shopOrderMapper.update(data, new EntityWrapper<ShopOrder>().eq("order_id", tmp.getOrderId()));
-                }
-                tmp = new ShopOrder();
-                tmp.setOrderId(data.getOrderId());
-                tmp = shopOrderMapper.selectOne(tmp);
-                if (tmp.getOrderStatusName().equals("卖家已发货") && tmp.getDangOrderStatus().equals("未发货")) {
-                    //调用当当API 更新发货状态
-                    dangOrderDeal(shopAccount, tmp);
-                }
-                return tmp;
-            } else {
-                return null;
-            }
-
-        } catch (Exception e) {
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("浏览器插件调用异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-            return null;
-        }
-
-    }
-
-    @Override
-    public ShopOrder callPhone(String mobile) throws Exception {
-
-        ApiTokenV1.ApiAuthTokenV1Builder builder = new ApiTokenV1.ApiAuthTokenV1Builder();
-        // 必填参数 ak,sk,uri,host,http method, 过期时间
-        builder.ak("346da55bb3c248ea84e39b5913939f05");   // ak
-        builder.sk("0628356ece284d87935f73017af1c0ce");   // sk
-        builder.uri("/api/v3/console/realtime/status/create");                // 接口路径
-        builder.host("aicc.bce.baidu.com");               // host
-        builder.httpMethod("POST");                        // http method
-        builder.expireInSeconds(1800);                    // 过期时间
-
-        // 以下是非必须参数
-        // 参与生成token的请求头, 此处若使用了x-bce-date，则调用外呼api接口时，请求头内必需带上x-bce-date
-//        HashMap<String, String> headerMap = new HashMap<String, String>();
-//        headerMap.put("x-bce-date", "2022-06-17T08:40:14Z");
-//        builder.httpHeaderMap(headerMap);
-        builder.httpHeader("Content-Type", "application/json");
-        builder.httpHeader("Authorization", builder.build().getToken());
-        // url里?带的参数，如/api/v1/robot/list?robotName=test, 没有？参数可以不调用此方法
-        builder.queryStr("robotId=b304c245-ec71-40ef-b7b8-c94e6874e8ed&mobile="+mobile+"&secretType=2");
-
-        System.out.println(builder.build().getToken());
-        String token = builder.build().getToken();
-        System.out.println("token=" + token);
-        // 登陆 Url
-        String loginUrl = "https://aicc.bce.baidu.com/api/v3/console/realtime/status/create";
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-        // 模拟登陆，按实际服务器端要求选用 Post 或 Get 请求方式
-        HttpPost httpPost = new HttpPost(loginUrl);
-        // 装填参数
-        List<BasicNameValuePair> nvps = new ArrayList<BasicNameValuePair>();
-        nvps.add(new BasicNameValuePair("robotId", "b304c245-ec71-40ef-b7b8-c94e6874e8ed"));
-        nvps.add(new BasicNameValuePair("mobile", mobile));
-        nvps.add(new BasicNameValuePair("secretType", "2"));
-        // 设置参数到请求对象中
-        httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
-
-        // 设置header信息
-        // 指定报文头【Content-type】、【User-Agent】
-        httpPost.setHeader("Content-type", "application/json");
-        httpPost.setHeader("Authorization", token);
-        httpPost.setHeader("x-bce-date", "2022-06-17T08:40:14Z");
-
-        // 执行请求操作，并拿到结果（同步阻塞）
-        CloseableHttpResponse response = httpClient.execute(httpPost);
-        try {
-            if (response.getStatusLine().getStatusCode() == 302) {
-            }
-            System.out.println(EntityUtils.toString(response.getEntity(), "UTF-8"));
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            // 释放链接
-            response.close();
-            httpClient.close();
-        }
-
-        return null;
-    }
-
-    public void flushCookie(ShopAccount shopAccount) {
-        try {
-            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet getMethod = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=30");
-            getMethod.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");
-            getMethod.addHeader("cookie", shopAccount.getFuziCookie());
-
-            httpClient.execute(getMethod);
-            CloseableHttpResponse response = httpClient.execute(getMethod);//执行获取响应
-            try {
-                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {//根据状态码处理
-                    String strTmp = EntityUtils.toString(response.getEntity(), "UTF-8");
-                    //返回字符串
-                    String res = unicodeToString(strTmp);
-                    JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                    Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                    if (status) {
-                        return;
-                    }
-                }
-            } catch (Exception exception) {
-
-            } finally {
-                response.close();
-                httpClient.close();
-            }
-
-            System.out.println("原cookies = " + shopAccount.getFuziCookie());
-
-            // 登陆 Url
-            String loginUrl = "https://login.kongfz.com/Pc/Login/account";
-            BasicCookieStore store = new BasicCookieStore();
-            httpClient = HttpClients.custom().setDefaultCookieStore(store).build();
-            // 模拟登陆，按实际服务器端要求选用 Post 或 Get 请求方式
-            HttpPost httpPost = new HttpPost(loginUrl);
-
-            // 装填参数
-            List<BasicNameValuePair> nvps = new ArrayList<BasicNameValuePair>();
-            nvps.add(new BasicNameValuePair("loginName", shopAccount.getFuziAccount()));
-            nvps.add(new BasicNameValuePair("loginPass", shopAccount.getFuziPassword()));
-            // 设置参数到请求对象中
-            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
-
-            // 设置header信息
-            // 指定报文头【Content-type】、【User-Agent】
-            httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
-
-            // 执行请求操作，并拿到结果（同步阻塞）
-            response = httpClient.execute(httpPost);
-            if (response.getStatusLine().getStatusCode() == 302) {
-                List<org.apache.http.cookie.Cookie> cookielist = store.getCookies();
-                String nCookie = "";
-                for (org.apache.http.cookie.Cookie cookie : cookielist) {
-                    String name = cookie.getName();
-                    String value = cookie.getValue();
-                    nCookie += name + "=" + value + ";";
-                }
-                System.out.println("nCookie:" + nCookie);
-                shopAccount.setFuziCookie(nCookie);
-                shopAccountMapper.updateById(shopAccount);
-            }
-            // 释放链接
-            response.close();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public void dangOrderDeal(ShopAccount shopAccount, ShopOrder shopOrder) throws Exception {
-        /**
-         * 获取一下店铺的所有静态参数
-         */
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        SdkClient sdkClient = new SdkClient(shopAccount.getDangAppKey(), shopAccount.getDangAppSecret(), shopAccount.getDangSession(), shopAccount.getDangVersion());
-
-        OrderDetailsGetRequest ss = new OrderDetailsGetRequest();
-        OrderDetailsGet orderDetailsGet = new OrderDetailsGet();
-        orderDetailsGet.setO(shopOrder.getDangOrder());
-        ss.setOrderDetailsGet(orderDetailsGet);
-        OrderDetailsGetResponse resultt = null;
-        try {
-            resultt = sdkClient.excute(ss);
-        } catch (ApiException e) {
-            e.printStackTrace();
-
-        }
-
-        /**
-         * 从当当获取订单内应当有的所有图书
-         */
-        OrderDetailsGetRequest odgr = new OrderDetailsGetRequest();
-        OrderDetailsGet ogg = new OrderDetailsGet();
-        ogg.setO(shopOrder.getDangOrder());
-        odgr.setOrderDetailsGet(ogg);
-        OrderDetailsGetResponse odgrp = null;
-        try {
-            odgrp = sdkClient.excute(odgr);
-        } catch (ApiException e) {
-            e.printStackTrace();
-        }
-        SdkClient jiemi = new SdkClient(shopAccount.getDangAppKey(), shopAccount.getDangAppSecret(), shopAccount.getDangSession(), shopAccount.getDangVersion());
-        OrdersContentDecryptRequest ordersContentDecryptRequest = new OrdersContentDecryptRequest();
-
-        List<EncryptDTO> encryptVOS = new ArrayList<EncryptDTO>();
-
-        EncryptDTO encryptVO1 = new EncryptDTO();
-        encryptVO1.setO(resultt.getOrderID().toString());
-        encryptVO1.setEncrypt_content(resultt.getEncrypt_content());
-        encryptVOS.add(encryptVO1);
-
-        ordersContentDecryptRequest.setO_cryptStr(JSON.toJSONString(encryptVOS));
-        OrdersContentDecryptResponse ordersContentDecryptResponse = null;
-        try {
-            ordersContentDecryptResponse = jiemi.excute(ordersContentDecryptRequest);
-        } catch (ApiException e) {
-            e.printStackTrace();
-        }
-        List<OrdersContentDecryptDTO> data = ordersContentDecryptResponse.getData();
-        CryptUserInfo cryptUserInfo = data.get(0).getCryptUserInfo();
-
-
-        OrderDetail o = (OrderDetail) XMLUtil.convertXmlStrToObject(OrderDetail.class, odgrp.getBody());
-        SendGoodsInfo sgi = new SendGoodsInfo();
-        sgi.setConsigneeAddr(cryptUserInfo.getConsigneeAddr());
-        sgi.setConsigneeMobileTel(cryptUserInfo.getConsigneeMobileTel());
-        sgi.setConsigneeTel(cryptUserInfo.getConsigneeTel());
-        sgi.setConsigneeName(cryptUserInfo.getConsigneeName());
-        o.setSendGoodsInfo(sgi);
-        List<com.iotechn.unimall.data.dto.shop.XmlObject.ItemInfo> itemInfo = o.getItemsList().getItemInfo();
-        /**
-         * 将多个图书拼接XML
-         */
-        String itemsStr = "";
-        for (com.iotechn.unimall.data.dto.shop.XmlObject.ItemInfo ii : itemInfo) {
-            Map<String, Object> hashMap = new HashMap<>();
-            hashMap.put("DANG_DANG_ITEM_ID", ii.getItemID());
-            hashMap.put("SHU_LIANG", ii.getOrderCount());
-            hashMap.put("PRODUCT_ID", ii.getProductItemId());
-            itemsStr += SendGood.processTemplate(SendGood.ONE_ITEM, hashMap);
-        }
-
-
-        /**
-         * 组成OrderInfo
-         */
-        Wrapper wrapper = new EntityWrapper();
-        wrapper.like("fuzi_name", shopOrder.getShippingComName());
-        List<ShopTran> list = shopTranMapper.selectList(wrapper);
-        if (list.size() == 0) {
-            throw new Exception("物流公司不存在");
-        }
-        HashMap<String, Object> stringObjectHashMap = new HashMap<>();
-        stringObjectHashMap.put("DANG_DANG_ORDER", shopOrder.getDangOrder());
-        stringObjectHashMap.put("KUAI_DI_GONG_SI", list.get(0).getName());
-        stringObjectHashMap.put("KUAI_DI_BIANMA", list.get(0).getCode1());
-        stringObjectHashMap.put("KUAI_DI_GONG_SI_DIAN_HUA", list.get(0).getPhone());
-        stringObjectHashMap.put("KUAI_DI_DAN_HAO", shopOrder.getShipmentNum());
-        stringObjectHashMap.put("SEND_ITEMS", itemsStr);
-
-        String orderListStr = SendGood.processTemplate(SendGood.ONE_ORDER, stringObjectHashMap);
-        HashMap<String, Object> tmplHash = new HashMap<>();
-        tmplHash.put("SEND_TIME", dateFormat.format(new Date()));
-        tmplHash.put("ORDER_LIST", orderListStr);
-
-        String xmlFileStr = SendGood.processTemplate(SendGood.TMPL, tmplHash);
-        System.out.println(xmlFileStr);
-        PrintWriter out = null;
-        try {
-            out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream("sendGoodNotPlat.xml"), "GBK")));
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-        out.write(xmlFileStr);
-        out.close();
-        System.out.println("XML文件创建成功！");
-
-
-        /**
-         * 发货！！
-         */
-        OrderGoodsSendRequest sendGoodsRequest = new OrderGoodsSendRequest();
-        sendGoodsRequest.setSendGoodsFile(new FileItem(new File("sendGoodNotPlat.xml")));
-        OrderGoodsSendResponse result = null;
-        try {
-            result = sdkClient.excute(sendGoodsRequest);
-        } catch (ApiException e) {
-            e.printStackTrace();
-        }
-        System.out.println(result.toString());
-        if (result.getResult().getOrdersList().get(0).getOrderOperCode() == 0) {
-            shopOrder.setDangOrderStatus("已发货");
-            shopOrderMapper.update(shopOrder, new EntityWrapper<ShopOrder>().eq("order_id", shopOrder.getOrderId()));
-        }
-    }
-
-    /**
-     * Unicode转 汉字字符串
-     *
-     * @param str \u6728
-     * @return '木' 26408
-     */
-    public static String unicodeToString(String str) {
-
-        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
-        Matcher matcher = pattern.matcher(str);
-        char ch;
-        while (matcher.find()) {
-            // group 6728
-            String group = matcher.group(2);
-            // ch:'木' 26408
-            ch = (char) Integer.parseInt(group, 16);
-            // group1 \u6728
-            String group1 = matcher.group(1);
-            str = str.replace(group1, ch + "");
-        }
-        return str;
-    }
-}

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

@@ -1,138 +0,0 @@
-package com.iotechn.unimall.admin.api.shop.impl;
-
-import java.util.List;
-
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.shop.ShopTranMapper;
-import com.iotechn.unimall.data.domain.shop.ShopTran;
-import com.iotechn.unimall.admin.api.shop.IShopTranService;
-import com.iotechn.unimall.data.model.Page;
-import java.util.Date;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 物流公司Service业务层处理
- * 
- * @author jlb
- * @date 2022-05-29
- */
-@Service
-public class ShopTranServiceImpl implements IShopTranService{
-	@Autowired
-	private ShopTranMapper shopTranMapper;
-	
-	@Override
-	public Boolean add(ShopTran shopTran,Long adminId) throws ServiceException {
-		Date now = new Date();
-		shopTran.setGmtCreate(now);
-		shopTran.setGmtUpdate(now);
-		shopTran.setAdminId(adminId);
-		return shopTranMapper.insert(shopTran)>0;
-	}
-
-	@Override
-	public Page<ShopTran> list(String name,String code1,String code2,String phone,Integer deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<ShopTran> wrapper = new EntityWrapper<ShopTran>();
-														if (!StringUtils.isEmpty(name)) {
-					wrapper.eq("name", name);
-				}
-												if (!StringUtils.isEmpty(code1)) {
-					wrapper.eq("code1", code1);
-				}
-												if (!StringUtils.isEmpty(code2)) {
-					wrapper.eq("code2", code2);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-																	if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(userId)) {
-					wrapper.eq("user_id", userId);
-				}
-												if (!StringUtils.isEmpty(adminId)) {
-					wrapper.eq("admin_id", adminId);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<ShopTran> list = shopTranMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = shopTranMapper.selectCount(wrapper);
-		return new Page<ShopTran>(list, page, limit, count);
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(Long id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			ShopTran tmp =  shopTranMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1);
-				shopTranMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public Boolean update(ShopTran shopTran,Long adminId) throws ServiceException {
-		Date now = new Date();
-		shopTran.setGmtUpdate(now);
-		shopTran.setAdminId(adminId);
-		return shopTranMapper.updateById(shopTran)>0;
-	}
-
-	@Override
-	public ShopTran get(Long id) throws ServiceException {
-		return shopTranMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(String name,String code1,String code2,String phone,Integer deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<ShopTran> wrapper = new EntityWrapper<ShopTran>();
-														if (!StringUtils.isEmpty(name)) {
-					wrapper.eq("name", name);
-				}
-												if (!StringUtils.isEmpty(code1)) {
-					wrapper.eq("code1", code1);
-				}
-												if (!StringUtils.isEmpty(code2)) {
-					wrapper.eq("code2", code2);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-																	if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(userId)) {
-					wrapper.eq("user_id", userId);
-				}
-												if (!StringUtils.isEmpty(adminId)) {
-					wrapper.eq("admin_id", adminId);
-				}
-							List<ShopTran> list = shopTranMapper.selectList(wrapper);
-		ExcelUtil<ShopTran> util = new ExcelUtil<ShopTran>(ShopTran.class);
-		return util.exportExcel(list, "操作日志");
-	}
-}

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

@@ -54,9 +54,5 @@ public interface AdminUserService {
             @HttpParam(name = "status", type = HttpParamType.COMMON, description = "用户状态") Integer status,
             @Range(min = 1) @HttpParam(name = "pageNo", type = HttpParamType.COMMON, description = "当前页码") Integer pageNo,
             @Range(min = 1) @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度") Integer limit) throws ServiceException;
-    @HttpMethod(description = "测试")
-    public String test(
-            @HttpParam(name = "param", type = HttpParamType.COMMON, description = "参数") String nickname,
-            @HttpParam(name = "param1", type = HttpParamType.COMMON, description = "参数") String nickname1) throws Exception;
 
 }

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

@@ -8,30 +8,15 @@ import com.dangdang.openplatform.openapi.sdk.internal.util.FileItem;
 import com.dangdang.openplatform.openapi.sdk.request.order.OrderDetailsGetRequest;
 import com.dangdang.openplatform.openapi.sdk.request.order.OrderGoodsSendRequest;
 import com.dangdang.openplatform.openapi.sdk.request.order.OrdersContentDecryptRequest;
-import com.dangdang.openplatform.openapi.sdk.requestmodel.order.EncryptDTO;
+import com
+        .dangdang.openplatform.openapi.sdk.requestmodel.order.EncryptDTO;
 import com.dangdang.openplatform.openapi.sdk.requestmodel.order.OrderDetailsGet;
 import com.dangdang.openplatform.openapi.sdk.response.order.OrderDetailsGetResponse;
 import com.dangdang.openplatform.openapi.sdk.response.order.OrderGoodsSendResponse;
 import com.dangdang.openplatform.openapi.sdk.response.order.OrdersContentDecryptResponse;
 import com.dangdang.openplatform.openapi.sdk.responsemodel.order.CryptUserInfo;
 import com.dangdang.openplatform.openapi.sdk.responsemodel.order.OrdersContentDecryptDTO;
-import com.iotechn.unimall.admin.AdminCheckQuartz;
-import com.iotechn.unimall.data.domain.shop.ShopAccount;
-import com.iotechn.unimall.data.domain.shop.ShopLog;
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import com.iotechn.unimall.data.domain.shop.ShopTran;
-import com.iotechn.unimall.data.dto.shop.XmlObject.OrderDetail;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGood;
-import com.iotechn.unimall.data.dto.shop.XmlObject.SendGoodsInfo;
-import com.iotechn.unimall.data.mapper.shop.ShopAccountMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopLogMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopOrderMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopTranMapper;
 import com.iotechn.unimall.data.util.XMLUtil;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -39,14 +24,10 @@ import com.iotechn.unimall.core.exception.AdminServiceException;
 import com.iotechn.unimall.core.exception.ExceptionDefinition;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.domain.UserDO;
-import com.iotechn.unimall.data.dto.shop.FuziDTO;
 import com.iotechn.unimall.data.mapper.UserMapper;
 import com.iotechn.unimall.data.model.Page;
 import okhttp3.*;
 import org.apache.commons.codec.digest.Md5Crypt;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -61,17 +42,10 @@ import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.io.*;
-import java.net.CookieStore;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -88,15 +62,6 @@ public class AdminUserServiceImpl implements AdminUserService {
     @Autowired
     private UserMapper userMapper;
 
-    @Autowired
-    private ShopAccountMapper shopAccountMapper;
-
-    @Autowired
-    private ShopLogMapper shopLogMapper;
-    @Autowired
-    private ShopOrderMapper shopOrderMapper;
-    @Autowired
-    private ShopTranMapper shopTranMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -173,514 +138,5 @@ public class AdminUserServiceImpl implements AdminUserService {
         return page;
     }
 
-    @Override
-    public String test(String param, String param1) throws Exception {
-        if(param.equals("1")){
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    doSomething1();
-                }
-            }).start();
-        }
-        else{
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    doSomething2();
-                }
-            }).start();
-        }
-
-//        try{
-//            List<ShopOrder> shopOrders = shopOrderMapper.selectList(new EntityWrapper<ShopOrder>()
-//                    .eq("dang_order_status","未发货")
-////                    .eq("account_id",param)
-//                    .eq("order_status_name","卖家已发货"));
-//            for (ShopOrder qqq:shopOrders
-//            ) {
-//                ShopAccount shopAccount = shopAccountMapper.selectById(qqq.getAccountId());
-//                dangOrderDeal(shopAccount,qqq);
-//            }
-//        }
-//        catch (Exception e) {
-//            ShopLog shopLog = new ShopLog();
-//            shopLog.setGmtCreate(new Date());
-//            shopLog.setTitle("同步定时任务异常");
-//            shopLog.setContent(e.getMessage());
-//            shopLogMapper.insert(shopLog);
-//            e.printStackTrace();
-//        }
-        return "";
-
-    }
-
-    public void dangOrderDeal(ShopAccount shopAccount, ShopOrder shopOrder) throws Exception {
-        try {
-            /**
-             * 获取一下店铺的所有静态参数
-             */
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-            SdkClient sdkClient = new SdkClient(shopAccount.getDangAppKey(), shopAccount.getDangAppSecret(), shopAccount.getDangSession(), shopAccount.getDangVersion());
-
-            OrderDetailsGetRequest ss = new OrderDetailsGetRequest();
-            OrderDetailsGet orderDetailsGet = new OrderDetailsGet();
-            orderDetailsGet.setO(shopOrder.getDangOrder());
-            ss.setOrderDetailsGet(orderDetailsGet);
-            OrderDetailsGetResponse resultt = null;
-            try {
-                resultt = sdkClient.excute(ss);
-                if (resultt.getOrderID() == null) {
-                    shopOrder.setDangOrderStatus("订单错误");
-                    shopOrderMapper.updateById(shopOrder);
-                    ShopLog shopLog = new ShopLog();
-                    shopLog.setGmtCreate(new Date());
-                    shopLog.setTitle("当当订单编号错误");
-                    shopLog.setContent("店铺：" + shopAccount.getDangName() + ",孔网订单：" + shopOrder.getOrderId() + ",当当订单：" + shopOrder.getDangOrder());
-                    shopLogMapper.insert(shopLog);
-                    return;
-                }
-            } catch (ApiException e) {
-                throw e;
-            }
-
-            /**
-             * 从当当获取订单内应当有的所有图书
-             */
-            OrderDetailsGetRequest odgr = new OrderDetailsGetRequest();
-            OrderDetailsGet ogg = new OrderDetailsGet();
-            ogg.setO(shopOrder.getDangOrder());
-            odgr.setOrderDetailsGet(ogg);
-            OrderDetailsGetResponse odgrp = null;
-            try {
-                odgrp = sdkClient.excute(odgr);
-            } catch (ApiException e) {
-                throw e;
-            }
-            SdkClient jiemi = new SdkClient(shopAccount.getDangAppKey(), shopAccount.getDangAppSecret(), shopAccount.getDangSession(), shopAccount.getDangVersion());
-            OrdersContentDecryptRequest ordersContentDecryptRequest = new OrdersContentDecryptRequest();
-
-            List<EncryptDTO> encryptVOS = new ArrayList<EncryptDTO>();
-
-            EncryptDTO encryptVO1 = new EncryptDTO();
-            encryptVO1.setO(resultt.getOrderID().toString());
-            encryptVO1.setEncrypt_content(resultt.getEncrypt_content());
-            encryptVOS.add(encryptVO1);
-
-            ordersContentDecryptRequest.setO_cryptStr(JSON.toJSONString(encryptVOS));
-            OrdersContentDecryptResponse ordersContentDecryptResponse = null;
-            try {
-                ordersContentDecryptResponse = jiemi.excute(ordersContentDecryptRequest);
-            } catch (ApiException e) {
-                throw e;
-            }
-            List<OrdersContentDecryptDTO> data = ordersContentDecryptResponse.getData();
-            CryptUserInfo cryptUserInfo = data.get(0).getCryptUserInfo();
-
-
-            OrderDetail o = (OrderDetail) XMLUtil.convertXmlStrToObject(OrderDetail.class, odgrp.getBody());
-            SendGoodsInfo sgi = new SendGoodsInfo();
-            sgi.setConsigneeAddr(cryptUserInfo.getConsigneeAddr());
-            sgi.setConsigneeMobileTel(cryptUserInfo.getConsigneeMobileTel());
-            sgi.setConsigneeTel(cryptUserInfo.getConsigneeTel());
-            sgi.setConsigneeName(cryptUserInfo.getConsigneeName());
-            o.setSendGoodsInfo(sgi);
-            List<com.iotechn.unimall.data.dto.shop.XmlObject.ItemInfo> itemInfo = o.getItemsList().getItemInfo();
-            /**
-             * 将多个图书拼接XML
-             */
-            String itemsStr = "";
-            for (com.iotechn.unimall.data.dto.shop.XmlObject.ItemInfo ii : itemInfo) {
-                Map<String, Object> hashMap = new HashMap<>();
-                hashMap.put("DANG_DANG_ITEM_ID", ii.getItemID());
-                hashMap.put("SHU_LIANG", ii.getOrderCount());
-                hashMap.put("PRODUCT_ID", ii.getProductItemId());
-                itemsStr += SendGood.processTemplate(SendGood.ONE_ITEM, hashMap);
-            }
-
-
-            /**
-             * 组成OrderInfo
-             */
-            Wrapper wrapper = new EntityWrapper();
-            wrapper.like("fuzi_name", shopOrder.getShippingComName());
-            wrapper.eq("delete_flag", 0);
-            List<ShopTran> list = shopTranMapper.selectList(wrapper);
-            HashMap<String, Object> stringObjectHashMap = new HashMap<>();
-            stringObjectHashMap.put("DANG_DANG_ORDER", shopOrder.getDangOrder());
-            if (list.size() == 0) {
-//                throw new Exception("物流公司不存在");
-                System.out.println("物流公司不存在");
-                stringObjectHashMap.put("KUAI_DI_GONG_SI", "99999");
-                stringObjectHashMap.put("KUAI_DI_BIANMA", "99999");
-                stringObjectHashMap.put("KUAI_DI_GONG_SI_DIAN_HUA", "99999");
-            } else {
-                stringObjectHashMap.put("KUAI_DI_GONG_SI", list.get(0).getName());
-                stringObjectHashMap.put("KUAI_DI_BIANMA", list.get(0).getCode1());
-                stringObjectHashMap.put("KUAI_DI_GONG_SI_DIAN_HUA", list.get(0).getPhone());
-            }
-            stringObjectHashMap.put("KUAI_DI_DAN_HAO", shopOrder.getShipmentNum());
-            stringObjectHashMap.put("SEND_ITEMS", itemsStr);
-
-            String orderListStr = SendGood.processTemplate(SendGood.ONE_ORDER, stringObjectHashMap);
-            HashMap<String, Object> tmplHash = new HashMap<>();
-            tmplHash.put("SEND_TIME", dateFormat.format(new Date()));
-            tmplHash.put("ORDER_LIST", orderListStr);
-
-            String xmlFileStr = SendGood.processTemplate(SendGood.TMPL, tmplHash);
-            System.out.println(xmlFileStr);
-            PrintWriter out = null;
-            try {
-                out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream("sendGoodNotPlat.xml"), "GBK")));
-            } catch (Exception e) {
-                throw e;
-            }
-            out.write(xmlFileStr);
-            out.close();
-            System.out.println("XML文件创建成功！");
-
-
-            /**
-             * 发货！！
-             */
-            OrderGoodsSendRequest sendGoodsRequest = new OrderGoodsSendRequest();
-            sendGoodsRequest.setSendGoodsFile(new FileItem(new File("sendGoodNotPlat.xml")));
-            OrderGoodsSendResponse result = null;
-            try {
-                result = sdkClient.excute(sendGoodsRequest);
-            } catch (ApiException e) {
-                throw e;
-            }
-            System.out.println(result.toString());
-            if (result.getResult().getOrdersList().get(0).getOrderOperCode() == 0 || result.getResult().getOrdersList().get(0).getOrderOperCode() == 605) {
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("当当订单发货成功");
-                shopLog.setContent("店铺：" + shopAccount.getDangName() + ",孔网订单：" + shopOrder.getOrderId() + ",当当订单：" + shopOrder.getDangOrder());
-                shopLogMapper.insert(shopLog);
-                shopOrder.setDangOrderStatus("已发货");
-                shopOrderMapper.update(shopOrder, new EntityWrapper<ShopOrder>().eq("order_id", shopOrder.getOrderId()));
-            } else {
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("当当订单发货失败");
-                shopLog.setContent("店铺：" + shopAccount.getDangName() + ",孔网订单：" + shopOrder.getOrderId() + ",当当订单：" + shopOrder.getDangOrder() + ",快递：" + shopOrder.getShippingComName());
-                shopLogMapper.insert(shopLog);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("当当发货异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-        }
-
-    }
-
-    public void flushCookie(ShopAccount shopAccount) {
-        try {
-            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet getMethod = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=30");
-            getMethod.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");
-            getMethod.addHeader("cookie", shopAccount.getFuziCookie());
-
-            httpClient.execute(getMethod);
-            CloseableHttpResponse response = httpClient.execute(getMethod);//执行获取响应
-            try {
-                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {//根据状态码处理
-                    String strTmp = EntityUtils.toString(response.getEntity(), "UTF-8");
-                    JSONObject datas = JSONObject.parseObject(strTmp);//转换成JSON格式
-                    Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                    if (status) {
-                        return;
-                    }
-                }
-            } catch (Exception e) {
-                throw e;
-            } finally {
-                response.close();
-                httpClient.close();
-            }
-
-            System.out.println("原cookies = " + shopAccount.getFuziCookie());
-
-            // 登陆 Url
-            String loginUrl = "https://login.kongfz.com/Pc/Login/account";
-            BasicCookieStore store = new BasicCookieStore();
-            httpClient = HttpClients.custom().setDefaultCookieStore(store).build();
-            // 模拟登陆，按实际服务器端要求选用 Post 或 Get 请求方式
-            HttpPost httpPost = new HttpPost(loginUrl);
-
-            // 装填参数
-            List<BasicNameValuePair> nvps = new ArrayList<BasicNameValuePair>();
-            nvps.add(new BasicNameValuePair("loginName", shopAccount.getFuziAccount()));
-            nvps.add(new BasicNameValuePair("loginPass", shopAccount.getFuziPassword()));
-            // 设置参数到请求对象中
-            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
-
-            // 设置header信息
-            // 指定报文头【Content-type】、【User-Agent】
-            httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
-
-            // 执行请求操作，并拿到结果（同步阻塞）
-            response = httpClient.execute(httpPost);
-            if (response.getStatusLine().getStatusCode() == 302) {
-                List<org.apache.http.cookie.Cookie> cookielist = store.getCookies();
-                String nCookie = "";
-                for (org.apache.http.cookie.Cookie cookie : cookielist) {
-                    String name = cookie.getName();
-                    String value = cookie.getValue();
-                    nCookie += name + "=" + value + ";";
-                }
-                System.out.println("nCookie:" + nCookie);
-                shopAccount.setFuziCookie(nCookie);
-                shopAccountMapper.updateById(shopAccount);
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("更新cookie成功");
-                shopLog.setContent("账号：" + shopAccount.getFuziAccount() + ",cookie：" + nCookie);
-                shopLogMapper.insert(shopLog);
-            } else {
-                ShopLog shopLog = new ShopLog();
-                shopLog.setGmtCreate(new Date());
-                shopLog.setTitle("更新cookie失败");
-                shopLog.setContent(response.toString());
-                shopLogMapper.insert(shopLog);
-            }
-            // 释放链接
-            response.close();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("更新cookie异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-        }
-
-    }
-
-
-    /**
-     * Unicode转 汉字字符串
-     *
-     * @param str \u6728
-     * @return '木' 26408
-     */
-    public static String unicodeToString(String str) {
-
-        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
-        Matcher matcher = pattern.matcher(str);
-        char ch;
-        while (matcher.find()) {
-            // group 6728
-            String group = matcher.group(2);
-            // ch:'木' 26408
-            ch = (char) Integer.parseInt(group, 16);
-            // group1 \u6728
-            String group1 = matcher.group(1);
-            str = str.replace(group1, ch + "");
-        }
-        return str;
-    }
-
-    public static Response postData(String url, Headers headers, RequestBody body) {
-        OkHttpClient client = new OkHttpClient().newBuilder()
-                .build();
-
-        Request request = new Request.Builder()
-                .url(url)
-                .method("POST", body)
-                .headers(headers)
-                .build();
-        Response response = null;
-        try {
-            response = client.newCall(request).execute();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return response;
-    }
-    private void doSomething1() {
-        try{
-            List<ShopAccount> list = shopAccountMapper.selectList(new EntityWrapper<>());
-            for (ShopAccount shopAccount:list
-            ) {
-                flushCookie(shopAccount);
-                List<ShopOrder> shopOrders = shopOrderMapper.selectList(new EntityWrapper<ShopOrder>()
-                        .eq("dang_order_status","未发货")
-                        .eq("account_id",shopAccount.getId())
-                        .eq("order_status_name","卖家已发货"));
-                for (ShopOrder qqq:shopOrders
-                ) {
-                    CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-                    HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=9999&orderId="+qqq.getOrderId());
-                    //这里可以设置请求参数，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());
-                    get.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-                    CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-                    try{
-
-                        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
-                            String strTmp= EntityUtils.toString(response.getEntity(),"UTF-8");
-                            //返回字符串
-                            String res = unicodeToString(strTmp);
-                            JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                            Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                            List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
-                            for (ShopOrder tmp: data
-                            ) {
-                                //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                                String regEx="[^0-9]+";
-                                Pattern pattern = Pattern.compile(regEx);
-                                //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                                String[] cs = pattern.split(tmp.getRemarkText());
-                                String dangOrder = "";
-                                for (String str:cs
-                                ) {
-                                    if(dangOrder.length()>= 11 || str.equals("*")){
-                                        break;
-                                    }
-                                    dangOrder += str;
-                                }
-                                tmp.setDangOrder(dangOrder);
-                                tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
-                                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                                String time1 = sdf.format(new Date(time * 1000));
-                                tmp.setShippingTime(time1);
-                                tmp.setDeleteFlag(0);
-                                tmp.setGmtUpdate(new Date());
-                                tmp.setGmtCreate(new Date());
-                                if(tmp.getShippingComName().equals("快递包裹")||tmp.getShippingComName().equals("挂号印刷品")){
-                                    tmp.setShippingComName("中国邮政");
-                                }
-                                ShopOrder tt = new ShopOrder();
-                                tt.setOrderId(tmp.getOrderId());
-                                tt =  shopOrderMapper.selectOne(tt);
-                                if(tt == null){
-                                    shopOrderMapper.insert(tmp);
-                                }
-                                else{
-                                    if(!tt.getDangOrder().equals(tmp.getDangOrder())||!tt.getShippingComName().equals(tmp.getShippingComName())){
-                                        shopOrderMapper.update(tmp,new EntityWrapper<ShopOrder>().eq("order_id",tt.getOrderId()));
-                                    }
-                                    dangOrderDeal(shopAccount,qqq);
-                                }
-                            }
-
-                        }
-
-
-                    } catch (IOException e) {
-                        throw e;
-                    }
-                    finally {
-                        response.close();
-                        httpClient.close();
-                    }
-                }
-            }
-
-        }
-        catch (Exception e) {
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("同步定时任务异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-        }
-
-    }
-    private void doSomething2() {
-        try{
-            List<ShopAccount> list = shopAccountMapper.selectList(new EntityWrapper<ShopAccount>().orderBy("id",false));
-            for (ShopAccount shopAccount:list
-            ) {
-                flushCookie(shopAccount);
-                for (int i = 1; i <= 5; i++) {
-                    CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-                    HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=" + i + "&pageShow=300&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());
-
-                    CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-                    try {
-                        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {//根据状态码处理
-                            String strTmp = EntityUtils.toString(response.getEntity(), "UTF-8");
-                            //返回字符串
-                            String res = unicodeToString(strTmp);
-                            JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                            Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                            List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(), ShopOrder.class);//"data"是根据返回值设定
-                            if (data.size() == 0) {
-                                break;
-                            }
-                            for (ShopOrder tmp : data
-                            ) {
-                                //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                                String regEx = "[^0-9]+";
-                                Pattern pattern = Pattern.compile(regEx);
-                                //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                                String[] cs = pattern.split(tmp.getRemarkText());
-                                String dangOrder = "";
-                                for (String str : cs
-                                ) {
-                                    if (dangOrder.length() >= 11 || str.equals("*")) {
-                                        break;
-                                    }
-                                    dangOrder += str;
-                                }
-                                tmp.setDangOrder(dangOrder);
-                                tmp.setAccountId(shopAccount.getId());
-                                Long time  = Long.parseLong(tmp.getShippingTime())+8*60*60;
-                                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());
-                                if (tmp.getShippingComName().equals("快递包裹") || tmp.getShippingComName().equals("挂号印刷品")) {
-                                    tmp.setShippingComName("中国邮政");
-                                }
-                                ShopOrder tt = new ShopOrder();
-                                tt.setOrderId(tmp.getOrderId());
-                                tt = shopOrderMapper.selectOne(tt);
-                                if (tt == null) {
-                                    shopOrderMapper.insert(tmp);
-                                } else {
-                                    if (tt.getDangOrderStatus().equals("未发货") && !tt.getDangOrder().equals(tmp.getDangOrder())) {
-                                        shopOrderMapper.update(tmp, new EntityWrapper<ShopOrder>().eq("order_id", tt.getOrderId()));
-                                    }
-                                }
-                            }
-                        }
-                    } catch (IOException e) {
-                        throw e;
-                    } finally {
-                        response.close();
-                        httpClient.close();
-                    }
-                }
-            }
-//            doSomething2();
-        }
-        catch (Exception e){
-            ShopLog shopLog = new ShopLog();
-            shopLog.setGmtCreate(new Date());
-            shopLog.setTitle("爬取定时任务异常");
-            shopLog.setContent(e.getMessage());
-            shopLogMapper.insert(shopLog);
-            e.printStackTrace();
-        }
-
-    }
 
 }

unimall-app-api/src/main/java/com/iotechn/unimall/app/quartz/CheckQuartz.java

@@ -1,271 +0,0 @@
-package com.iotechn.unimall.app.quartz;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.biz.service.order.OrderBizService;
-import com.iotechn.unimall.core.exception.AdminServiceException;
-import com.iotechn.unimall.core.exception.ExceptionDefinition;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.component.LockComponent;
-import com.iotechn.unimall.data.domain.GroupShopDO;
-import com.iotechn.unimall.data.domain.OrderDO;
-import com.iotechn.unimall.data.domain.SpuDO;
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import com.iotechn.unimall.data.enums.GroupShopAutomaticRefundType;
-import com.iotechn.unimall.data.enums.OrderStatusType;
-import com.iotechn.unimall.data.enums.StatusType;
-import com.iotechn.unimall.data.mapper.GroupShopMapper;
-import com.iotechn.unimall.data.mapper.OrderMapper;
-import com.iotechn.unimall.data.mapper.SpuMapper;
-import com.iotechn.unimall.data.mapper.shop.ShopOrderMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Created by rize on 2019/7/21.
- */
-@Component
-@EnableScheduling
-public class CheckQuartz {
-
-    private static final Logger logger = LoggerFactory.getLogger(CheckQuartz.class);
-    private static final String ORDER_STATUS_LOCK = "ORDER_STATUS_QUARTZ_LOCK";
-    private static final String GROUP_SHOP_START_LOCK = "GROUP_SHOP_START_LOCK";
-    private static final String GROUP_SHOP_END_LOCK = "GROUP_SHOP_END_LOCK";
-    private static final String GROUP_SHOP_LOCK_LOCK = "GROUP_SHOP_LOCK_LOCK";
-    @Autowired
-    private OrderMapper orderMapper;
-    @Autowired
-    private ShopOrderMapper shopOrderMapper;
-    @Autowired
-    private OrderBizService orderBizService;
-    @Autowired
-    private GroupShopMapper groupShopMapper;
-    @Autowired
-    private SpuMapper spuMapper;
-    @Autowired
-    private LockComponent lockComponent;
-    @Autowired
-    private TransactionTemplate transactionTemplate;
-
-    /**
-     * 订单状态定时轮训
-     */
-//    @Scheduled(cron = "0 * * * * ?")
-    public void checkOrderStatus() {
-        if (lockComponent.tryLock(ORDER_STATUS_LOCK, 15)) {
-            try {
-                Date now = new Date();
-                List<String> nos = orderMapper.selectExpireOrderNos(OrderStatusType.UNPAY.getCode(), new Date(now.getTime() - 1000l * 60 * 15));
-                if (!CollectionUtils.isEmpty(nos)) {
-                    nos.forEach(no -> {
-                        try {
-                            OrderDO updateOrderDO = new OrderDO();
-                            updateOrderDO.setStatus(OrderStatusType.CANCELED_SYS.getCode());
-                            updateOrderDO.setGmtUpdate(now);
-                            orderBizService.changeOrderStatus(no, OrderStatusType.UNPAY.getCode(), updateOrderDO);
-                        } catch (Exception e) {
-                            logger.error("[未付款检测] 异常", e);
-                        }
-                    });
-                }
-                //15分钟执行一次
-                long minutes = (now.getTime() / (1000 * 60));
-                if (minutes % 15 == 0) {
-                    List<String> waitConfirmNos = orderMapper.selectExpireOrderNos(OrderStatusType.WAIT_CONFIRM.getCode(), new Date(now.getTime() - 1000l * 60 * 60 * 24 * 7));
-                    waitConfirmNos.forEach(item -> {
-                        try {
-                            OrderDO updateOrderDO = new OrderDO();
-                            updateOrderDO.setStatus(OrderStatusType.WAIT_APPRAISE.getCode());
-                            updateOrderDO.setGmtUpdate(now);
-                            orderBizService.changeOrderStatus(item, OrderStatusType.WAIT_CONFIRM.getCode(), updateOrderDO);
-                        } catch (Exception e) {
-                            logger.error("[未确认检测] 异常", e);
-                        }
-                    });
-                }
-            } catch (Exception e) {
-                logger.error("[订单状态检测定时任务] 异常", e);
-            } finally {
-                lockComponent.release(ORDER_STATUS_LOCK);
-            }
-        }
-    }
-
-
-    /**
-     * 设定60s跑一次,团购商品到期自动退款,改变状态
-     */
-//    @Scheduled(fixedRate = 60000)
-    @Transactional(rollbackFor = Exception.class)
-    public void groupShopStart() throws Exception {
-        if (lockComponent.tryLock(GROUP_SHOP_START_LOCK, 30)) {
-            try {
-                Date now = new Date();
-                /**
-                 * 1. 激活 团购时间开始的活动商品
-                 */
-                // 1.1 查询在活动期间,且冻结状态的团购商品
-                List<GroupShopDO> groupShopDOList = groupShopMapper.selectList(new EntityWrapper<GroupShopDO>()
-                        .le("gmt_start", now).and()
-                        .gt("gmt_end", now).and()
-                        .eq("status", StatusType.LOCK.getCode()));
-                if (groupShopDOList != null) {
-                    for (GroupShopDO groupShopDO : groupShopDOList) {
-                        groupShopDO.setGmtUpdate(now);
-                        groupShopDO.setStatus(StatusType.ACTIVE.getCode());
-                        SpuDO spuDO = spuMapper.selectById(groupShopDO.getSpuId());
-                        if (spuDO == null) {
-                            throw new AdminServiceException(ExceptionDefinition.GROUP_SHOP_SPU_NO_EXITS);
-                        }
-
-                        // 1.2 检查商品是不是已经下架
-                        if (spuDO.getStatus().equals(StatusType.ACTIVE.getCode())) {
-                            if (groupShopMapper.updateById(groupShopDO) <= 0) {
-                                throw new AdminServiceException(ExceptionDefinition.GROUP_SHOP_SPU_UPDATE_SQL_QUERY_ERROR);
-                            }
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                logger.error("[团购开始 定时任务] 异常", e);
-                throw e;
-            } finally {
-                lockComponent.release(GROUP_SHOP_START_LOCK);
-            }
-        }
-
-
-    }
-
-//    @Scheduled(fixedRate = 60000)
-    @Transactional(rollbackFor = Exception.class)
-    public void groupShopEnd() throws Exception {
-        if (lockComponent.tryLock(GROUP_SHOP_END_LOCK, 30)) {
-            try {
-                Date now = new Date();
-                /**
-                 * 2. 冻结 团购时间结束的活动商品,并根据对应情况处理订单
-                 */
-                Wrapper<GroupShopDO> wrapper = new EntityWrapper<GroupShopDO>()
-                        .eq("status", StatusType.ACTIVE.getCode())
-                        .andNew()
-                        .gt("gmt_start", now)
-                        .or()
-                        .le("gmt_end", now);
-                List<GroupShopDO> lockGroupShopDOList = groupShopMapper.selectList(wrapper);
-                // 2.2 将团购订单的状态转为对应的退款或待出库状态,对未达人数且自动退款的商品订单进行退款,对达到人数或不自动退款的商品订单转换状态
-                if (!CollectionUtils.isEmpty(lockGroupShopDOList)) {
-                    // 2.1 对过期团购商品冻结.
-                    GroupShopDO lockGroupShopDO = new GroupShopDO();
-                    lockGroupShopDO.setStatus(StatusType.LOCK.getCode());
-                    lockGroupShopDO.setGmtUpdate(now);
-                    groupShopMapper.update(lockGroupShopDO, wrapper);
-                    for (GroupShopDO groupShopDO : lockGroupShopDOList) {
-                        // 2.2.1查询团购订单中数据
-                        List<OrderDO> lockOrderList = orderMapper.selectList(
-                                new EntityWrapper<OrderDO>()
-                                        .eq("group_shop_id", groupShopDO.getId())
-                                        .eq("status", OrderStatusType.GROUP_SHOP_WAIT.getCode()));
-
-                        if (CollectionUtils.isEmpty(lockOrderList)) {
-                            continue;
-                        }
-
-                        if (groupShopDO.getAutomaticRefund() == GroupShopAutomaticRefundType.YES.getCode() && groupShopDO.getAlreadyBuyNumber().compareTo(groupShopDO.getMinimumNumber()) < 0) {
-                            // 2.2.2.1.退款
-                            logger.info("[团购结束] 退款逻辑 groupShopId:" + groupShopDO.getId());
-                            for (OrderDO orderDO : lockOrderList) {
-                                transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-                                    @Override
-                                    protected void doInTransactionWithoutResult(TransactionStatus transactionStatus) {
-                                        try {
-                                            //对订单退款保证原子性，仅退款成功的单子，变更状态
-                                            orderBizService.groupShopStatusRefund(orderDO.getOrderNo());
-                                            logger.info("[团购订单退款] 完成 orderNo:" + orderDO.getOrderNo());
-                                        } catch (Exception e) {
-                                            logger.error("[团购订单退款] 异常 orderNo:" + orderDO.getOrderNo() + "; errmsg:" + e.getMessage());
-                                            transactionStatus.setRollbackOnly();
-                                        }
-                                    }
-                                });
-                            }
-                        } else {
-                            logger.info("[团购结束] 发货逻辑 groupShopId:" + groupShopDO.getId());
-                            // 2.2.2.2 转换订单为待出货状态 (非自动退款场景)
-                            List<Long> collect = lockOrderList.stream().map(s -> s.getId()).collect(Collectors.toList());
-                            OrderDO orderDO = new OrderDO();
-                            orderDO.setStatus(OrderStatusType.WAIT_STOCK.getCode());
-                            orderMapper.update(orderDO, (
-                                    new EntityWrapper<OrderDO>()
-                                            .in("id", collect)
-                                            .eq("status", OrderStatusType.GROUP_SHOP_WAIT.getCode())));
-                        }
-
-                    }
-                }
-            } catch (Exception e) {
-                logger.error("[团购结束 定时任务] 异常", e);
-                throw e;
-            } finally {
-                lockComponent.release(GROUP_SHOP_END_LOCK);
-            }
-        }
-
-    }
-
-//    @Scheduled(fixedRate = 60000)
-    @Transactional(rollbackFor = Exception.class)
-    public void groupShopLock() throws Exception {
-        if (lockComponent.tryLock(GROUP_SHOP_LOCK_LOCK, 30)) {
-            try {
-                Date now = new Date();
-                /**
-                 * 3 冻结 团购活动期间却被下架的商品
-                 */
-                EntityWrapper<GroupShopDO> groupShopDOEntityWrapper = new EntityWrapper<>();
-
-                // 3.1 从团购中查询活动期间的商品
-                groupShopDOEntityWrapper.eq("status", StatusType.ACTIVE.getCode())
-                        .and()
-                        .le("gmt_start", now)
-                        .and()
-                        .gt("gmt_end", now);
-                List<GroupShopDO> groupShopDOS = groupShopMapper.selectList(groupShopDOEntityWrapper);
-                if (!CollectionUtils.isEmpty(groupShopDOS)) {
-                    List<Long> spuIdList = groupShopDOS.stream().map(t -> t.getSpuId()).collect(Collectors.toList());
-
-                    // 3.2 在团购中查询给出spuID,是否有被下架的商品
-                    List<SpuDO> spuDOS = spuMapper.selectList(new EntityWrapper<SpuDO>().in("id", spuIdList).eq("status", StatusType.LOCK.getCode()));
-                    if (!CollectionUtils.isEmpty(spuDOS)) {
-                        List<Long> collect = spuDOS.stream().map(t -> t.getId()).collect(Collectors.toList());
-                        GroupShopDO groupShopDO = new GroupShopDO();
-                        groupShopDO.setStatus(StatusType.LOCK.getCode());
-                        groupShopDO.setGmtUpdate(now);
-                        groupShopMapper.update(groupShopDO, (new EntityWrapper<GroupShopDO>().in("spu_id", collect)));
-                    }
-                }
-            } catch (Exception e) {
-                logger.error("[团购锁定 定时任务] 异常", e);
-                throw e;
-            } finally {
-                lockComponent.release(GROUP_SHOP_LOCK_LOCK);
-            }
-        }
-
-    }
-
-}

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

@@ -1,32 +0,0 @@
-package com.iotechn.unimall.data.domain.shop;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @Author:chengchangjiang
- * @Description:
- * @Date:Created in 10:46 2022-05-24
- */
-@Data
-public class BaseDO {
-    /**  */
-    @TableId("id")
-    private Long id;
-    /**  */
-    @Excel(name = "", width = 30)
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**  */
-    @Excel(name = "", width = 30)
-    @TableField("gmt_update")
-    private Date gmtUpdate;
-    /**  */
-    @TableField("delete_flag")
-    private Integer deleteFlag;
-}

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

@@ -1,121 +0,0 @@
-package com.iotechn.unimall.data.domain.shop;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.enums.FieldFill;
-import com.iotechn.unimall.core.util.StringUtils;
-import java.util.Date;
-
-/**
- * 电商账户表对象 shop_account
- * 
- * @author jlb
- * @date 2022-05-28
- */
-@Data
-@TableName("shop_account")
-public class ShopAccount extends BaseDO{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    @TableId("id")
-    private Long id;
-
-    @Excel(name = "当当id")
-    @TableField("dang_id")
-    private String dangId;
-
-    @Excel(name = "当当appkey")
-    @TableField("dang_app_key")
-    private String dangAppKey;
-    @Excel(name = "当当appSecret")
-    @TableField("dang_app_secret")
-    private String dangAppSecret;
-    @Excel(name = "当当session")
-    @TableField("dang_session")
-    private String dangSession;
-    @Excel(name = "当当接口版本")
-    @TableField("dang_version")
-    private String dangVersion;
-    @Excel(name = "当当店铺名称")
-    @TableField("dang_name")
-    private String dangName;
-    @Excel(name = "当当运费模板")
-    @TableField("dang_tran")
-    private String dangTran;
-
-    /** 夫子账号 */
-    @Excel(name = "夫子账号id")
-    @TableField("fuzi_id")
-    private String fuziId;
-
-    /** 夫子账号 */
-    @Excel(name = "夫子账号")
-    @TableField("fuzi_account")
-    private String fuziAccount;
-
-    /** 夫子密码 */
-    @Excel(name = "夫子密码")
-    @TableField("fuzi_password")
-    private String fuziPassword;
-
-    /** 夫子cookie */
-    @Excel(name = "夫子cookie")
-    @TableField("fuzi_cookie")
-    private String fuziCookie;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @TableField("remark")
-    private String remark;
-
-    /** 删除标识 */
-    @Excel(name = "删除标识")
-    @TableField("delete_flag")
-    private Integer deleteFlag;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_update")
-    private Date gmtUpdate;
-
-    /**  */
-    @Excel(name = "")
-    @TableField("user_id")
-    private Long userId;
-    /**  */
-    @TableField(exist = false)
-    private String userName;
-    /**  */
-    @Excel(name = "")
-    @TableField("admin_id")
-    private Long adminId;
-
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fuziAccount", getFuziAccount())
-            .append("fuziPassword", getFuziPassword())
-            .append("fuziCookie", getFuziCookie())
-            .append("remark", getRemark())
-            .append("deleteFlag", getDeleteFlag())
-            .append("gmtCreate", getGmtCreate())
-            .append("gmtUpdate", getGmtUpdate())
-            .append("userId", getUserId())
-            .append("adminId", getAdminId())
-            .toString();
-    }
-}

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

@@ -1,80 +0,0 @@
-package com.iotechn.unimall.data.domain.shop;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.enums.FieldFill;
-import com.iotechn.unimall.core.util.StringUtils;
-import java.util.Date;
-
-/**
- * 同步日志对象 shop_log
- * 
- * @author jlb
- * @date 2022-06-08
- */
-@Data
-@TableName("shop_log")
-public class ShopLog extends BaseDO{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    @TableId("id")
-    private Long id;
-
-    /** 标题 */
-    @Excel(name = "标题")
-    @TableField("title")
-    private String title;
-
-    /** 内容 */
-    @Excel(name = "内容")
-    @TableField("content")
-    private String content;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @TableField("remark")
-    private String remark;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_update")
-    private Date gmtUpdate;
-
-    /**  */
-    @Excel(name = "")
-    @TableField("user_id")
-    private Long userId;
-
-    /**  */
-    @Excel(name = "")
-    @TableField("admin_id")
-    private Long adminId;
-
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("title", getTitle())
-            .append("content", getContent())
-            .append("remark", getRemark())
-            .append("deleteFlag", getDeleteFlag())
-            .append("gmtCreate", getGmtCreate())
-            .append("gmtUpdate", getGmtUpdate())
-            .append("userId", getUserId())
-            .append("adminId", getAdminId())
-            .toString();
-    }
-}

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

@@ -1,196 +0,0 @@
-package com.iotechn.unimall.data.domain.shop;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.enums.FieldFill;
-import com.iotechn.unimall.core.util.StringUtils;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 电商订单表对象 shop_order
- * 
- * @author jlb
- * @date 2022-05-28
- */
-@Data
-@TableName("shop_order")
-public class ShopOrder extends BaseDO{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    @TableId("id")
-    private Long id;
-
-    /** 账户表id */
-    @Excel(name = "账户表id")
-    @TableField("account_id")
-    private Long accountId;
-
-    /** 夫子订单号 */
-    @Excel(name = "夫子订单号")
-    @TableField("order_id")
-    private String orderId;
-
-    /** 当当订单号 */
-    @Excel(name = "当当订单号")
-    @TableField("dang_order")
-    private String dangOrder;
-
-    /** 当当订单号发货状态 */
-    @Excel(name = "当当订单号发货状态")
-    @TableField("dang_order_status")
-    private String dangOrderStatus;
-    /** 详细地址 */
-    @Excel(name = "详细地址")
-    @TableField("address")
-    private String address;
-
-    /** 省 */
-    @Excel(name = "省")
-    @TableField("prov_name")
-    private String provName;
-
-    /** 市 */
-    @Excel(name = "市")
-    @TableField("city_name")
-    private String cityName;
-
-    /** 区 */
-    @Excel(name = "区")
-    @TableField("area_name")
-    private String areaName;
-
-    /** 订单状态 */
-    @Excel(name = "订单状态")
-    @TableField("order_status")
-    private String orderStatus;
-
-    /** 订单状态 */
-    @Excel(name = "订单状态")
-    @TableField("order_status_name")
-    private String orderStatusName;
-
-    /** 付款状态 */
-    @Excel(name = "付款状态")
-    @TableField("pay_status")
-    private String payStatus;
-
-    /** 付款状态 */
-    @Excel(name = "付款状态")
-    @TableField("pay_name")
-    private String payName;
-
-    /** 收件人 */
-    @Excel(name = "收件人")
-    @TableField("receiver_name")
-    private String receiverName;
-
-    /** 收件人电话 */
-    @Excel(name = "收件人电话")
-    @TableField("mobile")
-    private String mobile;
-
-    /** 收件人详细信息 */
-    @Excel(name = "收件人详细信息")
-    @TableField("receiver")
-    private String receiver;
-
-    @Excel(name = "快递单号")
-    @TableField("shipment_num")
-    private String shipmentNum;
-    @Excel(name = "快递公司")
-    @TableField("shipping_com")
-    private String shippingComName;
-    @Excel(name = "快递公司编码")
-    @TableField("shipping_com_code")
-    private String shippingComCode;
-    @Excel(name = "发货方式")
-    @TableField("shipping_name")
-    private String shippingName;
-    @Excel(name = "发货状态")
-    @TableField("shipping_status")
-    private String shippingStatus;
-    @Excel(name = "运费")
-    @TableField("shipping_fee")
-    private String shippingFee;
-    @Excel(name = "发货时间")
-    @TableField("shipping_time")
-    private String shippingTime;
-    @Excel(name = "孔网付款时间")
-    @TableField("created_time")
-    private String createdTime;
-
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @TableField("remark")
-    private String remark;
-
-    /** 删除标识 */
-    @Excel(name = "删除标识")
-    @TableField("delete_flag")
-    private Integer deleteFlag;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_update")
-    private Date gmtUpdate;
-
-    /**  */
-    @Excel(name = "")
-    @TableField("user_id")
-    private Long userId;
-
-    /**  */
-    @Excel(name = "")
-    @TableField("admin_id")
-    private Long adminId;
-
-    @TableField(exist = false)
-    private ShopAccount shopAccount;
-
-    @TableField(exist = false)
-    private String remarkText;
-
-    @TableField(exist = false)
-    private List<ShopOrder> shopOrderList;
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("accountId", getAccountId())
-            .append("orderId", getOrderId())
-            .append("dangOrder", getDangOrder())
-            .append("address", getAddress())
-            .append("provName", getProvName())
-            .append("cityName", getCityName())
-            .append("areaName", getAreaName())
-            .append("orderStatus", getOrderStatus())
-            .append("orderStatusName", getOrderStatusName())
-            .append("payStatus", getPayStatus())
-            .append("payName", getPayName())
-            .append("receiverName", getReceiverName())
-            .append("mobile", getMobile())
-            .append("receiver", getReceiver())
-            .append("remark", getRemark())
-            .append("deleteFlag", getDeleteFlag())
-            .append("gmtCreate", getGmtCreate())
-            .append("gmtUpdate", getGmtUpdate())
-            .append("userId", getUserId())
-            .append("adminId", getAdminId())
-            .toString();
-    }
-}

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

@@ -1,100 +0,0 @@
-package com.iotechn.unimall.data.domain.shop;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
-import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.enums.FieldFill;
-import com.iotechn.unimall.core.util.StringUtils;
-import java.util.Date;
-
-/**
- * 物流公司对象 shop_tran
- * 
- * @author jlb
- * @date 2022-05-29
- */
-@Data
-@TableName("shop_tran")
-public class ShopTran extends BaseDO{
-    private static final long serialVersionUID = 1L;
-
-    /**  */
-    @TableId("id")
-    private Long id;
-    /** 物流公司名称 */
-    @Excel(name = "夫子物流公司名称")
-    @TableField("fuzi_name")
-    private String fuziName;
-    /** 物流公司名称 */
-    @Excel(name = "物流公司名称")
-    @TableField("name")
-    private String name;
-
-    /** 物流公司编码 */
-    @Excel(name = "物流公司编码")
-    @TableField("code1")
-    private String code1;
-
-    /** 物流公司编码 */
-    @Excel(name = "物流公司编码")
-    @TableField("code2")
-    private String code2;
-
-    /** 物流公司电话 */
-    @Excel(name = "物流公司电话")
-    @TableField("phone")
-    private String phone;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @TableField("remark")
-    private String remark;
-
-    /** 删除标识 */
-    @Excel(name = "删除标识")
-    @TableField("delete_flag")
-    private Integer deleteFlag;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**  */
-    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("gmt_update")
-    private Date gmtUpdate;
-
-    /**  */
-    @Excel(name = "")
-    @TableField("user_id")
-    private Long userId;
-
-    /**  */
-    @Excel(name = "")
-    @TableField("admin_id")
-    private Long adminId;
-
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("code1", getCode1())
-            .append("code2", getCode2())
-            .append("phone", getPhone())
-            .append("remark", getRemark())
-            .append("deleteFlag", getDeleteFlag())
-            .append("gmtCreate", getGmtCreate())
-            .append("gmtUpdate", getGmtUpdate())
-            .append("userId", getUserId())
-            .append("adminId", getAdminId())
-            .toString();
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/FuziDTO.java

@@ -1,61 +0,0 @@
-package com.iotechn.unimall.data.dto.shop;
-
-import lombok.Data;
-
-/**
- * @Author:chengchangjiang
- * @Description:
- * @Date:Created in 15:29 2022-05-28
- */
-@Data
-public class FuziDTO {
-    /**
-     * 详细地址
-     */
-    private String address;
-    /**
-     * 区
-     */
-    private String areaName;
-    /**
-     * 市
-     */
-    private String cityName;
-    /**
-     * 省
-     */
-    private String provName;
-    /**
-     * 订单ID
-     */
-    private String orderId;
-    /**
-     * 订单状态
-     */
-    private String orderStatus;
-    /**
-     * 订单状态
-     */
-    private String orderStatusName;
-    /**
-     * 付款状态
-     */
-    private String payStatus;
-    /**
-     * 付款状态
-     */
-    private String payName;
-    /**
-     * 收件人
-     */
-    private String receiverName;
-    /**
-     * 收件人电话
-     */
-    private String mobile;
-    /**
-     * 收件人详细信息
-     */
-    private String receiver;
-
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/ShopDTO.java

@@ -1,19 +0,0 @@
-package com.iotechn.unimall.data.dto.shop;
-
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Author:chengchangjiang
- * @Description:
- * @Date:Created in 8:40 2022-05-30
- */
-@Data
-public class ShopDTO {
-    String orderId;
-    String dangOrder;
-    String dangId;
-    List<ShopDTO> shopDTOS;
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/ItemInfo.java

@@ -1,183 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "ItemInfo")
-public class ItemInfo {
-    String itemID;
-    String outerItemID;
-    String itemName;
-    String itemType;
-    String specialAttribute;
-    String marketPrice;
-    String is_energySubsidy;
-    String subsidyPrice;
-    String unitPrice;
-    String orderCount;
-    String belongProductsPromoID;
-    String sendGoodsCount;
-    String giftCardCharge;
-    String productItemId;
-    String productImg;
-    String productVersion;
-    String itemRealPaidAmount;
-
-    @Override
-    public String toString() {
-        return "ItemInfo{" +
-                "itemID='" + itemID + '\'' +
-                ", outerItemID='" + outerItemID + '\'' +
-                ", itemName='" + itemName + '\'' +
-                ", itemType='" + itemType + '\'' +
-                ", specialAttribute='" + specialAttribute + '\'' +
-                ", marketPrice='" + marketPrice + '\'' +
-                ", is_energySubsidy='" + is_energySubsidy + '\'' +
-                ", subsidyPrice='" + subsidyPrice + '\'' +
-                ", unitPrice='" + unitPrice + '\'' +
-                ", orderCount='" + orderCount + '\'' +
-                ", belongProductsPromoID='" + belongProductsPromoID + '\'' +
-                ", sendGoodsCount='" + sendGoodsCount + '\'' +
-                ", giftCardCharge='" + giftCardCharge + '\'' +
-                ", productItemId='" + productItemId + '\'' +
-                ", productImg='" + productImg + '\'' +
-                ", productVersion='" + productVersion + '\'' +
-                ", itemRealPaidAmount='" + itemRealPaidAmount + '\'' +
-                '}';
-    }
-
-    public String getItemID() {
-        return itemID;
-    }
-
-    public void setItemID(String itemID) {
-        this.itemID = itemID;
-    }
-
-    public String getOuterItemID() {
-        return outerItemID;
-    }
-
-    public void setOuterItemID(String outerItemID) {
-        this.outerItemID = outerItemID;
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-
-    public String getItemType() {
-        return itemType;
-    }
-
-    public void setItemType(String itemType) {
-        this.itemType = itemType;
-    }
-
-    public String getSpecialAttribute() {
-        return specialAttribute;
-    }
-
-    public void setSpecialAttribute(String specialAttribute) {
-        this.specialAttribute = specialAttribute;
-    }
-
-    public String getMarketPrice() {
-        return marketPrice;
-    }
-
-    public void setMarketPrice(String marketPrice) {
-        this.marketPrice = marketPrice;
-    }
-
-    public String getIs_energySubsidy() {
-        return is_energySubsidy;
-    }
-
-    public void setIs_energySubsidy(String is_energySubsidy) {
-        this.is_energySubsidy = is_energySubsidy;
-    }
-
-    public String getSubsidyPrice() {
-        return subsidyPrice;
-    }
-
-    public void setSubsidyPrice(String subsidyPrice) {
-        this.subsidyPrice = subsidyPrice;
-    }
-
-    public String getUnitPrice() {
-        return unitPrice;
-    }
-
-    public void setUnitPrice(String unitPrice) {
-        this.unitPrice = unitPrice;
-    }
-
-    public String getOrderCount() {
-        return orderCount;
-    }
-
-    public void setOrderCount(String orderCount) {
-        this.orderCount = orderCount;
-    }
-
-    public String getBelongProductsPromoID() {
-        return belongProductsPromoID;
-    }
-
-    public void setBelongProductsPromoID(String belongProductsPromoID) {
-        this.belongProductsPromoID = belongProductsPromoID;
-    }
-
-    public String getSendGoodsCount() {
-        return sendGoodsCount;
-    }
-
-    public void setSendGoodsCount(String sendGoodsCount) {
-        this.sendGoodsCount = sendGoodsCount;
-    }
-
-    public String getGiftCardCharge() {
-        return giftCardCharge;
-    }
-
-    public void setGiftCardCharge(String giftCardCharge) {
-        this.giftCardCharge = giftCardCharge;
-    }
-
-    public String getProductItemId() {
-        return productItemId;
-    }
-
-    public void setProductItemId(String productItemId) {
-        this.productItemId = productItemId;
-    }
-
-    public String getProductImg() {
-        return productImg;
-    }
-
-    public void setProductImg(String productImg) {
-        this.productImg = productImg;
-    }
-
-    public String getProductVersion() {
-        return productVersion;
-    }
-
-    public void setProductVersion(String productVersion) {
-        this.productVersion = productVersion;
-    }
-
-    public String getItemRealPaidAmount() {
-        return itemRealPaidAmount;
-    }
-
-    public void setItemRealPaidAmount(String itemRealPaidAmount) {
-        this.itemRealPaidAmount = itemRealPaidAmount;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/ItemsList.java

@@ -1,24 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-import javax.xml.bind.annotation.XmlElement;
-import java.util.List;
-
-public class ItemsList {
-    @XmlElement(name = "ItemInfo")
-    List<ItemInfo> ItemInfo;
-
-    @Override
-    public String toString() {
-        return "ItemsList{" +
-                "ItemInfo=" + ItemInfo +
-                '}';
-    }
-
-    public List<ItemInfo> getItemInfo() {
-        return ItemInfo;
-    }
-
-    public void setItemInfo(List<ItemInfo> itemInfo) {
-        ItemInfo = itemInfo;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/OrderDetail.java

@@ -1,132 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-@XmlRootElement(name="response")
-public class OrderDetail {
-    String orderID;
-    int orderStatus;
-    int orderState;
-    int label;
-    String lastModifyTime;
-    String sendDate;
-    String paymentDate;
-    int isPresale;
-
-
-
-    String message;
-    String remark;
-    @XmlElement(name = "sendGoodsInfo")
-    SendGoodsInfo sendGoodsInfo;
-    @XmlElement(name = "ItemsList")
-    ItemsList itemsList;
-    @XmlElement(name = "receiptInfo")
-    ReceiptInfo receiptInfo;
-    @XmlTransient
-    public ReceiptInfo getReceiptInfo() {
-        return receiptInfo;
-    }
-
-    public void setReceiptInfo(ReceiptInfo receiptInfo) {
-        this.receiptInfo = receiptInfo;
-    }
-
-    public String getOrderID() {
-        return orderID;
-    }
-
-    public void setOrderID(String orderID) {
-        this.orderID = orderID;
-    }
-
-    public int getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(int orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    @XmlTransient
-    public SendGoodsInfo getSendGoodsInfo() {
-        return sendGoodsInfo;
-    }
-
-    public void setSendGoodsInfo(SendGoodsInfo sendGoodsInfo) {
-        this.sendGoodsInfo = sendGoodsInfo;
-    }
-    @XmlTransient
-    public ItemsList getItemsList() {
-        return itemsList;
-    }
-
-    public void setItemsList(ItemsList itemsList) {
-        this.itemsList = itemsList;
-    }
-    public String getLastModifyTime() {
-        return lastModifyTime;
-    }
-
-    public void setLastModifyTime(String lastModifyTime) {
-        this.lastModifyTime = lastModifyTime;
-    }
-
-    public int getLabel() {
-        return label;
-    }
-
-    public void setLabel(int label) {
-        this.label = label;
-    }
-
-    public int getOrderState() {
-        return orderState;
-    }
-
-    public void setOrderState(int orderState) {
-        this.orderState = orderState;
-    }
-
-    public String getSendDate() {
-        return sendDate;
-    }
-
-    public void setSendDate(String sendDate) {
-        this.sendDate = sendDate;
-    }
-
-    public String getPaymentDate() {
-        return paymentDate;
-    }
-
-    public void setPaymentDate(String paymentDate) {
-        this.paymentDate = paymentDate;
-    }
-
-    public int getIsPresale() {
-        return isPresale;
-    }
-
-    public void setIsPresale(int isPresale) {
-        this.isPresale = isPresale;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/OrderInfo.java

@@ -1,192 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-
-public class OrderInfo {
-    String orderID;
-    String consigneeName;
-    String consigneeTel;
-    String consigneeMobileTel;
-    String consigneeAddr;
-    String DangdangWarehouseAddr;
-    String sendGoodsMode;
-    String orderMoney;
-    String orderTimeStart;
-    String lastModifyTime;
-    String orderState;
-    String orderStatus;
-    String isCourierReceiptDetail;
-
-    String outerOrderID;
-
-    String remark;
-
-    String label;
-
-    String paymentDate;
-
-    String orderMode;
-
-    String isPresale;
-
-    String sendDate;
-
-    public String getOrderID() {
-        return orderID;
-    }
-
-    public void setOrderID(String orderID) {
-        this.orderID = orderID;
-    }
-
-    public String getConsigneeName() {
-        return consigneeName;
-    }
-
-    public void setConsigneeName(String consigneeName) {
-        this.consigneeName = consigneeName;
-    }
-
-    public String getConsigneeTel() {
-        return consigneeTel;
-    }
-
-    public void setConsigneeTel(String consigneeTel) {
-        this.consigneeTel = consigneeTel;
-    }
-
-    public String getConsigneeMobileTel() {
-        return consigneeMobileTel;
-    }
-
-    public void setConsigneeMobileTel(String consigneeMobileTel) {
-        this.consigneeMobileTel = consigneeMobileTel;
-    }
-
-    public String getConsigneeAddr() {
-        return consigneeAddr;
-    }
-
-    public void setConsigneeAddr(String consigneeAddr) {
-        this.consigneeAddr = consigneeAddr;
-    }
-
-    public String getDangdangWarehouseAddr() {
-        return DangdangWarehouseAddr;
-    }
-
-    public void setDangdangWarehouseAddr(String dangdangWarehouseAddr) {
-        DangdangWarehouseAddr = dangdangWarehouseAddr;
-    }
-
-    public String getSendGoodsMode() {
-        return sendGoodsMode;
-    }
-
-    public void setSendGoodsMode(String sendGoodsMode) {
-        this.sendGoodsMode = sendGoodsMode;
-    }
-
-    public String getOrderMoney() {
-        return orderMoney;
-    }
-
-    public void setOrderMoney(String orderMoney) {
-        this.orderMoney = orderMoney;
-    }
-
-    public String getOrderTimeStart() {
-        return orderTimeStart;
-    }
-
-    public void setOrderTimeStart(String orderTimeStart) {
-        this.orderTimeStart = orderTimeStart;
-    }
-
-    public String getLastModifyTime() {
-        return lastModifyTime;
-    }
-
-    public void setLastModifyTime(String lastModifyTime) {
-        this.lastModifyTime = lastModifyTime;
-    }
-
-    public String getOrderState() {
-        return orderState;
-    }
-
-    public void setOrderState(String orderState) {
-        this.orderState = orderState;
-    }
-
-    public String getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(String orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public String getIsCourierReceiptDetail() {
-        return isCourierReceiptDetail;
-    }
-
-    public void setIsCourierReceiptDetail(String isCourierReceiptDetail) {
-        this.isCourierReceiptDetail = isCourierReceiptDetail;
-    }
-
-    public String getOuterOrderID() {
-        return outerOrderID;
-    }
-
-    public void setOuterOrderID(String outerOrderID) {
-        this.outerOrderID = outerOrderID;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public String getPaymentDate() {
-        return paymentDate;
-    }
-
-    public void setPaymentDate(String paymentDate) {
-        this.paymentDate = paymentDate;
-    }
-
-    public String getOrderMode() {
-        return orderMode;
-    }
-
-    public void setOrderMode(String orderMode) {
-        this.orderMode = orderMode;
-    }
-
-    public String getIsPresale() {
-        return isPresale;
-    }
-
-    public void setIsPresale(String isPresale) {
-        this.isPresale = isPresale;
-    }
-
-    public String getSendDate() {
-        return sendDate;
-    }
-
-    public void setSendDate(String sendDate) {
-        this.sendDate = sendDate;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/OrdersList.java

@@ -1,18 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-
-import javax.xml.bind.annotation.XmlElement;
-import java.util.List;
-
-public class OrdersList {
-    @XmlElement(name = "OrderInfo")
-    List<OrderInfo> OrderInfo;
-
-    public List<OrderInfo> getOrderInfo() {
-        return OrderInfo;
-    }
-
-    public void setOrderInfo(List<OrderInfo> orderInfo) {
-        this.OrderInfo = orderInfo;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/ReceiptInfo.java

@@ -1,90 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-public class ReceiptInfo {
-    String receiptName;
-    String receiptDetails;
-    String receiptMoney;
-    String Is_DangdangReceipt;
-    String receiptTel;
-    String receiptType;
-    String eReceiptAddress;
-    String taxpayerId;
-
-    @Override
-    public String toString() {
-        return "ReceiptInfo{" +
-                "receiptName='" + receiptName + '\'' +
-                ", receiptDetails='" + receiptDetails + '\'' +
-                ", receiptMoney='" + receiptMoney + '\'' +
-                ", Is_DangdangReceipt='" + Is_DangdangReceipt + '\'' +
-                ", receiptTel='" + receiptTel + '\'' +
-                ", receiptType='" + receiptType + '\'' +
-                ", eReceiptAddress='" + eReceiptAddress + '\'' +
-                ", taxpayerId='" + taxpayerId + '\'' +
-                '}';
-    }
-
-    public String getReceiptName() {
-        return receiptName;
-    }
-
-    public void setReceiptName(String receiptName) {
-        this.receiptName = receiptName;
-    }
-
-    public String getReceiptDetails() {
-        return receiptDetails;
-    }
-
-    public void setReceiptDetails(String receiptDetails) {
-        this.receiptDetails = receiptDetails;
-    }
-
-    public String getReceiptMoney() {
-        return receiptMoney;
-    }
-
-    public void setReceiptMoney(String receiptMoney) {
-        this.receiptMoney = receiptMoney;
-    }
-
-    public String getIs_DangdangReceipt() {
-        return Is_DangdangReceipt;
-    }
-
-    public void setIs_DangdangReceipt(String is_DangdangReceipt) {
-        Is_DangdangReceipt = is_DangdangReceipt;
-    }
-
-    public String getReceiptTel() {
-        return receiptTel;
-    }
-
-    public void setReceiptTel(String receiptTel) {
-        this.receiptTel = receiptTel;
-    }
-
-    public String getReceiptType() {
-        return receiptType;
-    }
-
-    public void setReceiptType(String receiptType) {
-        this.receiptType = receiptType;
-    }
-
-    public String geteReceiptAddress() {
-        return eReceiptAddress;
-    }
-
-    public void seteReceiptAddress(String eReceiptAddress) {
-        this.eReceiptAddress = eReceiptAddress;
-    }
-
-    public String getTaxpayerId() {
-        return taxpayerId;
-    }
-
-    public void setTaxpayerId(String taxpayerId) {
-        this.taxpayerId = taxpayerId;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/SendGood.java

@@ -1,49 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class SendGood {
-
-    public static String processTemplate(String template, Map<String, Object> params){
-        StringBuffer sb = new StringBuffer();
-        Matcher m = Pattern.compile("\\$\\{\\w+\\}").matcher(template);
-        while (m.find()) {
-            String param = m.group();
-            Object value = params.get(param.substring(2, param.length() - 1));
-            m.appendReplacement(sb, value==null ? "" : value.toString());
-        }
-        m.appendTail(sb);
-        return sb.toString();
-    }
-
-    public static String TMPL = "<?xml version=\"1.0\" encoding=\"GBK\"?>\n" +
-            "<request>\n" +
-            "    <functionID>dangdang.order.goods.send</functionID>\n" +
-            "    <time>${SEND_TIME}</time>\n" +
-            "    <OrdersList>\n" +
-            "${ORDER_LIST}"+
-            "    </OrdersList>\n" +
-            "</request>";
-
-    public static String ONE_ORDER="        <OrderInfo>\n" +
-            "            <orderID>${DANG_DANG_ORDER}</orderID>\n" +
-            "            <logisticsName>${KUAI_DI_GONG_SI}</logisticsName>\n" +
-            "            <logisticsNameAb>${KUAI_DI_BIANMA}</logisticsNameAb>\n" +
-            "            <logisticsTel>${KUAI_DI_GONG_SI_DIAN_HUA}</logisticsTel>\n" +
-            "            <logisticsOrderID>${KUAI_DI_DAN_HAO}</logisticsOrderID>\n" +
-            "            <SendGoodsList>\n" +
-
-            "${SEND_ITEMS}"+
-
-            "            </SendGoodsList>\n" +
-            "        </OrderInfo>\n";
-
-    public static String ONE_ITEM="                <ItemInfo>\n" +
-            "                    <itemID>${DANG_DANG_ITEM_ID}</itemID>\n" +
-            "                    <sendGoodsCount>${SHU_LIANG}</sendGoodsCount>\n" +
-            "                    <belongProductsPromoID></belongProductsPromoID>\n" +
-            "                    <productItemId>${PRODUCT_ID}</productItemId>\n" +
-            "                </ItemInfo>\n";
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/SendGoodChai.java

@@ -1,55 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class SendGoodChai {
-
-    public static String processTemplate(String template, Map<String, Object> params){
-        StringBuffer sb = new StringBuffer();
-        Matcher m = Pattern.compile("\\$\\{\\w+\\}").matcher(template);
-        while (m.find()) {
-            String param = m.group();
-            Object value = params.get(param.substring(2, param.length() - 1));
-            m.appendReplacement(sb, value==null ? "" : value.toString());
-        }
-        m.appendTail(sb);
-        return sb.toString();
-    }
-
-    public static String TMPL = "" +
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            "\n" +
-            "<request> \n" +
-            "  <functionID>dangdang.order.goods.send</functionID>  \n" +
-            "  <time>${ORDER_TIME}</time>  \n" +
-            "  <OrdersList> \n" +
-            "    <OrderInfo> \n" +
-            "      <orderID>${ORDER_ID}</orderID>  \n" +
-            "      <shopId>${SHOP_ID}</shopId>  \n" +
-            "      <donePackageSendList> \n" +
-            "${PACKAGES}  \n" +
-            "      </donePackageSendList> \n" +
-            "    </OrderInfo>  \n" +
-            "\n" +
-            "  </OrdersList> \n" +
-            "</request>";
-
-
-    public static String ONE_ITEM="" +
-            "        <donePackageSend> \n" +
-            "          <expressCompany>${KUAI_DI_GONG_SI}</expressCompany>  \n" +
-            "          <expressCompanyId>${KUAI_DI_GONG_SI_CODE}</expressCompanyId>  \n" +
-            "          <expressCompanyTel>${KUAI_DI_GONG_SI_TEL}</expressCompanyTel>  \n" +
-            "          <expressNo>${KUAI_DI_DAN_HAO}</expressNo>  \n" +
-            "          <isSplite>1</isSplite>  \n" +
-            "          <SendGoodsList> \n" +
-            "            <ItemInfo> \n" +
-            "              <itemID>${ITEM_ID}</itemID>  \n" +
-            "              <sendGoodsCount>1</sendGoodsCount>  \n" +
-            "              <productItemId>${PRODUCT_ITEM_ID}</productItemId> \n" +
-            "            </ItemInfo>\n" +
-            "          </SendGoodsList> \n" +
-            "        </donePackageSend> ";
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/SendGoodsInfo.java

@@ -1,181 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-public class SendGoodsInfo {
-    String dangdangAccountID;
-    String consigneeName;
-    String consigneeAddr;
-    String consigneeAddr_State;
-    String consigneeAddr_Province;
-    String consigneeAddr_City;
-    String consigneeAddr_Area;
-    String consigneeAddr_StateCode;
-    String consigneeAddr_ProvinceCode;
-    String consigneeAddr_CityCode;
-    String consigneeAddr_AreaCode;
-    String consigneePostcode;
-    String consigneeTel;
-    String consigneeMobileTel;
-    String sendGoodsMode;
-    String sendCompany;
-    String sendOrderID;
-
-
-    @Override
-    public String toString() {
-        return "SendGoodsInfo{" +
-                "dangdangAccountID='" + dangdangAccountID + '\'' +
-                ", consigneeName='" + consigneeName + '\'' +
-                ", consigneeAddr='" + consigneeAddr + '\'' +
-                ", consigneeAddr_State='" + consigneeAddr_State + '\'' +
-                ", consigneeAddr_Province='" + consigneeAddr_Province + '\'' +
-                ", consigneeAddr_City='" + consigneeAddr_City + '\'' +
-                ", consigneeAddr_Area='" + consigneeAddr_Area + '\'' +
-                ", consigneeAddr_StateCode='" + consigneeAddr_StateCode + '\'' +
-                ", consigneeAddr_ProvinceCode='" + consigneeAddr_ProvinceCode + '\'' +
-                ", consigneeAddr_CityCode='" + consigneeAddr_CityCode + '\'' +
-                ", consigneeAddr_AreaCode='" + consigneeAddr_AreaCode + '\'' +
-                ", consigneePostcode='" + consigneePostcode + '\'' +
-                ", consigneeTel='" + consigneeTel + '\'' +
-                ", consigneeMobileTel='" + consigneeMobileTel + '\'' +
-                ", sendGoodsMode='" + sendGoodsMode + '\'' +
-                ", sendCompany='" + sendCompany + '\'' +
-                ", sendOrderID='" + sendOrderID + '\'' +
-                '}';
-    }
-
-    public String getDangdangAccountID() {
-        return dangdangAccountID;
-    }
-
-    public void setDangdangAccountID(String dangdangAccountID) {
-        this.dangdangAccountID = dangdangAccountID;
-    }
-
-    public String getConsigneeName() {
-        return consigneeName;
-    }
-
-    public void setConsigneeName(String consigneeName) {
-        this.consigneeName = consigneeName;
-    }
-
-    public String getConsigneeAddr() {
-        return consigneeAddr;
-    }
-
-    public void setConsigneeAddr(String consigneeAddr) {
-        this.consigneeAddr = consigneeAddr;
-    }
-
-    public String getConsigneeAddr_State() {
-        return consigneeAddr_State;
-    }
-
-    public void setConsigneeAddr_State(String consigneeAddr_State) {
-        this.consigneeAddr_State = consigneeAddr_State;
-    }
-
-    public String getConsigneeAddr_Province() {
-        return consigneeAddr_Province;
-    }
-
-    public void setConsigneeAddr_Province(String consigneeAddr_Province) {
-        this.consigneeAddr_Province = consigneeAddr_Province;
-    }
-
-    public String getConsigneeAddr_City() {
-        return consigneeAddr_City;
-    }
-
-    public void setConsigneeAddr_City(String consigneeAddr_City) {
-        this.consigneeAddr_City = consigneeAddr_City;
-    }
-
-    public String getConsigneeAddr_Area() {
-        return consigneeAddr_Area;
-    }
-
-    public void setConsigneeAddr_Area(String consigneeAddr_Area) {
-        this.consigneeAddr_Area = consigneeAddr_Area;
-    }
-
-    public String getConsigneeAddr_StateCode() {
-        return consigneeAddr_StateCode;
-    }
-
-    public void setConsigneeAddr_StateCode(String consigneeAddr_StateCode) {
-        this.consigneeAddr_StateCode = consigneeAddr_StateCode;
-    }
-
-    public String getConsigneeAddr_ProvinceCode() {
-        return consigneeAddr_ProvinceCode;
-    }
-
-    public void setConsigneeAddr_ProvinceCode(String consigneeAddr_ProvinceCode) {
-        this.consigneeAddr_ProvinceCode = consigneeAddr_ProvinceCode;
-    }
-
-    public String getConsigneeAddr_CityCode() {
-        return consigneeAddr_CityCode;
-    }
-
-    public void setConsigneeAddr_CityCode(String consigneeAddr_CityCode) {
-        this.consigneeAddr_CityCode = consigneeAddr_CityCode;
-    }
-
-    public String getConsigneeAddr_AreaCode() {
-        return consigneeAddr_AreaCode;
-    }
-
-    public void setConsigneeAddr_AreaCode(String consigneeAddr_AreaCode) {
-        this.consigneeAddr_AreaCode = consigneeAddr_AreaCode;
-    }
-
-    public String getConsigneePostcode() {
-        return consigneePostcode;
-    }
-
-    public void setConsigneePostcode(String consigneePostcode) {
-        this.consigneePostcode = consigneePostcode;
-    }
-
-    public String getConsigneeTel() {
-        return consigneeTel;
-    }
-
-    public void setConsigneeTel(String consigneeTel) {
-        this.consigneeTel = consigneeTel;
-    }
-
-    public String getConsigneeMobileTel() {
-        return consigneeMobileTel;
-    }
-
-    public void setConsigneeMobileTel(String consigneeMobileTel) {
-        this.consigneeMobileTel = consigneeMobileTel;
-    }
-
-    public String getSendGoodsMode() {
-        return sendGoodsMode;
-    }
-
-    public void setSendGoodsMode(String sendGoodsMode) {
-        this.sendGoodsMode = sendGoodsMode;
-    }
-
-    public String getSendCompany() {
-        return sendCompany;
-    }
-
-    public void setSendCompany(String sendCompany) {
-        this.sendCompany = sendCompany;
-    }
-
-    public String getSendOrderID() {
-        return sendOrderID;
-    }
-
-    public void setSendOrderID(String sendOrderID) {
-        this.sendOrderID = sendOrderID;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/response.java

@@ -1,45 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name="response")
-public class response {
-    String functionID;
-    String time;
-    totalInfo totalInfo;
-    @XmlElement(name = "OrdersList")
-    OrdersList OrdersList;
-
-    public String getFunctionID() {
-        return functionID;
-    }
-
-    public void setFunctionID(String functionID) {
-        this.functionID = functionID;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public void setTime(String time) {
-        this.time = time;
-    }
-
-    public totalInfo getTotalInfo() {
-        return totalInfo;
-    }
-
-    public void setTotalInfo(totalInfo totalInfo) {
-        this.totalInfo = totalInfo;
-    }
-
-    public OrdersList getOrdersList() {
-        return OrdersList;
-    }
-
-    public void setOrdersList(OrdersList ordersList) {
-        this.OrdersList = ordersList;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/dto/shop/XmlObject/totalInfo.java

@@ -1,67 +0,0 @@
-package com.iotechn.unimall.data.dto.shop.XmlObject;
-
-public class totalInfo {
-    String sendGoodsOrderCount;
-    String needExchangeOrderCount;
-    String orderCount;
-    String totalOrderMoney;
-    String pageSize;
-    String pageTotal;
-    String currentPage;
-
-    public String getSendGoodsOrderCount() {
-        return sendGoodsOrderCount;
-    }
-
-    public void setSendGoodsOrderCount(String sendGoodsOrderCount) {
-        this.sendGoodsOrderCount = sendGoodsOrderCount;
-    }
-
-    public String getNeedExchangeOrderCount() {
-        return needExchangeOrderCount;
-    }
-
-    public void setNeedExchangeOrderCount(String needExchangeOrderCount) {
-        this.needExchangeOrderCount = needExchangeOrderCount;
-    }
-
-    public String getOrderCount() {
-        return orderCount;
-    }
-
-    public void setOrderCount(String orderCount) {
-        this.orderCount = orderCount;
-    }
-
-    public String getTotalOrderMoney() {
-        return totalOrderMoney;
-    }
-
-    public void setTotalOrderMoney(String totalOrderMoney) {
-        this.totalOrderMoney = totalOrderMoney;
-    }
-
-    public String getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(String pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public String getPageTotal() {
-        return pageTotal;
-    }
-
-    public void setPageTotal(String pageTotal) {
-        this.pageTotal = pageTotal;
-    }
-
-    public String getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(String currentPage) {
-        this.currentPage = currentPage;
-    }
-}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/shop/ShopAccountMapper.java

@@ -1,13 +0,0 @@
-package com.iotechn.unimall.data.mapper.shop;
-
-import com.iotechn.unimall.data.domain.shop.ShopAccount;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-/**
- * 电商账户表Mapper接口
- * 
- * @author jlb
- * @date 2022-05-28
- */
-public interface ShopAccountMapper extends BaseMapper<ShopAccount>{
-
-}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/shop/ShopLogMapper.java

@@ -1,13 +0,0 @@
-package com.iotechn.unimall.data.mapper.shop;
-
-import com.iotechn.unimall.data.domain.shop.ShopLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-/**
- * 同步日志Mapper接口
- * 
- * @author jlb
- * @date 2022-06-08
- */
-public interface ShopLogMapper extends BaseMapper<ShopLog>{
-
-}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/shop/ShopOrderMapper.java

@@ -1,13 +0,0 @@
-package com.iotechn.unimall.data.mapper.shop;
-
-import com.iotechn.unimall.data.domain.shop.ShopOrder;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-/**
- * 电商订单表Mapper接口
- * 
- * @author jlb
- * @date 2022-05-28
- */
-public interface ShopOrderMapper extends BaseMapper<ShopOrder>{
-
-}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/shop/ShopTranMapper.java

@@ -1,13 +0,0 @@
-package com.iotechn.unimall.data.mapper.shop;
-
-import com.iotechn.unimall.data.domain.shop.ShopTran;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-/**
- * 物流公司Mapper接口
- * 
- * @author jlb
- * @date 2022-05-29
- */
-public interface ShopTranMapper extends BaseMapper<ShopTran>{
-
-}

unimall-launcher/src/main/resources/application.properties

@@ -8,7 +8,7 @@ logging.level.root=info
 ###MySql (MySqlConfiguration)
 ########################################################
 spring.druid.driverClassName=com.mysql.jdbc.Driver
-spring.druid.url=jdbc:mysql://106.14.75.12/shop?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
+spring.druid.url=jdbc:mysql://106.14.75.12/wuye?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
 spring.druid.username=root
 spring.druid.password=Ccj841968545
 spring.druid.maxActive=30