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 4f432890..176bbb6c 100644 Binary files a/open-api/pdd-api/libs/pdd-api-0.6.17.jar and b/open-api/pdd-api/libs/pdd-api-0.6.17.jar differ 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 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 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 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 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 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 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 { + ResultVo waybillUpdate(ErpShipWaybill shipWaybill); + List getListByOrderIds(Long shopId, String[] orderIds); + ResultVo 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 { PageResult queryPageList(OmsPddOrder bo, PageQuery pageQuery); ResultVo 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 implements ErpShipWaybillService{ + private final ErpShipWaybillMapper mapper; + private final OmsPddOrderMapper orderMapper; + /** + * 更新电子面单信息 + * @param shipWaybill + * @return + */ + @Transactional + @Override + public ResultVo 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 erpShipWaybills = mapper.selectList(new LambdaQueryWrapper().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().eq(OmsPddOrder::getOrderSn,orderSn)); + + return ResultVo.success(); + } + + @Override + public List getListByOrderIds(Long shopId, String[] orderIds) { + List erpShipWaybills = mapper.selectList( + new LambdaQueryWrapper() + .eq(ErpShipWaybill::getShopId,shopId) + .in(ErpShipWaybill::getOrderId, Arrays.stream(orderIds).toList())); + return erpShipWaybills; + } + + @Transactional + @Override + public ResultVo printSuccess(Long shopId, String[] orderIds) { + List erpShipWaybills = mapper.selectList( + new LambdaQueryWrapper() + .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().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 omsTaoOrders = orderMapper.selectList(new LambdaQueryWrapper().eq(OmsPddOrder::getOrderSn, orderSn)); + if(omsTaoOrders == null) return null; + + OmsPddOrder order = omsTaoOrders.get(0); + order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper().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 @@ - 抖店电子面单打印后续开放 + @@ -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 @@ + + + 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 @@ + + +