From d2958d9a250a2a84125fdcb5a85790020f455378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E9=BD=90?= <280645618@qq.com>
Date: Mon, 17 Jun 2024 18:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Epdd=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=95=E5=8F=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 open-api/pdd-api/libs/pdd-api-0.6.17.jar      | Bin 53195 -> 67581 bytes
 .../pdd/controller/EwaybillController.java    | 223 ++++-----
 .../pdd/domain/OmsPddWaybillAccount.java      |   4 +
 .../qihang/pdd/domain/bo/PddWaybillGetBo.java |  10 +
 .../com/qihang/pdd/openapi/ApiCommon.java     |   7 +-
 .../pdd/service/ErpShipWaybillService.java    |   6 +
 .../pdd/service/OmsPddOrderService.java       |   2 +
 .../impl/ErpShipWaybillServiceImpl.java       | 101 ++++
 .../service/impl/OmsPddOrderServiceImpl.java  |  10 +
 .../views/shipping/ewaybillPrint/index.vue    |   5 +-
 vue/src/views/shop/dou/ewaybill/index.vue     | 442 ++++++++++++++++++
 vue/src/views/shop/jd/ewaybill/index.vue      | 442 ++++++++++++++++++
 12 files changed, 1139 insertions(+), 113 deletions(-)
 create mode 100644 open-api/pdd-api/src/main/java/com/qihang/pdd/domain/bo/PddWaybillGetBo.java
 create mode 100644 vue/src/views/shop/dou/ewaybill/index.vue
 create mode 100644 vue/src/views/shop/jd/ewaybill/index.vue

diff --git a/open-api/pdd-api/libs/pdd-api-0.6.17.jar b/open-api/pdd-api/libs/pdd-api-0.6.17.jar
index 4f432890708ad2301a05f35bed11c507abe75a87..176bbb6c865078fa906b2107e6fbedf2ab40da97 100644
GIT binary patch
delta 15906
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
MQ9wX^Zr;xR2kcrZQvd(}

delta 1785
zcmZWp3s4hR6y4o?2_bw8KMfl2gNTrbBdAmb6n|)iR`FW}TiQ`#0fR*a%ph^BA4>6o
zs}2^5Sleo2+Nfw%Ea0G^3@|Mgu_M%qBOOH$f$&MvcOOtDx|!_RclN$>?>q1AGi7t{
z6>!9n5ge|Ff~z7bM?9G+kII>O0`4^v;NI?o@5r6@2Utc20Ho7%0JbwzQ48$=kN(Wu
zA!arPLowsX2P_f#@f^#e>eoFpI(f9<3?Vc{`5~Hd*Mz6U?%BFcr3y{lwlq$a7`M~^
zV^yqLowe%v`xPM$`B@&pCqleL{i{8te+fFij^q~U3+2l-SJpl)`X@~$`Lebstf+-!
zoO-*du3qn3(|+{RwWn$?_S#eD+&+8mx!lpdeo2_y#cmWGeLZ;BhZnA?gjI)<zMC^~
zk-!jln2z0`ncE!`z4b}UnwJlKwygR0$@*K;$|iM!u5qtKyL<E66>hDSo!!q$Tl94Y
zoZ}Q1BX+QJPaL-#PBH{!YuB4=EqAmpt~}NrQ>;wAWx12|M`aoJhho){;>qV)jw>6I
z3N=Rl-n_F1S18+V3m@&Tn2>q@bbDHfI;)f(cAG~DDQwU)yDA|V^|Q+=u+hMHR|x=X
z{3il`=5-(shHrv1h@UB83%M}9vH15%fI0E=$n-ijhr~7P4kB?9jhKvOS}j3wwp;}9
z{wJ5(0Jh&vrvZ0V?<4r~-gbiPYYx(OuwQq-@KJ{fD5?`#f;|kP+AXB2_y<`;uK!UY
z2d1l<|F+>m+o0yxz6=I&S11O<sxB4dSb=56We46=<84pD|6sJaONj=%9W-U4a;2E6
zOD(iGG(N2Rsx3y31W}F4G;&>1&#}rTyTR0yw2o6pzL)BpI{PXP1w{#Ja-9>-Z+$+)
z=$V|k;7OnPw+AJsGtWM4&?V*P&2Ovub?J=iDa&2XaQtW8+^rjEOpl3>1o|}R?s}74
zR2OXIL`Kkzlrz%f=t$2jTs<o92?5~tDgb8nl9o>Foev{@Zy3Ov-emxueKNGsI2|4j
z83U1RpLB%nG>$#aqXlSlpDj@FeKKYfgUVdoP_xhpJ!bewXA;Z7Q74-hlbW$v;WiW%
zfbAH$iZc>~!xLo4y?-d!>T?;1#8{m1jU5Ct;VG<)PfzfICaPa2y?n_wQ%F%4#!%EW
ztMDob(UwT0XrDz4C2IO*Os*?t{ZMs3VHz>h>W!K4Na;NeDFz5TZ$QTA6@--s@s26@
z(??w#${HWDV&P@HqVw2Tg;myupy7FAVEK^s6;}K6y%9B}9CRk8EaLxi`4xwv+;Q=<
ztt2)qMBm0wL_dbPqJlvp@zbD;DOf_-SBu}Rremxry$5&fPANtCT1h3V@FYL9a;TDx
zCK+Q$CNlY^@le|h%v{|=YBQRq03$ccm`)90Hkn;XrPDI5?VZh|r~zAwQd-Gdw5ZcO
z8C^BIlfYf6WvV8;$8N4~@5O<`SkVn_x5y#KQHzW@mrI!Flg`7t!@gi>occ7OU8+3T
zLJkd!XIFACpIAWnyy{V22Yg2%;hpb~^7dTJZz=+w4d>Fnq_qD(YWufKYdu30M71Mr
z!d8R8=jVaO4L%iWn8w4DNl!Fmc(fPM{GfHxC%JgJdD!-uR=y-$La}Xfl-~@C6Om(r
zUBJf@t4rCB__PN;DA+U@XOyBXUEY$>_JR|It%X;&;nfUwyZ~2Ve+xe=*c1UhM*hy(
eVwE|d3?lJSBXNn0;PK&|5B`<dQIxq1M*jhGCY6E!

diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java
index a77a8c6e..7b2a8622 100644
--- a/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java
@@ -2,15 +2,22 @@ package com.qihang.pdd.controller;
 
 
 import cn.qihangerp.open.pdd.WaybillAccountApiHelper;
+import cn.qihangerp.open.pdd.WaybillApiHelper;
 import cn.qihangerp.open.pdd.common.ApiResultVo;
 import cn.qihangerp.open.pdd.model.WaybillAccount;
+import cn.qihangerp.open.pdd.model.WaybillCodeModule;
+import cn.qihangerp.open.pdd.request.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qihang.common.common.AjaxResult;
 import com.qihang.common.enums.HttpStatus;
+import com.qihang.pdd.domain.ErpShipWaybill;
+import com.qihang.pdd.domain.OmsPddOrder;
 import com.qihang.pdd.domain.OmsPddWaybillAccount;
+import com.qihang.pdd.domain.bo.PddWaybillGetBo;
 import com.qihang.pdd.openapi.ApiCommon;
 import com.qihang.pdd.openapi.PullRequest;
 import com.qihang.pdd.service.ErpShipWaybillService;
+import com.qihang.pdd.service.OmsPddOrderService;
 import com.qihang.pdd.service.OmsPddWaybillAccountService;
 import com.qihang.security.common.BaseController;
 import lombok.AllArgsConstructor;
@@ -28,7 +35,7 @@ import java.util.List;
 public class EwaybillController extends BaseController {
     private final ApiCommon apiCommon;
     private final OmsPddWaybillAccountService waybillAccountService;
-//    private final OmsTaoOrderService orderService;
+    private final OmsPddOrderService orderService;
     private final ErpShipWaybillService erpShipWaybillService;
 
     @GetMapping(value = "/get_waybill_account_list")
@@ -99,112 +106,114 @@ public class EwaybillController extends BaseController {
         return AjaxResult.success(list);
     }
 
-//    @PostMapping("/get_waybill_code")
-//    @ResponseBody
-//    public AjaxResult getWaybillCode(@RequestBody TaoWaybillGetBo req) {
-//        if (req.getAccountId() == null || req.getAccountId() <= 0) {
-//            return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，请选择电子面单账户");
-//        }
-//        if (req.getShopId() == null || req.getShopId() <= 0) {
-//            return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id");
-//        }
-//        if(req.getIds()==null || req.getIds().length<=0) {
-//            return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有选择订单");
-//        }
-//        var checkResult = apiCommon.checkBefore(req.getShopId());
-//        if (checkResult.getCode() != HttpStatus.SUCCESS) {
-//            return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData());
-//        }
-//        String accessToken = checkResult.getData().getAccessToken();
-//        String appKey = checkResult.getData().getAppKey();
-//        String appSecret = checkResult.getData().getAppSecret();
-//        Long sellerShopId = checkResult.getData().getSellerShopId();
-//
-//        // 获取电子面单账户信息(包含了发货地址信息)
-//        OmsTaoWaybillAccount account = waybillAccountService.getById(req.getAccountId());
-//
-//        WaybillCloudPrintApplyNewRequest request = new WaybillCloudPrintApplyNewRequest();
-//        request.setCp_code(account.getCpCode());
-//
-//        WaybillCloudPrintApplyNewRequestSender sender = new WaybillCloudPrintApplyNewRequestSender();
-//        sender.setName(account.getName());
-//        sender.setMobile(account.getMobile());
-//        WaybillCloudPrintApplyNewRequestSender.AddressDTO addressDTO = new WaybillCloudPrintApplyNewRequestSender.AddressDTO();
-//        addressDTO.setCity(account.getCity());
-//        addressDTO.setProvince(account.getProvince());
-//        addressDTO.setDistrict(account.getArea());
-//        addressDTO.setTown("");
-//        addressDTO.setDetail(account.getAddressDetail());
-//        sender.setAddress(addressDTO);
-//        request.setSender(sender);
-//
-//        // 组合取号的订单信息trade_order_info_dtos
-//        List<WaybillCloudPrintApplyNewRequestTradeOrderInfoDto> orderList = new ArrayList<>();
-//
-//        for(String orderId:req.getIds()){
-//            if(StringUtils.hasText(orderId)){
-//                OmsTaoOrder omsTaoOrder = orderService.queryDetailByTid(orderId);
-//                if(omsTaoOrder!=null) {
-//                    WaybillCloudPrintApplyNewRequestTradeOrderInfoDto dto = new WaybillCloudPrintApplyNewRequestTradeOrderInfoDto();
-//                    dto.setObjectId(omsTaoOrder.getTid());
-//                    dto.setTemplateUrl("http://cloudprint.cainiao.com/template/standard/101");
-//                    dto.setUserId(sellerShopId.intValue());
-//
-//                    WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.OrderInfoDTO orderInfoDTO = new WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.OrderInfoDTO();
-//                    orderInfoDTO.setOrderChannelsType("TB");
-//                    orderInfoDTO.setTradeOrderList(omsTaoOrder.getTid());
-//                    dto.setOrderInfo(orderInfoDTO);
-//
-//                    WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.PackageInfoDTO packageInfoDTO = new WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.PackageInfoDTO();
-//                    List<WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.PackageInfoDTO.ItemsDTO> items = new ArrayList<>();
-//                    for (var orderItem : omsTaoOrder.getItems()) {
-//                        WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.PackageInfoDTO.ItemsDTO itemsDTO = new WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.PackageInfoDTO.ItemsDTO();
-//                        itemsDTO.setCount(orderItem.getNum());
-//                        itemsDTO.setName(orderItem.getTitle());
-//                        items.add(itemsDTO);
-//                    }
-//                    packageInfoDTO.setItems(items);
-//                    dto.setPackageInfo(packageInfoDTO);
-//
-//                    WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.RecipientDTO recipientDTO = new WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.RecipientDTO();
-//                    WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.RecipientDTO.AddressDTO addressDTO1 = new WaybillCloudPrintApplyNewRequestTradeOrderInfoDto.RecipientDTO.AddressDTO();
-//                    addressDTO1.setCity(omsTaoOrder.getReceiverCity());
-//                    addressDTO1.setTown(omsTaoOrder.getReceiverTown());
-//                    addressDTO1.setProvince(omsTaoOrder.getReceiverState());
-//                    addressDTO1.setDistrict(omsTaoOrder.getReceiverDistrict());
-//                    addressDTO1.setDetail(omsTaoOrder.getReceiverAddress());
-//                    recipientDTO.setAddress(addressDTO1);
-//                    recipientDTO.setName(omsTaoOrder.getReceiverName());
-//                    recipientDTO.setOaid(omsTaoOrder.getOaid());
-//                    recipientDTO.setTid(omsTaoOrder.getTid());
-//                    dto.setRecipient(recipientDTO);
-//                    orderList.add(dto);
-//                }
-//            }
-//        }
-//
-//        request.setTrade_order_info_dtos(orderList);
-//
-//        ApiResultVo<WaybillCloudPrint> apiResultVo = WaybillApiHelper.waybillCloudPrintApplyNew(appKey, appSecret, accessToken, request);
-//        if(apiResultVo.getCode()==0){
-//            // 保持数据
-//            for(var result: apiResultVo.getList()){
-//                ErpShipWaybill waybill = new ErpShipWaybill();
-//                waybill.setShopId(req.getShopId());
-//                waybill.setOrderId(result.getObjectId());
-//                waybill.setWaybillCode(result.getWaybillCode());
-//                waybill.setLogisticsCode(result.getCpCode());
-//                waybill.setPrintData(result.getPrintData());
-//                erpShipWaybillService.waybillUpdate(waybill);
-//                log.info("====保存電子面單信息========"+result.getObjectId());
-//            }
-//        }else{
-//            return AjaxResult.error(apiResultVo.getMsg());
-//        }
-//
-//        return success();
-//    }
-//
+    @PostMapping("/get_waybill_code")
+    @ResponseBody
+    public AjaxResult getWaybillCode(@RequestBody PddWaybillGetBo req) {
+        if (req.getAccountId() == null || req.getAccountId() <= 0) {
+            return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，请选择电子面单账户");
+        }
+        if (req.getShopId() == null || req.getShopId() <= 0) {
+            return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id");
+        }
+        if(req.getIds()==null || req.getIds().length<=0) {
+            return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有选择订单");
+        }
+        var checkResult = apiCommon.checkBefore(req.getShopId());
+        if (checkResult.getCode() != HttpStatus.SUCCESS) {
+            return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData());
+        }
+        String accessToken = checkResult.getData().getAccessToken();
+        String appKey = checkResult.getData().getAppKey();
+        String appSecret = checkResult.getData().getAppSecret();
+        Long sellerShopId = checkResult.getData().getSellerShopId();
+
+        // 获取电子面单账户信息(包含了发货地址信息)
+        OmsPddWaybillAccount account = waybillAccountService.getById(req.getAccountId());
+
+        WaybillCloudPrintApplyNewRequest request = new WaybillCloudPrintApplyNewRequest();
+        request.setWp_code(account.getCpCode());
+        request.setNeed_encrypt(true);
+
+        WaybillCloudPrintApplyNewRequestContact sender = new WaybillCloudPrintApplyNewRequestContact();
+        sender.setName(account.getName());
+        sender.setMobile(account.getMobile());
+        WaybillCloudPrintApplyNewRequestContactAddress addressDTO = new WaybillCloudPrintApplyNewRequestContactAddress();
+        addressDTO.setCity(account.getCity());
+        addressDTO.setProvince(account.getProvince());
+        addressDTO.setDistrict(account.getArea());
+        addressDTO.setTown("");
+        addressDTO.setDetail(account.getAddressDetail());
+        sender.setAddress(addressDTO);
+        request.setSender(sender);
+
+        // 组合取号的订单信息trade_order_info_dtos
+        List<WaybillCloudPrintApplyNewRequestTradeOrderInfoDto> orderList = new ArrayList<>();
+
+        for(String orderSn:req.getIds()){
+            if(StringUtils.hasText(orderSn)){
+                OmsPddOrder order = orderService.queryDetailByOrderSn(orderSn);
+                if(order!=null) {
+                    WaybillCloudPrintApplyNewRequestTradeOrderInfoDto dto = new WaybillCloudPrintApplyNewRequestTradeOrderInfoDto();
+                    dto.setObject_id(order.getOrderSn());
+                    dto.setTemplate_url("https://file-link.pinduoduo.com/yunda_std");
+                    dto.setUser_id(sellerShopId);
+
+                    OrderInfo orderInfo = new OrderInfo();
+                    orderInfo.setOrder_channels_type("PDD");
+                    orderInfo.setTrade_order_list(new String[] {order.getOrderSn()});
+                    dto.setOrder_info(orderInfo);
+
+
+                    PackageInfo packageInfo = new PackageInfo();
+                    List<PackageInfoItem> items = new ArrayList<>();
+                    for (var orderItem : order.getItemList()) {
+                        PackageInfoItem item = new PackageInfoItem();
+                        item.setName(orderItem.getGoodsName());
+                        item.setCount(orderItem.getGoodsCount());
+                        items.add(item);
+                    }
+                    packageInfo.setItems(items);
+                    dto.setPackage_info(packageInfo);
+
+
+                    WaybillCloudPrintApplyNewRequestContact recipient = new WaybillCloudPrintApplyNewRequestContact();
+                    recipient.setName("启航");
+                    recipient.setMobile("15818590112");
+                    WaybillCloudPrintApplyNewRequestContactAddress recipientAddress = new WaybillCloudPrintApplyNewRequestContactAddress();
+                    recipientAddress.setProvince(order.getProvince());
+                    recipientAddress.setCity(order.getCity());
+                    recipientAddress.setDistrict(order.getTown());
+                    recipientAddress.setDetail(order.getAddress());
+                    recipient.setAddress(recipientAddress);
+                    dto.setRecipient(recipient);
+
+                    orderList.add(dto);
+                }
+            }
+        }
+
+        request.setTrade_order_info_dtos(orderList);
+
+        ApiResultVo<WaybillCodeModule> apiResultVo = WaybillApiHelper.getWaybillCode(appKey, appSecret, accessToken, request);
+        if(apiResultVo.getCode()==0){
+            // 保持数据
+            for(var result: apiResultVo.getList()){
+                ErpShipWaybill waybill = new ErpShipWaybill();
+                waybill.setShopId(req.getShopId());
+                waybill.setOrderId(result.getObject_id());
+                waybill.setWaybillCode(result.getWaybill_code());
+                waybill.setLogisticsCode(account.getCpCode());
+                waybill.setPrintData(result.getPrint_data());
+                erpShipWaybillService.waybillUpdate(waybill);
+                log.info("====保存電子面單信息========"+result.getObject_id());
+            }
+        }else{
+            return AjaxResult.error(apiResultVo.getMsg());
+        }
+
+        return success();
+    }
+
 //    @PostMapping("/get_print_data")
 //    @ResponseBody
 //    public AjaxResult getPrintData(@RequestBody TaoWaybillGetBo req) {
diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/domain/OmsPddWaybillAccount.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/domain/OmsPddWaybillAccount.java
index c8b4db76..7611daec 100644
--- a/open-api/pdd-api/src/main/java/com/qihang/pdd/domain/OmsPddWaybillAccount.java
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/domain/OmsPddWaybillAccount.java
@@ -1,6 +1,9 @@
 package com.qihang.pdd.domain;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 /**
@@ -12,6 +15,7 @@ public class OmsPddWaybillAccount implements Serializable {
     /**
      * 
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/domain/bo/PddWaybillGetBo.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/domain/bo/PddWaybillGetBo.java
new file mode 100644
index 00000000..2dea66c2
--- /dev/null
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/domain/bo/PddWaybillGetBo.java
@@ -0,0 +1,10 @@
+package com.qihang.pdd.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class PddWaybillGetBo {
+    private Long accountId;//电子面单账户id
+    private String[] ids;
+    private Long shopId;//店铺Id
+}
diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java
index de4b08c1..bd8e00f3 100644
--- a/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/openapi/ApiCommon.java
@@ -49,16 +49,15 @@ public class ApiCommon {
 //            return ResultVo.error(HttpStatus.PARAMS_ERROR, "第三方平台配置错误，没有找到ServerUrl");
 //        }
 
-//        if(shop.getSellerId() == null || shop.getSellerId() <= 0) {
-//            return com.qihang.tao.common.ApiResult.build(HttpStatus.PARAMS_ERROR,  "第三方平台配置错误，没有找到SellerUserId");
-//        }
+        if(shop.getSellerShopId() == null || shop.getSellerShopId() <= 0) {
+            return ResultVo.error(HttpStatus.PARAMS_ERROR,  "店铺配置错误，没有找到SellerShopId");
+        }
 
         ShopApiParams params = new ShopApiParams();
         params.setAppKey(platform.getAppKey());
         params.setAppSecret(platform.getAppSecret());
         params.setAccessToken(shop.getAccessToken());
         params.setRedirectUrl(platform.getRedirectUrl());
-
         params.setServerUrl(platform.getServerUrl());
         params.setSellerShopId(shop.getSellerShopId());
         if (!StringUtils.hasText(shop.getAccessToken())) {
diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/ErpShipWaybillService.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/ErpShipWaybillService.java
index 72eea9fa..7731be08 100644
--- a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/ErpShipWaybillService.java
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/ErpShipWaybillService.java
@@ -1,13 +1,19 @@
 package com.qihang.pdd.service;
 
+import com.qihang.common.common.ResultVo;
 import com.qihang.pdd.domain.ErpShipWaybill;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
 * @author TW
 * @description 针对表【erp_ship_waybill(发货电子面单记录表)】的数据库操作Service
 * @createDate 2024-06-17 10:16:47
 */
 public interface ErpShipWaybillService extends IService<ErpShipWaybill> {
+    ResultVo<Integer> waybillUpdate(ErpShipWaybill shipWaybill);
+    List<ErpShipWaybill> getListByOrderIds(Long shopId, String[] orderIds);
 
+    ResultVo<Integer> printSuccess(Long shopId,String[] orderIds);
 }
diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/OmsPddOrderService.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/OmsPddOrderService.java
index 27a93395..768d846e 100644
--- a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/OmsPddOrderService.java
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/OmsPddOrderService.java
@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface OmsPddOrderService extends IService<OmsPddOrder> {
     PageResult<OmsPddOrder> queryPageList(OmsPddOrder bo, PageQuery pageQuery);
     ResultVo<Integer> saveOrder(Long shopId, OmsPddOrder order);
+
+    OmsPddOrder queryDetailByOrderSn(String orderSn);
 }
diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/ErpShipWaybillServiceImpl.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/ErpShipWaybillServiceImpl.java
index 992800f6..e4215d66 100644
--- a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/ErpShipWaybillServiceImpl.java
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/ErpShipWaybillServiceImpl.java
@@ -1,20 +1,121 @@
 package com.qihang.pdd.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qihang.common.common.ResultVo;
+import com.qihang.common.enums.EnumShopType;
 import com.qihang.pdd.domain.ErpShipWaybill;
+import com.qihang.pdd.domain.OmsPddOrder;
+import com.qihang.pdd.mapper.OmsPddOrderMapper;
 import com.qihang.pdd.service.ErpShipWaybillService;
 import com.qihang.pdd.mapper.ErpShipWaybillMapper;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
 * @author TW
 * @description 针对表【erp_ship_waybill(发货电子面单记录表)】的数据库操作Service实现
 * @createDate 2024-06-17 10:16:47
 */
+@AllArgsConstructor
 @Service
 public class ErpShipWaybillServiceImpl extends ServiceImpl<ErpShipWaybillMapper, ErpShipWaybill>
     implements ErpShipWaybillService{
+    private final ErpShipWaybillMapper mapper;
+    private final OmsPddOrderMapper orderMapper;
 
+    /**
+     * 更新电子面单信息
+     * @param shipWaybill
+     * @return
+     */
+    @Transactional
+    @Override
+    public ResultVo<Integer> waybillUpdate(ErpShipWaybill shipWaybill) {
+        String orderSn= shipWaybill.getOrderId();
+        if(shipWaybill.getId()!=null&&shipWaybill.getId()>0){
+            // 存在，修改
+            shipWaybill.setCreateBy(null);
+            shipWaybill.setCreateTime(null);
+            shipWaybill.setOrderId(null);
+            shipWaybill.setShopId(null);
+            shipWaybill.setShopType(null);
+            mapper.updateById(shipWaybill);
+        }else{
+            // 新增
+            List<ErpShipWaybill> erpShipWaybills = mapper.selectList(new LambdaQueryWrapper<ErpShipWaybill>().eq(ErpShipWaybill::getOrderId, orderSn));
+            if(erpShipWaybills==null|| erpShipWaybills.size()==0) {
+                shipWaybill.setStatus(1);//已取号
+                shipWaybill.setShopType(EnumShopType.PDD.getIndex());
+                shipWaybill.setCreateTime(new Date());
+                mapper.insert(shipWaybill);
+            }else{
+                ErpShipWaybill update = new ErpShipWaybill();
+                update.setId(erpShipWaybills.get(0).getId());
+                update.setWaybillCode(shipWaybill.getWaybillCode());
+                update.setLogisticsCode(shipWaybill.getLogisticsCode());
+                update.setPrintData(shipWaybill.getPrintData());
+                update.setStatus(1);
+                update.setUpdateTime(new Date());
+                update.setUpdateBy("重新取号");
+                mapper.updateById(update);
+            }
+        }
+        // 更新关联订单erp_send_status状态
+        OmsPddOrder orderUpdate = new OmsPddOrder();
+        orderUpdate.setErpSendStatus(shipWaybill.getStatus());
+        orderUpdate.setErpSendCode(shipWaybill.getWaybillCode());
+        orderUpdate.setErpSendCompany(shipWaybill.getLogisticsCode());
+        orderMapper.update(orderUpdate,new LambdaQueryWrapper<OmsPddOrder>().eq(OmsPddOrder::getOrderSn,orderSn));
+
+        return ResultVo.success();
+    }
+
+    @Override
+    public List<ErpShipWaybill> getListByOrderIds(Long shopId, String[] orderIds) {
+        List<ErpShipWaybill> erpShipWaybills = mapper.selectList(
+                new LambdaQueryWrapper<ErpShipWaybill>()
+                        .eq(ErpShipWaybill::getShopId,shopId)
+                        .in(ErpShipWaybill::getOrderId, Arrays.stream(orderIds).toList()));
+        return erpShipWaybills;
+    }
+
+    @Transactional
+    @Override
+    public ResultVo<Integer> printSuccess(Long shopId, String[] orderIds) {
+        List<ErpShipWaybill> erpShipWaybills = mapper.selectList(
+                new LambdaQueryWrapper<ErpShipWaybill>()
+                        .eq(ErpShipWaybill::getShopId,shopId)
+                        .in(ErpShipWaybill::getOrderId, Arrays.stream(orderIds).toList()));
+        if(erpShipWaybills!=null){
+            for (var w : erpShipWaybills){
+                ErpShipWaybill update = new ErpShipWaybill();
+                update.setId(erpShipWaybills.get(0).getId());
+                update.setStatus(2);
+                update.setUpdateTime(new Date());
+                update.setUpdateBy("打印面单");
+                mapper.updateById(update);
+
+                // 更新关联订单erp_send_status状态
+                OmsPddOrder orderUpdate = new OmsPddOrder();
+                orderUpdate.setErpSendStatus(update.getStatus());
+
+                orderMapper.update(orderUpdate,new LambdaQueryWrapper<OmsPddOrder>().eq(OmsPddOrder::getOrderSn,w.getOrderId()));
+
+                //TODO: 打印成功之后 加入备货清单
+
+
+
+
+            }
+        }
+        return ResultVo.success();
+    }
 }
 
 
diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/OmsPddOrderServiceImpl.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/OmsPddOrderServiceImpl.java
index f0582cbd..167d49c0 100644
--- a/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/OmsPddOrderServiceImpl.java
+++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/service/impl/OmsPddOrderServiceImpl.java
@@ -158,6 +158,16 @@ public class OmsPddOrderServiceImpl extends ServiceImpl<OmsPddOrderMapper, OmsPd
         }
 
     }
+
+    @Override
+    public OmsPddOrder queryDetailByOrderSn(String orderSn) {
+        List<OmsPddOrder> omsTaoOrders = orderMapper.selectList(new LambdaQueryWrapper<OmsPddOrder>().eq(OmsPddOrder::getOrderSn, orderSn));
+        if(omsTaoOrders == null) return null;
+
+        OmsPddOrder order = omsTaoOrders.get(0);
+        order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper<OmsPddOrderItem>().eq(OmsPddOrderItem::getOrderSn,orderSn)));
+        return order;
+    }
 }
 
 
diff --git a/vue/src/views/shipping/ewaybillPrint/index.vue b/vue/src/views/shipping/ewaybillPrint/index.vue
index 59e401d5..4cca6fb9 100644
--- a/vue/src/views/shipping/ewaybillPrint/index.vue
+++ b/vue/src/views/shipping/ewaybillPrint/index.vue
@@ -11,7 +11,7 @@
         <print-pdd></print-pdd>
       </el-tab-pane>
       <el-tab-pane label="抖店" name="printDou" lazy>
-        <el-col style="color:red">抖店电子面单打印后续开放</el-col>
+        <print-dou></print-dou>
       </el-tab-pane>
       <el-tab-pane label="视频号小店" name="printWei" lazy>
         <print-wei></print-wei>
@@ -26,11 +26,12 @@
 import printWei  from "@/views/shop/wei/ewaybill/index.vue";
 import printTao from "@/views/shop/tao/ewaybill/index.vue";
 import printPdd from "@/views/shop/pdd/ewaybill/index.vue";
+import printDou from "@/views/shop/dou/ewaybill/index.vue";
 
 
 export default {
   name: "print",
-  components:{printWei,printTao,printPdd},
+  components:{printWei,printTao,printPdd,printDou},
   data() {
     return {
       activeName: 'printTao'
diff --git a/vue/src/views/shop/dou/ewaybill/index.vue b/vue/src/views/shop/dou/ewaybill/index.vue
new file mode 100644
index 00000000..17991577
--- /dev/null
+++ b/vue/src/views/shop/dou/ewaybill/index.vue
@@ -0,0 +1,442 @@
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="订单号" prop="orderId">
+          <el-input
+            v-model="queryParams.orderSn"
+            placeholder="请输入订单号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="店铺" prop="shopId">
+          <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
+            <el-option
+              v-for="item in shopList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="printParams.printer" placeholder="请选择打印机" clearable>
+            <el-option
+              v-for="item in printerList"
+              :key="item.name"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+      </el-form>
+
+    </el-row>
+
+
+    <el-row :gutter="10" class="mb8">
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-time"
+          size="mini"
+          :disabled="multiple"
+          @click="handleGetEwaybillCode"
+        >取号</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+
+        <el-button
+          type="success"
+          plain
+          :disabled="multiple"
+          icon="el-icon-printer"
+          size="mini"
+          @click="handlePrintEwaybill"
+        >打印电子面单</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-d-arrow-right"
+          size="mini"
+          :disabled="multiple"
+          @click="handleShipSend"
+        >发货</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+       <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="订单号" align="center" prop="orderId" >
+        <template slot-scope="scope">
+          <p>{{scope.row.orderSn}}</p>
+          <el-tag  effect="plain">{{shopList.find(x=>x.id === scope.row.shopId).name}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品" width="450">
+        <template slot-scope="scope">
+          <el-table :data="scope.row.itemList" :show-header="false">
+            <el-table-column label="商品" align="center" prop="outerId" />
+            <el-table-column label="规格" align="center" prop="goodsSpec" />
+            <el-table-column label="数量" align="center" prop="goodsCount" width="60">
+              <template slot-scope="scope">
+                <el-tag size="small">x {{scope.row.goodsCount}}</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+<!--          <el-row v-for="item in scope.row.items" :key="item.id" :gutter="20">-->
+
+<!--            <div style="float: left;display: flex;align-items: center;" >-->
+
+<!--              <div style="margin-left:10px">-->
+<!--                <p>{{item.title}}</p>-->
+<!--                <p>{{item.skuPropertiesName}}&nbsp;-->
+<!--                  <el-tag size="small">x {{item.num}}</el-tag>-->
+<!--                </p>-->
+
+<!--              </div>-->
+<!--            </div>-->
+<!--          </el-row>-->
+        </template>
+      </el-table-column>
+      <el-table-column label="下单时间" align="center" prop="orderCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="买家留言" align="center" prop="buyerMemo" />
+      <el-table-column label="备注" align="center" prop="remark" />
+
+<!--      <el-table-column label="店铺" align="center" prop="categoryId" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId).name}}</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+      <el-table-column label="收件信息" align="left" prop="receiverState" >
+        <template slot-scope="scope">
+          <p>
+            {{scope.row.receiverNameMask}}&nbsp;{{scope.row.receiverPhoneMask}}
+          </p>
+          <p>
+            {{scope.row.province}} &nbsp;{{scope.row.city}}&nbsp;{{scope.row.town}}&nbsp;
+          </p>
+          <p>
+            {{scope.row.receiverAddressMask}}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="面单号" align="center" prop="erpSendCode" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 取号 -->
+    <el-dialog title="取号" :visible.sync="getCodeOpen" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="电子面单账户" prop="accountId">
+            <el-select v-model="form.accountId" placeholder="请选择电子面单账户" clearable>
+              <el-option
+                v-for="item in deliverList"
+                :key="item.id"
+                :label="item.cpCode"
+                :value="item.id">
+                <span style="float: left">{{ item.cpCode }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px" >{{item.branchName}}:{{item.quantity}}</span>
+              </el-option>
+            </el-select>
+          <el-button type="success" plain @click="updateWaybillAccount" >更新电子面单账户信息</el-button>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="getCodeOpenForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+import {listShop} from "@/api/shop/shop";
+import {listOrder} from "@/api/pdd/order";
+import {
+  getWaybillAccountList,
+  pullWaybillAccount,
+  getWaybillCode,
+  getWaybillPrintData,
+  pushWaybillPrintSuccess
+} from "@/api/pdd/ewaybill";
+
+export default {
+  name: "printDou",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      shopList: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: "",
+      // 取号弹出
+      getCodeOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderStatus: 1,
+        refundStatus: 1,
+        erpSendStatus:0,
+        shopId: null
+      },
+      // 打印参数
+      printParams: {
+        deliver: null,
+        printer: null
+      },
+      // 表单参数
+      form: {},
+      orderList: [],
+      printerList: [],
+      deliverList: [],
+      // 表单校验
+      rules: {
+        accountId: [{ required: true, message: '请选择电子面单账户' }],
+      }
+    };
+  },
+  created() {
+    this.openWs()
+    listShop({platform: 5}).then(response => {
+      this.shopList = response.rows;
+      if (this.shopList && this.shopList.length > 0) {
+        this.queryParams.shopId = this.shopList[0].id
+      }
+      this.getList();
+    });
+  },
+  methods: {
+    /** 查询商品管理列表 */
+    getList() {
+      this.loading = true;
+      listOrder(this.queryParams).then(response => {
+        this.orderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.getCodeOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        erpSkuId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.orderSn)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    openWs() {
+      const ws = new WebSocket('ws://127.0.0.1:13888');
+      ws.onopen = () => {
+        console.log('与打印组件建立连接成功: ');
+        // 或打印机
+        ws.send(JSON.stringify({
+          requestID: '1234554',
+          cmd: 'getPrinters',
+          "version": "1.0"
+        }))
+      };
+      let obj = this.$modal;
+      ws.onmessage = (e) => {
+        const resp = JSON.parse(e.data || '{}')
+        if (resp.cmd === 'getPrinters') {
+          this.printerList = resp.printers
+          obj.msgSuccess("打印组件连接成功！");
+          console.log('打印机列表: ', resp.printers);
+        }
+      };
+      // 当发生错误时触发
+      ws.onerror = function (error) {
+        obj.msgError("打印组件连接失败！请安装并启动字节打印组件！");
+        console.error('WebSocket error:', error);
+        // alert('WebSocket error occurred. Check the console for more details.');
+      };
+    },
+    // 取号弹窗
+    handleGetEwaybillCode() {
+      const ids = this.ids;
+      if (ids) {
+        getWaybillAccountList({shopId: this.queryParams.shopId}).then(response => {
+          this.deliverList = response.data;
+          this.getCodeOpen = true
+        });
+      } else {
+        this.$modal.msgError("请选择订单")
+      }
+    },
+    // 更新电子面单信息
+    updateWaybillAccount() {
+      pullWaybillAccount({shopId: this.queryParams.shopId}).then(response => {
+        this.deliverList = response.data;
+      });
+    },
+    /** 取号提交按钮 */
+    getCodeOpenForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          const ids = this.ids;
+          console.log('=========3333========', ids)
+          if (ids) {
+            console.log('===请求参数=====', {shopId: this.queryParams.shopId, ids: ids, accountId: this.form.accountId})
+            getWaybillCode({
+              shopId: this.queryParams.shopId,
+              ids: ids,
+              accountId: this.form.accountId
+            }).then(response => {
+              this.$modal.msgSuccess("取号成功")
+              this.getList()
+              this.getCodeOpen = false
+            });
+          } else {
+            this.$modal.msgError("请选择订单")
+          }
+        }
+      });
+    },
+    handlePrintEwaybill() {
+      // if (!this.ws) {
+      //   this.$modal.msgError('打印组件连接失败！请安装并启动微信视频号小单打印组件！');
+      //   this.openWs()
+      // }
+      // if(!this.printParams.deliver){
+      //   this.$modal.msgError('请选择快递公司！');
+      //   return
+      // }
+      if (!this.printParams.printer) {
+        this.$modal.msgError('请选择打印机！');
+        return
+      }
+      const ids = this.ids;
+      getWaybillPrintData({shopId: this.queryParams.shopId, ids: ids}).then(response => {
+        console.log("======打印======", response.data)
+        if (response.data) {
+          const ws = new WebSocket('ws://127.0.0.1:13888');
+          ws.onopen = () => {
+            let printData = []
+            response.data.forEach(x => printData.push(JSON.parse(x.printData)))
+            console.log('开始打印: 组合打印数据：', printData);
+            // 打印
+            ws.send(JSON.stringify({
+              "cmd": "print",
+              "requestID": this.getUUID(8, 16),
+              "version": "1.0",
+              "task": {
+                "taskID": this.getUUID(8,10),
+                "preview": false,
+                "printer": this.printParams.printer,
+                "previewType": "pdf",
+                "firstDocumentNumber": 10,
+                "totalDocumentCount": 100,
+                "documents": [{
+                  "documentID": this.getUUID(8,10),
+                  "contents": printData
+                }]
+              }
+            }))
+          };
+          let obj = this.$modal;
+          ws.onmessage = (e) => {
+            const resp = JSON.parse(e.data || '{}')
+            if (resp.cmd === 'print') {
+              console.log('打印结果: ', resp);
+              obj.msgSuccess("打印成功！" + JSON.stringify(resp));
+              // 请求回调
+              return pushWaybillPrintSuccess({shopId: this.queryParams.shopId, ids: ids})
+            }
+          };
+
+
+          // 当发生错误时触发
+          ws.onerror = function (error) {
+            obj.msgError("打印失败！");
+            console.error('WebSocket error:', error);
+            // alert('WebSocket error occurred. Check the console for more details.');
+          };
+        }
+      });
+
+
+    },
+    handleShipSend(){
+      this.$modal.msgError("开源版本未实现平台发货！请自行对接发货");
+    },
+    getUUID(len, radix) {
+      var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+      var uuid = [], i;
+      radix = radix || chars.length;
+      if (len) {
+        for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+      } else {
+        var r;
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+        uuid[14] = '4';
+        for (i = 0; i < 36; i++) {
+          if (!uuid[i]) {
+            r = 0 | Math.random() * 16;
+            uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+          }
+        }
+      }
+      return uuid.join('');
+    }
+  }
+};
+</script>
diff --git a/vue/src/views/shop/jd/ewaybill/index.vue b/vue/src/views/shop/jd/ewaybill/index.vue
new file mode 100644
index 00000000..fe13e1bf
--- /dev/null
+++ b/vue/src/views/shop/jd/ewaybill/index.vue
@@ -0,0 +1,442 @@
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="订单号" prop="orderId">
+          <el-input
+            v-model="queryParams.orderSn"
+            placeholder="请输入订单号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="店铺" prop="shopId">
+          <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
+            <el-option
+              v-for="item in shopList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="printParams.printer" placeholder="请选择打印机" clearable>
+            <el-option
+              v-for="item in printerList"
+              :key="item.name"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+      </el-form>
+
+    </el-row>
+
+
+    <el-row :gutter="10" class="mb8">
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-time"
+          size="mini"
+          :disabled="multiple"
+          @click="handleGetEwaybillCode"
+        >取号</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+
+        <el-button
+          type="success"
+          plain
+          :disabled="multiple"
+          icon="el-icon-printer"
+          size="mini"
+          @click="handlePrintEwaybill"
+        >打印电子面单</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-d-arrow-right"
+          size="mini"
+          :disabled="multiple"
+          @click="handleShipSend"
+        >发货</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+       <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="订单号" align="center" prop="orderId" >
+        <template slot-scope="scope">
+          <p>{{scope.row.orderSn}}</p>
+          <el-tag  effect="plain">{{shopList.find(x=>x.id === scope.row.shopId).name}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品" width="450">
+        <template slot-scope="scope">
+          <el-table :data="scope.row.itemList" :show-header="false">
+            <el-table-column label="商品" align="center" prop="outerId" />
+            <el-table-column label="规格" align="center" prop="goodsSpec" />
+            <el-table-column label="数量" align="center" prop="goodsCount" width="60">
+              <template slot-scope="scope">
+                <el-tag size="small">x {{scope.row.goodsCount}}</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+<!--          <el-row v-for="item in scope.row.items" :key="item.id" :gutter="20">-->
+
+<!--            <div style="float: left;display: flex;align-items: center;" >-->
+
+<!--              <div style="margin-left:10px">-->
+<!--                <p>{{item.title}}</p>-->
+<!--                <p>{{item.skuPropertiesName}}&nbsp;-->
+<!--                  <el-tag size="small">x {{item.num}}</el-tag>-->
+<!--                </p>-->
+
+<!--              </div>-->
+<!--            </div>-->
+<!--          </el-row>-->
+        </template>
+      </el-table-column>
+      <el-table-column label="下单时间" align="center" prop="orderCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="买家留言" align="center" prop="buyerMemo" />
+      <el-table-column label="备注" align="center" prop="remark" />
+
+<!--      <el-table-column label="店铺" align="center" prop="categoryId" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId).name}}</el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+      <el-table-column label="收件信息" align="left" prop="receiverState" >
+        <template slot-scope="scope">
+          <p>
+            {{scope.row.receiverNameMask}}&nbsp;{{scope.row.receiverPhoneMask}}
+          </p>
+          <p>
+            {{scope.row.province}} &nbsp;{{scope.row.city}}&nbsp;{{scope.row.town}}&nbsp;
+          </p>
+          <p>
+            {{scope.row.receiverAddressMask}}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="面单号" align="center" prop="erpSendCode" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 取号 -->
+    <el-dialog title="取号" :visible.sync="getCodeOpen" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="电子面单账户" prop="accountId">
+            <el-select v-model="form.accountId" placeholder="请选择电子面单账户" clearable>
+              <el-option
+                v-for="item in deliverList"
+                :key="item.id"
+                :label="item.cpCode"
+                :value="item.id">
+                <span style="float: left">{{ item.cpCode }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px" >{{item.branchName}}:{{item.quantity}}</span>
+              </el-option>
+            </el-select>
+          <el-button type="success" plain @click="updateWaybillAccount" >更新电子面单账户信息</el-button>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="getCodeOpenForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+import {listShop} from "@/api/shop/shop";
+import {listOrder} from "@/api/pdd/order";
+import {
+  getWaybillAccountList,
+  pullWaybillAccount,
+  getWaybillCode,
+  getWaybillPrintData,
+  pushWaybillPrintSuccess
+} from "@/api/pdd/ewaybill";
+
+export default {
+  name: "printDou",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      shopList: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: "",
+      // 取号弹出
+      getCodeOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderStatus: 1,
+        refundStatus: 1,
+        erpSendStatus:0,
+        shopId: null
+      },
+      // 打印参数
+      printParams: {
+        deliver: null,
+        printer: null
+      },
+      // 表单参数
+      form: {},
+      orderList: [],
+      printerList: [],
+      deliverList: [],
+      // 表单校验
+      rules: {
+        accountId: [{ required: true, message: '请选择电子面单账户' }],
+      }
+    };
+  },
+  created() {
+    this.openWs()
+    listShop({platform: 5}).then(response => {
+      this.shopList = response.rows;
+      if (this.shopList && this.shopList.length > 0) {
+        this.queryParams.shopId = this.shopList[0].id
+      }
+      this.getList();
+    });
+  },
+  methods: {
+    /** 查询商品管理列表 */
+    getList() {
+      this.loading = true;
+      listOrder(this.queryParams).then(response => {
+        this.orderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.getCodeOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        erpSkuId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.orderSn)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    openWs() {
+      const ws = new WebSocket('ws://127.0.0.1:9113');
+      ws.onopen = () => {
+        console.log('与打印组件建立连接成功: ');
+        // 或打印机
+        ws.send(JSON.stringify({
+          requestID: '1234554',
+          cmd: 'getPrinters',
+          "version": "1.0"
+        }))
+      };
+      let obj = this.$modal;
+      ws.onmessage = (e) => {
+        const resp = JSON.parse(e.data || '{}')
+        if (resp.cmd === 'getPrinters') {
+          this.printerList = resp.printers
+          obj.msgSuccess("打印组件连接成功！");
+          console.log('打印机列表: ', resp.printers);
+        }
+      };
+      // 当发生错误时触发
+      ws.onerror = function (error) {
+        obj.msgError("打印组件连接失败！请安装并启动字节打印组件！");
+        console.error('WebSocket error:', error);
+        // alert('WebSocket error occurred. Check the console for more details.');
+      };
+    },
+    // 取号弹窗
+    handleGetEwaybillCode() {
+      const ids = this.ids;
+      if (ids) {
+        getWaybillAccountList({shopId: this.queryParams.shopId}).then(response => {
+          this.deliverList = response.data;
+          this.getCodeOpen = true
+        });
+      } else {
+        this.$modal.msgError("请选择订单")
+      }
+    },
+    // 更新电子面单信息
+    updateWaybillAccount() {
+      pullWaybillAccount({shopId: this.queryParams.shopId}).then(response => {
+        this.deliverList = response.data;
+      });
+    },
+    /** 取号提交按钮 */
+    getCodeOpenForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          const ids = this.ids;
+          console.log('=========3333========', ids)
+          if (ids) {
+            console.log('===请求参数=====', {shopId: this.queryParams.shopId, ids: ids, accountId: this.form.accountId})
+            getWaybillCode({
+              shopId: this.queryParams.shopId,
+              ids: ids,
+              accountId: this.form.accountId
+            }).then(response => {
+              this.$modal.msgSuccess("取号成功")
+              this.getList()
+              this.getCodeOpen = false
+            });
+          } else {
+            this.$modal.msgError("请选择订单")
+          }
+        }
+      });
+    },
+    handlePrintEwaybill() {
+      // if (!this.ws) {
+      //   this.$modal.msgError('打印组件连接失败！请安装并启动微信视频号小单打印组件！');
+      //   this.openWs()
+      // }
+      // if(!this.printParams.deliver){
+      //   this.$modal.msgError('请选择快递公司！');
+      //   return
+      // }
+      if (!this.printParams.printer) {
+        this.$modal.msgError('请选择打印机！');
+        return
+      }
+      const ids = this.ids;
+      getWaybillPrintData({shopId: this.queryParams.shopId, ids: ids}).then(response => {
+        console.log("======打印======", response.data)
+        if (response.data) {
+          const ws = new WebSocket('ws://127.0.0.1:9113');
+          ws.onopen = () => {
+            let printData = []
+            response.data.forEach(x => printData.push(JSON.parse(x.printData)))
+            console.log('开始打印: 组合打印数据：', printData);
+            // 打印
+            ws.send(JSON.stringify({
+              "cmd": "print",
+              "requestID": this.getUUID(8, 16),
+              "version": "1.0",
+              "task": {
+                "taskID": this.getUUID(8,10),
+                "preview": false,
+                "printer": this.printParams.printer,
+                "previewType": "pdf",
+                "firstDocumentNumber": 10,
+                "totalDocumentCount": 100,
+                "documents": [{
+                  "documentID": this.getUUID(8,10),
+                  "contents": printData
+                }]
+              }
+            }))
+          };
+          let obj = this.$modal;
+          ws.onmessage = (e) => {
+            const resp = JSON.parse(e.data || '{}')
+            if (resp.cmd === 'print') {
+              console.log('打印结果: ', resp);
+              obj.msgSuccess("打印成功！" + JSON.stringify(resp));
+              // 请求回调
+              return pushWaybillPrintSuccess({shopId: this.queryParams.shopId, ids: ids})
+            }
+          };
+
+
+          // 当发生错误时触发
+          ws.onerror = function (error) {
+            obj.msgError("打印失败！");
+            console.error('WebSocket error:', error);
+            // alert('WebSocket error occurred. Check the console for more details.');
+          };
+        }
+      });
+
+
+    },
+    handleShipSend(){
+      this.$modal.msgError("开源版本未实现平台发货！请自行对接发货");
+    },
+    getUUID(len, radix) {
+      var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+      var uuid = [], i;
+      radix = radix || chars.length;
+      if (len) {
+        for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+      } else {
+        var r;
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+        uuid[14] = '4';
+        for (i = 0; i < 36; i++) {
+          if (!uuid[i]) {
+            r = 0 | Math.random() * 16;
+            uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+          }
+        }
+      }
+      return uuid.join('');
+    }
+  }
+};
+</script>