From d476524fc4621896bb197cab734541315c7c03fb Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Mon, 31 Mar 2025 20:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4kafka=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=87=A0=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +- api/oms-api/pom.xml | 8 +- .../oms/controller/HomeController.java | 1 - .../oms/controller/ShopController.java | 27 +- .../oms/domain/SysLogisticsCompany.java | 197 --------- .../oms/mapper/SysLogisticsCompanyMapper.java | 18 - .../cn/qihangerp/oms/mq/KafkaMQConsumer.java | 200 ++++----- .../service/SysLogisticsCompanyService.java | 15 - .../impl/SysLogisticsCompanyServiceImpl.java | 38 -- .../src/main/resources/application.yml | 68 ++-- .../mapper/SysLogisticsCompanyMapper.xml | 22 - api/open-api/pom.xml | 8 +- .../src/main/resources/application.yml | 70 ++-- docs/qihang-oms.sql | 380 +++++++++--------- vue/src/views/shipping/logistics/company.vue | 2 +- 15 files changed, 389 insertions(+), 676 deletions(-) delete mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/domain/SysLogisticsCompany.java delete mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysLogisticsCompanyMapper.java delete mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/service/SysLogisticsCompanyService.java delete mode 100644 api/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysLogisticsCompanyServiceImpl.java delete mode 100644 api/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml diff --git a/README.md b/README.md index 932e39d2..9da0e913 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,7 @@ + 后端技术及组件 + Nacos 注册中心 - + Redis - + Kafka 消息队列 + + Redis ## 二、关键流程 @@ -140,7 +139,6 @@ graph TD + MySQL8 + Redis：7.x -+ Kafka(消息队列) + Nacos：2.3.1（注册中心） + Sentinel（分布式流量治理组件） @@ -214,12 +212,7 @@ oms主功能微服务，主要功能包括： `java -Dserver.port=8888 -Dcsp.sentinel.dashboard.server=localhost:8888 -Dproject.name=sentinel-dashboard -jar sentinel-dashboard.jar` 4. 启动Nacos（注册中心） -5. 启动Kafka（消息队列） -`启动KRaft模式kafka` - + 0 进入kafka解压目录 - + 1 生成UUID`bin\windows\kafka-storage.bat random-uuid` - + 2 格式化`bin\windows\kafka-storage.bat format -t 7HZlayMPQdmMVcXnsFk8dg -c config\kraft\server.properties` - + 3 启动`bin\windows\kafka-server-start.bat config\kraft\server.properties` + #### 3.2、导入数据库 + 创建数据库`qihang-oms` diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 4d60623a..bc8e6d20 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -44,10 +44,10 @@ spring-boot-starter-undertow - - org.springframework.kafka - spring-kafka - + + + + diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java index ccb8fd93..34156f76 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java @@ -2,7 +2,6 @@ package cn.qihangerp.oms.controller; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.core.KafkaTemplate; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index 8665598a..fbe2f1ba 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -1,16 +1,14 @@ package cn.qihangerp.oms.controller; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.domain.OShopPlatform; +import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.domain.OShop; - - import cn.qihangerp.module.service.OShopService; import cn.qihangerp.oms.domain.ShopBo; - - - -import cn.qihangerp.oms.service.SysLogisticsCompanyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; @@ -18,7 +16,6 @@ import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; - import java.util.Arrays; import java.util.Date; import java.util.List; @@ -33,7 +30,7 @@ import java.util.List; @RestController @RequestMapping("/shop") public class ShopController extends BaseController { - private final SysLogisticsCompanyService logisticsCompanyService; + private final OLogisticsCompanyService logisticsCompanyService; private final OShopService shopService; private final OShopPlatformService platformService; @@ -118,4 +115,18 @@ public class ShopController extends BaseController { return toAjax(shopService.removeBatchByIds(Arrays.stream(ids).toList())); } + @GetMapping("/logistics_status") + public TableDataInfo logisticsStatusList(Integer status, Integer shopType, Integer shopId) + { + return getDataTable(logisticsCompanyService.queryListByStatus(status,shopType, shopId)); + } + /** + * 查询店铺列表logistics + */ + @GetMapping("/logistics") + public TableDataInfo logisticsList(Integer type, Integer shopId, PageQuery pageQuery) + { + PageResult result = logisticsCompanyService.queryPageList(type, shopId, pageQuery); + return getDataTable(result); + } } diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/domain/SysLogisticsCompany.java b/api/oms-api/src/main/java/cn/qihangerp/oms/domain/SysLogisticsCompany.java deleted file mode 100644 index a37d5165..00000000 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/domain/SysLogisticsCompany.java +++ /dev/null @@ -1,197 +0,0 @@ -package cn.qihangerp.oms.domain; - -import java.io.Serializable; - -/** - * 平台快递公司表 - * @TableName sys_logistics_company - */ -public class SysLogisticsCompany implements Serializable { - /** - * 主键ID - */ - private Long id; - - /** - * 平台id - */ - private Integer platformId; - - /** - * 店铺ID - */ - private Integer shopId; - - /** - * 物流公司id（值来自于平台返回） - */ - private Long logisticsId; - - /** - * 物流公司编码（值来自于平台返回） - */ - private String code; - - /** - * 物流公司名称（值来自于平台返回） - */ - private String name; - - /** - * 备注 - */ - private String remark; - - private static final long serialVersionUID = 1L; - - /** - * 主键ID - */ - public Long getId() { - return id; - } - - /** - * 主键ID - */ - public void setId(Long id) { - this.id = id; - } - - /** - * 平台id - */ - public Integer getPlatformId() { - return platformId; - } - - /** - * 平台id - */ - public void setPlatformId(Integer platformId) { - this.platformId = platformId; - } - - /** - * 店铺ID - */ - public Integer getShopId() { - return shopId; - } - - /** - * 店铺ID - */ - public void setShopId(Integer shopId) { - this.shopId = shopId; - } - - /** - * 物流公司id（值来自于平台返回） - */ - public Long getLogisticsId() { - return logisticsId; - } - - /** - * 物流公司id（值来自于平台返回） - */ - public void setLogisticsId(Long logisticsId) { - this.logisticsId = logisticsId; - } - - /** - * 物流公司编码（值来自于平台返回） - */ - public String getCode() { - return code; - } - - /** - * 物流公司编码（值来自于平台返回） - */ - public void setCode(String code) { - this.code = code; - } - - /** - * 物流公司名称（值来自于平台返回） - */ - public String getName() { - return name; - } - - /** - * 物流公司名称（值来自于平台返回） - */ - public void setName(String name) { - this.name = name; - } - - /** - * 备注 - */ - public String getRemark() { - return remark; - } - - /** - * 备注 - */ - public void setRemark(String remark) { - this.remark = remark; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SysLogisticsCompany other = (SysLogisticsCompany) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getPlatformId() == null ? other.getPlatformId() == null : this.getPlatformId().equals(other.getPlatformId())) - && (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId())) - && (this.getLogisticsId() == null ? other.getLogisticsId() == null : this.getLogisticsId().equals(other.getLogisticsId())) - && (this.getCode() == null ? other.getCode() == null : this.getCode().equals(other.getCode())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getPlatformId() == null) ? 0 : getPlatformId().hashCode()); - result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode()); - result = prime * result + ((getLogisticsId() == null) ? 0 : getLogisticsId().hashCode()); - result = prime * result + ((getCode() == null) ? 0 : getCode().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", platformId=").append(platformId); - sb.append(", shopId=").append(shopId); - sb.append(", logisticsId=").append(logisticsId); - sb.append(", code=").append(code); - sb.append(", name=").append(name); - sb.append(", remark=").append(remark); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysLogisticsCompanyMapper.java b/api/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysLogisticsCompanyMapper.java deleted file mode 100644 index 5863d9e8..00000000 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysLogisticsCompanyMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.qihangerp.oms.mapper; - -import cn.qihangerp.oms.domain.SysLogisticsCompany; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author TW -* @description 针对表【sys_logistics_company(平台快递公司表)】的数据库操作Mapper -* @createDate 2024-03-22 11:03:11 -* @Entity com.qihang.oms.domain.SysLogisticsCompany -*/ -public interface SysLogisticsCompanyMapper extends BaseMapper { - -} - - - - diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java b/api/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java index 82b5ed57..c65b2926 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java @@ -1,100 +1,100 @@ -package cn.qihangerp.oms.mq; - - -import com.alibaba.fastjson2.JSON; -import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.common.mq.MqMessage; -import cn.qihangerp.common.mq.MqType; - -import lombok.AllArgsConstructor; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.stereotype.Component; - -/** - * Kafka 消息消费者 - */ -@AllArgsConstructor -@Component -public class KafkaMQConsumer { - private static final Logger logger = LoggerFactory.getLogger(KafkaMQConsumer.class); -// private final ErpSaleOrderService orderService; -// private final ErpSaleAfterRefundService refundService; - - /** - * 订单消息处理 - * @param message - */ - @KafkaListener(topics = {MqType.ORDER_MQ}) - public void onOrderMessage(ConsumerRecord message) { - logger.info("收到kafka消息ORDER============"+message.topic()+"====="+message.partition()+"======"+message.value()); - - MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); - if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) { - logger.info("Kafka订单消息JD"+vo.getKeyId()); -// orderService.jdOrderMessage(vo.getKeyId()); - }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { - logger.info("Kafka订单消息TAO"+vo.getKeyId()); -// orderService.taoOrderMessage(vo.getKeyId()); - }else if(vo.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { - logger.info("Kafka订单消息PDD"+vo.getKeyId()); -// orderService.pddOrderMessage(vo.getKeyId()); - } else if(vo.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { - logger.info("Kafka订单消息DOU"+vo.getKeyId()); -// orderService.douOrderMessage(vo.getKeyId()); - } else if(vo.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { - logger.info("Kafka订单消息WEI"+vo.getKeyId()); -// orderService.weiOrderMessage(vo.getKeyId()); - } - } - - /** - * 退款消息处理 - * @param message - */ - @KafkaListener(topics = {MqType.REFUND_MQ}) - public void onRefundMessage(ConsumerRecord message) { - logger.info("收到kafka消息REFUND============"+message.topic()+"====="+message.partition()+"======"+message.value()); - MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); - if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) { - logger.info("Kafka售后消息JD"+vo.getKeyId()); -// refundService.jdRefundMessage(vo.getKeyId()); - }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { - logger.info("Kafka售后消息TAO"+vo.getKeyId()); -// refundService.taoRefundMessage(vo.getKeyId()); - }else if(vo.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { - logger.info("Kafka售后消息PDD"+vo.getKeyId()); -// refundService.pddRefundMessage(vo.getKeyId()); - } else if(vo.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { - logger.info("Kafka售后消息DOU"+vo.getKeyId()); -// refundService.douRefundMessage(vo.getKeyId()); - } else if(vo.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { - logger.info("Kafka售后消息WEI"+vo.getKeyId()); -// refundService.weiRefundMessage(vo.getKeyId()); - } - } - - /** - * 监听备货消息 - * @param message - */ - @KafkaListener(topics = {MqType.SHIP_STOCK_UP_MQ}) - public void onSHIP_STOCK_UP_MQ(ConsumerRecord message) { - logger.info("收到kafka消息 SHIP_STOCK_UP_MQ ============"+message.topic()+"====="+message.partition()+"======"+message.value()); - MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); -// orderService.orderShipStockUp(vo.getShopId(),vo.getKeyId()); - } - - /** - * 监听发货完成消息 - * @param message - */ - @KafkaListener(topics = {MqType.SHIP_SEND_MQ}) - public void onSHIP_SEND_MQ(ConsumerRecord message) { - logger.info("收到kafka消息 SHIP_SEND_MQ ============"+message.topic()+"====="+message.partition()+"======"+message.value()); - MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); -// orderService.orderSendConfirm(vo.getShopId(),vo.getKeyId(),vo.getLogisticsCompanyCode(),vo.getWaybillCode()); - } -} +//package cn.qihangerp.oms.mq; +// +// +//import com.alibaba.fastjson2.JSON; +//import cn.qihangerp.common.enums.EnumShopType; +//import cn.qihangerp.common.mq.MqMessage; +//import cn.qihangerp.common.mq.MqType; +// +//import lombok.AllArgsConstructor; +//import org.apache.kafka.clients.consumer.ConsumerRecord; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.kafka.annotation.KafkaListener; +//import org.springframework.stereotype.Component; +// +///** +// * Kafka 消息消费者 +// */ +//@AllArgsConstructor +//@Component +//public class KafkaMQConsumer { +// private static final Logger logger = LoggerFactory.getLogger(KafkaMQConsumer.class); +//// private final ErpSaleOrderService orderService; +//// private final ErpSaleAfterRefundService refundService; +// +// /** +// * 订单消息处理 +// * @param message +// */ +// @KafkaListener(topics = {MqType.ORDER_MQ}) +// public void onOrderMessage(ConsumerRecord message) { +// logger.info("收到kafka消息ORDER============"+message.topic()+"====="+message.partition()+"======"+message.value()); +// +// MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); +// if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) { +// logger.info("Kafka订单消息JD"+vo.getKeyId()); +//// orderService.jdOrderMessage(vo.getKeyId()); +// }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { +// logger.info("Kafka订单消息TAO"+vo.getKeyId()); +//// orderService.taoOrderMessage(vo.getKeyId()); +// }else if(vo.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { +// logger.info("Kafka订单消息PDD"+vo.getKeyId()); +//// orderService.pddOrderMessage(vo.getKeyId()); +// } else if(vo.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { +// logger.info("Kafka订单消息DOU"+vo.getKeyId()); +//// orderService.douOrderMessage(vo.getKeyId()); +// } else if(vo.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { +// logger.info("Kafka订单消息WEI"+vo.getKeyId()); +//// orderService.weiOrderMessage(vo.getKeyId()); +// } +// } +// +// /** +// * 退款消息处理 +// * @param message +// */ +// @KafkaListener(topics = {MqType.REFUND_MQ}) +// public void onRefundMessage(ConsumerRecord message) { +// logger.info("收到kafka消息REFUND============"+message.topic()+"====="+message.partition()+"======"+message.value()); +// MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); +// if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) { +// logger.info("Kafka售后消息JD"+vo.getKeyId()); +//// refundService.jdRefundMessage(vo.getKeyId()); +// }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { +// logger.info("Kafka售后消息TAO"+vo.getKeyId()); +//// refundService.taoRefundMessage(vo.getKeyId()); +// }else if(vo.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { +// logger.info("Kafka售后消息PDD"+vo.getKeyId()); +//// refundService.pddRefundMessage(vo.getKeyId()); +// } else if(vo.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { +// logger.info("Kafka售后消息DOU"+vo.getKeyId()); +//// refundService.douRefundMessage(vo.getKeyId()); +// } else if(vo.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { +// logger.info("Kafka售后消息WEI"+vo.getKeyId()); +//// refundService.weiRefundMessage(vo.getKeyId()); +// } +// } +// +// /** +// * 监听备货消息 +// * @param message +// */ +// @KafkaListener(topics = {MqType.SHIP_STOCK_UP_MQ}) +// public void onSHIP_STOCK_UP_MQ(ConsumerRecord message) { +// logger.info("收到kafka消息 SHIP_STOCK_UP_MQ ============"+message.topic()+"====="+message.partition()+"======"+message.value()); +// MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); +//// orderService.orderShipStockUp(vo.getShopId(),vo.getKeyId()); +// } +// +// /** +// * 监听发货完成消息 +// * @param message +// */ +// @KafkaListener(topics = {MqType.SHIP_SEND_MQ}) +// public void onSHIP_SEND_MQ(ConsumerRecord message) { +// logger.info("收到kafka消息 SHIP_SEND_MQ ============"+message.topic()+"====="+message.partition()+"======"+message.value()); +// MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class); +//// orderService.orderSendConfirm(vo.getShopId(),vo.getKeyId(),vo.getLogisticsCompanyCode(),vo.getWaybillCode()); +// } +//} diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysLogisticsCompanyService.java b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysLogisticsCompanyService.java deleted file mode 100644 index b4a725d6..00000000 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysLogisticsCompanyService.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.qihangerp.oms.service; - -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.oms.domain.SysLogisticsCompany; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【sys_logistics_company(平台快递公司表)】的数据库操作Service -* @createDate 2024-03-22 11:03:11 -*/ -public interface SysLogisticsCompanyService extends IService { - PageResult queryPageList(Integer platform,Integer shopId, PageQuery pageQuery); -} diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysLogisticsCompanyServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysLogisticsCompanyServiceImpl.java deleted file mode 100644 index 34752eeb..00000000 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/service/impl/SysLogisticsCompanyServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.qihangerp.oms.service.impl; - -import cn.qihangerp.oms.service.SysLogisticsCompanyService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.oms.domain.SysLogisticsCompany; -import cn.qihangerp.oms.mapper.SysLogisticsCompanyMapper; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** -* @author TW -* @description 针对表【sys_logistics_company(平台快递公司表)】的数据库操作Service实现 -* @createDate 2024-03-22 11:03:11 -*/ -@AllArgsConstructor -@Service -public class SysLogisticsCompanyServiceImpl extends ServiceImpl - implements SysLogisticsCompanyService { - private final SysLogisticsCompanyMapper mapper; - - @Override - public PageResult queryPageList(Integer platform, Integer shopId, PageQuery pageQuery) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(). - eq(SysLogisticsCompany::getPlatformId, platform) - .eq(shopId != null, SysLogisticsCompany::getShopId, shopId); - - Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); - return PageResult.build(pages); - } -} - - - - diff --git a/api/oms-api/src/main/resources/application.yml b/api/oms-api/src/main/resources/application.yml index 08531bbf..5f368c1d 100644 --- a/api/oms-api/src/main/resources/application.yml +++ b/api/oms-api/src/main/resources/application.yml @@ -43,40 +43,40 @@ spring: url: jdbc:mysql://127.0.0.1:3306/qihang-oms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: Andy_123 - kafka: - bootstrap-servers: localhost:9092 - producer: - batch-size: 16384 #批量大小 - acks: -1 #应答级别:多少个分区副本备份完成时向生产者发送ack确认(可选0、1、all/-1) - retries: 10 # 消息发送重试次数 - # transaction-id-prefix: tx_1 #事务id前缀 - buffer-memory: 33554432 - key-serializer: org.apache.kafka.common.serialization.StringSerializer - value-serializer: org.apache.kafka.common.serialization.StringSerializer - properties: - linger: - ms: 2000 #提交延迟 - # partitioner: #指定分区器 - # class: com.example.kafkademo.config.CustomizePartitioner - consumer: - group-id: testGroup #默认的消费组ID - enable-auto-commit: true #是否自动提交offset - auto-commit-interval: 2000 #提交offset延时 - # 当kafka中没有初始offset或offset超出范围时将自动重置offset - # earliest:重置为分区中最小的offset; - # latest:重置为分区中最新的offset(消费分区中新产生的数据); - # none:只要有一个分区不存在已提交的offset,就抛出异常; - auto-offset-reset: latest - max-poll-records: 500 #单次拉取消息的最大条数 - key-deserializer: org.apache.kafka.common.serialization.StringDeserializer - value-deserializer: org.apache.kafka.common.serialization.StringDeserializer - properties: - session: - timeout: - ms: 120000 # 消费会话超时时间（超过这个时间 consumer 没有发送心跳，就会触发 rebalance 操作） - request: - timeout: - ms: 18000 # 消费请求的超时时间 +# kafka: +# bootstrap-servers: localhost:9092 +# producer: +# batch-size: 16384 #批量大小 +# acks: -1 #应答级别:多少个分区副本备份完成时向生产者发送ack确认(可选0、1、all/-1) +# retries: 10 # 消息发送重试次数 +# # transaction-id-prefix: tx_1 #事务id前缀 +# buffer-memory: 33554432 +# key-serializer: org.apache.kafka.common.serialization.StringSerializer +# value-serializer: org.apache.kafka.common.serialization.StringSerializer +# properties: +# linger: +# ms: 2000 #提交延迟 +# # partitioner: #指定分区器 +# # class: com.example.kafkademo.config.CustomizePartitioner +# consumer: +# group-id: testGroup #默认的消费组ID +# enable-auto-commit: true #是否自动提交offset +# auto-commit-interval: 2000 #提交offset延时 +# # 当kafka中没有初始offset或offset超出范围时将自动重置offset +# # earliest:重置为分区中最小的offset; +# # latest:重置为分区中最新的offset(消费分区中新产生的数据); +# # none:只要有一个分区不存在已提交的offset,就抛出异常; +# auto-offset-reset: latest +# max-poll-records: 500 #单次拉取消息的最大条数 +# key-deserializer: org.apache.kafka.common.serialization.StringDeserializer +# value-deserializer: org.apache.kafka.common.serialization.StringDeserializer +# properties: +# session: +# timeout: +# ms: 120000 # 消费会话超时时间（超过这个时间 consumer 没有发送心跳，就会触发 rebalance 操作） +# request: +# timeout: +# ms: 18000 # 消费请求的超时时间 diff --git a/api/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml b/api/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml deleted file mode 100644 index ae41076c..00000000 --- a/api/oms-api/src/main/resources/mapper/SysLogisticsCompanyMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - id,platform_id,shop_id, - logistics_id,code,name, - remark - - diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 7b50323c..3e5e7295 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -47,10 +47,10 @@ org.springframework.boot spring-boot-starter-webflux - - org.springframework.kafka - spring-kafka - + + + + diff --git a/api/open-api/src/main/resources/application.yml b/api/open-api/src/main/resources/application.yml index 069bd0c9..497500c7 100644 --- a/api/open-api/src/main/resources/application.yml +++ b/api/open-api/src/main/resources/application.yml @@ -41,41 +41,41 @@ spring: username: root password: Andy_123 - kafka: - bootstrap-servers: localhost:9092 - producer: - batch-size: 16384 #批量大小 - acks: -1 #应答级别:多少个分区副本备份完成时向生产者发送ack确认(可选0、1、all/-1) - retries: 10 # 消息发送重试次数 - # transaction-id-prefix: tx_1 #事务id前缀 - buffer-memory: 33554432 - key-serializer: org.apache.kafka.common.serialization.StringSerializer - value-serializer: org.apache.kafka.common.serialization.StringSerializer - properties: - linger: - ms: 2000 #提交延迟 - # partitioner: #指定分区器 - # class: com.example.kafkademo.config.CustomizePartitioner - consumer: - group-id: testGroup #默认的消费组ID - enable-auto-commit: true #是否自动提交offset - auto-commit-interval: 2000 #提交offset延时 - # 当kafka中没有初始offset或offset超出范围时将自动重置offset - # earliest:重置为分区中最小的offset; - # latest:重置为分区中最新的offset(消费分区中新产生的数据); - # none:只要有一个分区不存在已提交的offset,就抛出异常; - auto-offset-reset: latest - max-poll-records: 500 #单次拉取消息的最大条数 - key-deserializer: org.apache.kafka.common.serialization.StringDeserializer - value-deserializer: org.apache.kafka.common.serialization.StringDeserializer - properties: - session: - timeout: - ms: 120000 # 消费会话超时时间（超过这个时间 consumer 没有发送心跳，就会触发 rebalance 操作） - request: - timeout: - ms: 18000 # 消费请求的超时时间 - +# kafka: +# bootstrap-servers: localhost:9092 +# producer: +# batch-size: 16384 #批量大小 +# acks: -1 #应答级别:多少个分区副本备份完成时向生产者发送ack确认(可选0、1、all/-1) +# retries: 10 # 消息发送重试次数 +# # transaction-id-prefix: tx_1 #事务id前缀 +# buffer-memory: 33554432 +# key-serializer: org.apache.kafka.common.serialization.StringSerializer +# value-serializer: org.apache.kafka.common.serialization.StringSerializer +# properties: +# linger: +# ms: 2000 #提交延迟 +# # partitioner: #指定分区器 +# # class: com.example.kafkademo.config.CustomizePartitioner +# consumer: +# group-id: testGroup #默认的消费组ID +# enable-auto-commit: true #是否自动提交offset +# auto-commit-interval: 2000 #提交offset延时 +# # 当kafka中没有初始offset或offset超出范围时将自动重置offset +# # earliest:重置为分区中最小的offset; +# # latest:重置为分区中最新的offset(消费分区中新产生的数据); +# # none:只要有一个分区不存在已提交的offset,就抛出异常; +# auto-offset-reset: latest +# max-poll-records: 500 #单次拉取消息的最大条数 +# key-deserializer: org.apache.kafka.common.serialization.StringDeserializer +# value-deserializer: org.apache.kafka.common.serialization.StringDeserializer +# properties: +# session: +# timeout: +# ms: 120000 # 消费会话超时时间（超过这个时间 consumer 没有发送心跳，就会触发 rebalance 操作） +# request: +# timeout: +# ms: 18000 # 消费请求的超时时间 +# mybatis-plus: diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql index 53b254d5..e2f059d3 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -11,7 +11,7 @@ Target Server Version : 80200 File Encoding : 65001 - Date: 24/03/2025 13:49:16 + Date: 31/03/2025 20:30:40 */ SET NAMES utf8mb4; @@ -245,7 +245,7 @@ CREATE TABLE `o_goods` ( UNIQUE INDEX `goods_id_unique`(`outer_erp_goods_id`) USING BTREE, INDEX `number`(`goods_num`) USING BTREE, INDEX `id`(`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 82 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'OMS商品表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 81 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'OMS商品表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of o_goods @@ -297,7 +297,7 @@ CREATE TABLE `o_goods_category` ( `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of o_goods_category @@ -313,8 +313,8 @@ CREATE TABLE `o_goods_category_attribute` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键id', `category_id` bigint NOT NULL, `type` int NOT NULL DEFAULT 0 COMMENT '类型：0属性1规格', - `title` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '\'属性名\'', - `code` char(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '固定值color颜色size尺码style款式', + `title` varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '\'属性名\'', + `code` char(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '固定值color颜色size尺码style款式', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; @@ -330,12 +330,12 @@ DROP TABLE IF EXISTS `o_goods_category_attribute_value`; CREATE TABLE `o_goods_category_attribute_value` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键，属性值id', `category_attribute_id` bigint NULL DEFAULT NULL COMMENT '属性id', - `value` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性值文本', - `sku_code` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '生成SKU的编码', + `value` varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '属性值文本', + `sku_code` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '生成SKU的编码', `orderNum` int NULL DEFAULT 0, `isDelete` int NOT NULL DEFAULT 0, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 426 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 426 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of o_goods_category_attribute_value @@ -466,15 +466,15 @@ DROP TABLE IF EXISTS `o_goods_inventory`; CREATE TABLE `o_goods_inventory` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', `goods_id` bigint NOT NULL COMMENT '商品id', - `goods_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_num` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', `sku_id` bigint NOT NULL COMMENT '商品规格id', - `sku_code` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '规格编码（唯一）', + `sku_code` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '规格编码（唯一）', `quantity` bigint NOT NULL DEFAULT 0 COMMENT '当前库存', `is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0正常 1删除', `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_by` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_by` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '更新人', PRIMARY KEY (`id`) USING BTREE, INDEX `specIdIndex`(`sku_id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1865671177405308930 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品库存表' ROW_FORMAT = DYNAMIC; @@ -504,16 +504,16 @@ CREATE TABLE `o_goods_inventory_batch` ( `pur_price` double NULL DEFAULT 0 COMMENT '采购价', `pur_id` bigint NOT NULL COMMENT '采购单id', `pur_item_id` bigint NOT NULL COMMENT '采购单itemId', - `remark` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(250) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', `sku_id` bigint NOT NULL COMMENT '规格id', `goods_id` bigint NOT NULL COMMENT '商品id', `sku_code` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'sku编码', `warehouse_id` bigint NOT NULL COMMENT '仓库id', `position_id` bigint NOT NULL COMMENT '仓位id', `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_by` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_by` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '更新人', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品库存批次' ROW_FORMAT = DYNAMIC; @@ -575,14 +575,14 @@ DROP TABLE IF EXISTS `o_goods_sku_attr`; CREATE TABLE `o_goods_sku_attr` ( `id` bigint NOT NULL AUTO_INCREMENT, `goods_id` bigint NOT NULL, - `type` char(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `k` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `type` char(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL, + `k` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL, `kid` int NULL DEFAULT NULL, `vid` int NULL DEFAULT NULL, - `v` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `img` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `v` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL, + `img` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1832398130583224338 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1832398130583224338 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of o_goods_sku_attr @@ -1423,34 +1423,34 @@ INSERT INTO `o_logistics_company` VALUES (1865674643624271878, 100, NULL, 105031 DROP TABLE IF EXISTS `o_order`; CREATE TABLE `o_order` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单id，自增', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单编号（第三方平台订单号）', + `order_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '订单编号（第三方平台订单号）', `shop_type` int NOT NULL COMMENT '店铺类型', `shop_id` int NOT NULL COMMENT '店铺ID', - `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单备注', - `buyer_memo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家留言信息', - `seller_memo` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '卖家留言信息', - `tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签', + `remark` varchar(1000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '订单备注', + `buyer_memo` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '买家留言信息', + `seller_memo` varchar(2550) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '卖家留言信息', + `tag` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '标签', `refund_status` int NOT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', `order_status` int NOT NULL COMMENT '订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除，101部分发货', `goods_amount` double NULL DEFAULT NULL COMMENT '订单商品金额', `post_fee` double NULL DEFAULT NULL COMMENT '订单运费', `amount` double NOT NULL COMMENT '订单实际金额', `payment` double NULL DEFAULT NULL COMMENT '实付金额', - `receiver_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', - `receiver_mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', - `address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人地址', - `province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', - `city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', - `town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', + `receiver_name` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', + `receiver_mobile` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', + `address` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '收件人地址', + `province` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '省', + `city` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '市', + `town` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '区', `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间', `ship_type` int NOT NULL COMMENT '发货类型（0仓库发货；1供应商代发）', `shipping_time` datetime NULL DEFAULT NULL COMMENT '发货时间', - `shipping_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '快递单号', - `shipping_company` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', - `shipping_man` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货人', + `shipping_number` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '快递单号', + `shipping_company` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '物流公司', + `shipping_man` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '发货人', `shipping_cost` decimal(10, 2) NULL DEFAULT NULL COMMENT '发货费用', `erp_push_status` int NULL DEFAULT 0 COMMENT 'ERP推送状态(200订单推送成功，100订单取消推送成功，其他失败）', - `erp_push_result` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ERP推送状态结果', + `erp_push_result` varchar(2550) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'ERP推送状态结果', `erp_push_time` datetime NULL DEFAULT NULL COMMENT 'ERP最近推送时间', `length` float NULL DEFAULT 0 COMMENT '长', `width` float NULL DEFAULT 0 COMMENT '宽', @@ -1465,7 +1465,7 @@ CREATE TABLE `o_order` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `order_sn_index`(`order_num`) USING BTREE, INDEX `shopid_index`(`shop_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1851638161990914054 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS订单表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1851638161990914054 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = 'OMS订单表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of o_order @@ -1515,22 +1515,22 @@ DROP TABLE IF EXISTS `o_order_item`; CREATE TABLE `o_order_item` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id，自增', `order_id` bigint NOT NULL COMMENT '订单ID（o_order外键）', - `order_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单号（第三方平台）', - `sub_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子订单号（第三方平台）', - `sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '第三方平台skuId', + `order_num` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '订单号（第三方平台）', + `sub_order_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '子订单号（第三方平台）', + `sku_id` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '第三方平台skuId', `goods_id` bigint NOT NULL DEFAULT 0 COMMENT '商品id(o_goods外键)', `goods_sku_id` bigint NOT NULL DEFAULT 0 COMMENT '商品skuid(o_goods_sku外键)', - `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `goods_spec` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', - `sku_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `goods_title` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(35) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_spec` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `sku_num` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', `goods_price` double NOT NULL COMMENT '商品单价', `item_amount` double NULL DEFAULT NULL COMMENT '子订单金额', `discount_amount` double NULL DEFAULT 0 COMMENT '子订单优惠金额', `payment` double NULL DEFAULT NULL COMMENT '实际支付金额', `quantity` int NOT NULL COMMENT '商品数量', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', `refund_count` int NULL DEFAULT 0 COMMENT '已退货数量', `refund_status` int NULL DEFAULT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', `order_status` int NULL DEFAULT NULL COMMENT '订单状态1：待发货，2：已发货，3：已完成，11已取消；21待付款', @@ -1543,7 +1543,7 @@ CREATE TABLE `o_order_item` ( INDEX `goodId_index`(`goods_id`) USING BTREE, INDEX `order_id`(`order_id`) USING BTREE, INDEX `order_num_index`(`order_num`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1851639405727879171 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'OMS订单明细表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1851639405727879171 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = 'OMS订单明细表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of o_order_item @@ -1597,35 +1597,35 @@ INSERT INTO `o_order_item` VALUES (1851639405727879170, 1851638161990914052, '69 DROP TABLE IF EXISTS `o_refund`; CREATE TABLE `o_refund` ( `id` bigint NOT NULL AUTO_INCREMENT, - `refund_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '退货单号', + `refund_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '退货单号', `refund_type` int NULL DEFAULT NULL COMMENT '类型(1-售前退款 10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款)', `shop_id` bigint NULL DEFAULT NULL COMMENT '店铺id', `shop_type` int NULL DEFAULT NULL COMMENT '店铺类型', `order_amount` float NULL DEFAULT NULL COMMENT '订单金额', `refund_fee` float NOT NULL COMMENT '退款金额', `refund_reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款原因', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '源订单号', + `order_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '源订单号', `order_item_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子订单号或id', `sku_id` bigint NULL DEFAULT NULL COMMENT '源skuId', `goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)', `goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)', - `sku_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'sku编码', + `sku_num` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'sku编码', `has_good_return` int NULL DEFAULT NULL COMMENT '买家是否需要退货。可选值:1(是),0(否)', - `goods_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `goods_sku` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品sku', - `goods_image` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_name` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品名称', + `goods_sku` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品sku', + `goods_image` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品图片', `quantity` bigint NULL DEFAULT NULL COMMENT '退货数量', - `return_logistics_company` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货物流公司', - `return_logistics_code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货物流单号', + `return_logistics_company` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退货物流公司', + `return_logistics_code` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退货物流单号', `receive_time` datetime NULL DEFAULT NULL COMMENT '收货时间', - `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注', + `remark` varchar(1000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '备注', `status` int NOT NULL COMMENT '状态（10001待审核 10002等待买家退货 10003等待平台审核 10004待买家处理 10005等待卖家处理 10006等待卖家发货 14000拒绝退款 10011退款关闭 10010退款完成 10020售后成功 10021售后失败 10090退款中 10091换货成功 10092换货失败 10093维修关闭 10094维修成功 ）', `create_time` datetime NOT NULL COMMENT '订单创建时间', `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', `erp_push_status` int NULL DEFAULT 0 COMMENT 'ERP推送状态(200成功，其他失败）', - `erp_push_result` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ERP推送状态结果', + `erp_push_result` varchar(2550) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'ERP推送状态结果', `erp_push_time` datetime NULL DEFAULT NULL COMMENT 'ERP最近推送时间', `has_processing` int NOT NULL DEFAULT 0 COMMENT '是否处理0未处理1已处理', `after_sale_id` bigint NULL DEFAULT NULL COMMENT '处理id', @@ -1652,14 +1652,14 @@ CREATE TABLE `o_ship_stock_up` ( `sale_order_id` bigint NULL DEFAULT NULL COMMENT 'erp订单id', `sale_order_item_id` bigint NULL DEFAULT NULL COMMENT 'erp订单itemid', `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单编号', - `original_sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原始订单skuid', + `original_sku_id` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '原始订单skuid', `goods_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品id', `spec_id` bigint NULL DEFAULT 0 COMMENT 'erp系统商品规格id', - `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `goods_spec` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', - `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `spec_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `goods_title` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_spec` varchar(2550) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `goods_num` varchar(35) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `spec_num` varchar(35) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', `quantity` int NOT NULL COMMENT '商品数量', `status` int NOT NULL COMMENT '状态0待备货1备货中2备货完成3已发货', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', @@ -1919,11 +1919,11 @@ CREATE TABLE `o_shop_platform` ( -- ---------------------------- -- Records of o_shop_platform -- ---------------------------- -INSERT INTO `o_shop_platform` VALUES (100, '淘宝天猫', 'TMALL', '', NULL, 'http://www.qihangerp.cn/', 'http://gw.api.taobao.com/router/rest', 0, 0, 1); -INSERT INTO `o_shop_platform` VALUES (200, '京东POP', 'JD-POP', '', NULL, 'http://www.qihangerp.cn/', 'https://api.jd.com/routerjson', 0, 0, 1); -INSERT INTO `o_shop_platform` VALUES (300, '拼多多', 'PDD', '', NULL, 'http://www.qihangerp.cn/', 'https://gw-api.pinduoduo.com/api/router', 0, 0, 1); -INSERT INTO `o_shop_platform` VALUES (400, '抖店', 'DOUDIAN', '', NULL, 'http://www.qihangerp.cn/', 'https://openapi-fxg.jinritemai.com/', 0, 0, 1); -INSERT INTO `o_shop_platform` VALUES (500, '微信视频号', 'WEISHOP', '', NULL, 'http://www.qihangerp.cn/', 'https://api.weixin.qq.com', 0, 0, 1); +INSERT INTO `o_shop_platform` VALUES (100, '淘宝天猫', 'TMALL', '', NULL, 'http://www.qihangerp.cn', 'http://gw.api.taobao.com/router/rest', 0, 0, 1); +INSERT INTO `o_shop_platform` VALUES (200, '京东POP', 'JD-POP', '', NULL, 'http://www.qihangerp.cn', 'https://api.jd.com/routerjson', 0, 0, 1); +INSERT INTO `o_shop_platform` VALUES (300, '拼多多', 'PDD', '', NULL, 'http://www.qihangerp.cn', 'https://gw-api.pinduoduo.com/api/router', 0, 0, 1); +INSERT INTO `o_shop_platform` VALUES (400, '抖店', 'DOUDIAN', '', NULL, 'http://www.qihangerp.cn', 'https://openapi-fxg.jinritemai.com/', 0, 0, 1); +INSERT INTO `o_shop_platform` VALUES (500, '微信视频号', 'WEISHOP', '', NULL, 'http://www.qihangerp.cn', 'https://api.weixin.qq.com', 0, 0, 1); -- ---------------------------- -- Table structure for o_shop_pull_lasttime @@ -2688,12 +2688,12 @@ INSERT INTO `offline_goods_sku` VALUES (6, '77', '1832398056436318215', 999, ' DROP TABLE IF EXISTS `offline_order`; CREATE TABLE `offline_order` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单id，自增', - `order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单编号（第三方平台订单号）', + `order_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '订单编号（第三方平台订单号）', `shop_id` bigint NOT NULL COMMENT '店铺ID', - `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单备注', - `buyer_memo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家留言信息', - `seller_memo` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '卖家留言信息', - `tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签', + `remark` varchar(1000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '订单备注', + `buyer_memo` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '买家留言信息', + `seller_memo` varchar(2550) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '卖家留言信息', + `tag` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '标签', `refund_status` int NOT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', `order_status` int NOT NULL COMMENT '订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除，101部分发货', `goods_amount` double NULL DEFAULT NULL COMMENT '订单商品金额', @@ -2702,18 +2702,18 @@ CREATE TABLE `offline_order` ( `seller_discount` double NULL DEFAULT 0 COMMENT '商家优惠金额，单位：元', `platform_discount` double NULL DEFAULT 0 COMMENT '平台优惠金额，单位：元', `payment` double NULL DEFAULT NULL COMMENT '实付金额', - `receiver_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', - `receiver_mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', - `address` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收件人地址', - `province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省', - `city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市', - `town` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区', + `receiver_name` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '收件人姓名', + `receiver_mobile` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '收件人手机号', + `address` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '收件人地址', + `province` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '省', + `city` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '市', + `town` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '区', `order_time` datetime NULL DEFAULT NULL COMMENT '订单时间', `ship_type` int NOT NULL COMMENT '发货类型（0仓库发货；1供应商代发）', `shipping_time` datetime NULL DEFAULT NULL COMMENT '发货时间', - `shipping_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '快递单号', - `shipping_company` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', - `shipping_man` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货人', + `shipping_number` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '快递单号', + `shipping_company` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '物流公司', + `shipping_man` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '发货人', `shipping_cost` decimal(10, 2) NULL DEFAULT NULL COMMENT '发货费用', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', @@ -2723,7 +2723,7 @@ CREATE TABLE `offline_order` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `order_sn_index`(`order_num`) USING BTREE, INDEX `shopid_index`(`shop_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1827306419678949378 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '线下渠道订单表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1827306419678949378 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '线下渠道订单表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of offline_order @@ -2750,21 +2750,21 @@ DROP TABLE IF EXISTS `offline_order_item`; CREATE TABLE `offline_order_item` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id，自增', `order_id` bigint NOT NULL COMMENT '订单ID（o_order外键）', - `order_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单号（第三方平台）', - `sub_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子订单号（第三方平台）', - `sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '第三方平台skuId', + `order_num` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '订单号（第三方平台）', + `sub_order_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '子订单号（第三方平台）', + `sku_id` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '第三方平台skuId', `goods_id` bigint NOT NULL DEFAULT 0 COMMENT '商品id(o_goods外键)', `goods_sku_id` bigint NOT NULL DEFAULT 0 COMMENT '商品skuid(o_goods_sku外键)', - `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `goods_spec` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', - `sku_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `goods_title` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(35) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_spec` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `sku_num` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', `goods_price` double NOT NULL COMMENT '商品单价', `item_amount` double NULL DEFAULT NULL COMMENT '子订单金额', `payment` double NULL DEFAULT NULL COMMENT '实际支付金额', `quantity` int NOT NULL COMMENT '商品数量', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', `refund_count` int NULL DEFAULT 0 COMMENT '已退货数量', `refund_status` int NULL DEFAULT NULL COMMENT '售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 ', `order_status` int NULL DEFAULT NULL COMMENT '订单状态1：待发货，2：已发货，3：已完成，11已取消；21待付款', @@ -2776,7 +2776,7 @@ CREATE TABLE `offline_order_item` ( PRIMARY KEY (`id`) USING BTREE, INDEX `goodId_index`(`goods_id`) USING BTREE, INDEX `order_id`(`order_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1827306419687337987 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '渠道订单明细表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1827306419687337987 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '渠道订单明细表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of offline_order_item @@ -2815,20 +2815,20 @@ CREATE TABLE `offline_refund` ( `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `update_time` datetime NULL DEFAULT NULL, `update_by` datetime NULL DEFAULT NULL, - `sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '第三方平台skuId', + `sku_id` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '第三方平台skuId', `goods_id` bigint NOT NULL DEFAULT 0 COMMENT '商品id(o_goods外键)', `goods_sku_id` bigint NOT NULL DEFAULT 0 COMMENT '商品skuid(o_goods_sku外键)', - `goods_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `goods_img` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', - `goods_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `goods_spec` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格', - `sku_num` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `goods_title` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `goods_img` varchar(300) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(35) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_spec` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格', + `sku_num` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', `item_amount` double NULL DEFAULT NULL COMMENT '子订单金额', `refund_fee` float NOT NULL COMMENT '退款金额', `has_good_return` int NOT NULL COMMENT '买家是否需要退货。可选值:1(是),0(否)', `refund_quantity` bigint NOT NULL COMMENT '退货数量', - `return_logistics_company` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货物流公司', - `return_logistics_code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货物流单号', + `return_logistics_company` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退货物流公司', + `return_logistics_code` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退货物流单号', `receive_time` datetime NULL DEFAULT NULL COMMENT '收货时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1827362395312390147 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '线下渠道退款表' ROW_FORMAT = DYNAMIC; @@ -12230,39 +12230,39 @@ INSERT INTO `oms_pdd_refund` VALUES (40559843812, 4, '240911-327292096900104', 2 DROP TABLE IF EXISTS `oms_tao_goods`; CREATE TABLE `oms_tao_goods` ( `id` bigint NOT NULL AUTO_INCREMENT, - `iid` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品id', + `iid` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品id', `num_iid` bigint NULL DEFAULT NULL COMMENT '商品数字id', - `title` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `nick` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '卖家昵称', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品类型(fixed:一口价;auction:拍卖)注：取消团购', + `title` varchar(80) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `nick` varchar(55) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '卖家昵称', + `type` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品类型(fixed:一口价;auction:拍卖)注：取消团购', `cid` bigint NULL DEFAULT NULL COMMENT '商品所属的叶子类目 id', - `seller_cids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品所属的店铺内卖家自定义类目列表', - `pic_url` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主图', + `seller_cids` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品所属的店铺内卖家自定义类目列表', + `pic_url` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '主图', `num` int NULL DEFAULT NULL COMMENT '商品数量', - `props` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品属性 格式：pid:vid;pid:vid', + `props` varchar(2550) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品属性 格式：pid:vid;pid:vid', `valid_thru` int NULL DEFAULT NULL COMMENT '有效期,7或者14（默认是7天）', - `has_discount` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支持会员打折,true/false', - `has_invoice` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否有发票,true/false', - `has_warranty` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否有保修,true/false', - `has_showcase` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '橱窗推荐,true/false', + `has_discount` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '支持会员打折,true/false', + `has_invoice` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '是否有发票,true/false', + `has_warranty` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '是否有保修,true/false', + `has_showcase` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '橱窗推荐,true/false', `modified` datetime NULL DEFAULT NULL COMMENT '商品修改时间（格式：yyyy-MM-dd HH:mm:ss）', `delist_time` datetime NULL DEFAULT NULL COMMENT '下架时间（格式：yyyy-MM-dd HH:mm:ss）', `postage_id` bigint NULL DEFAULT NULL COMMENT '宝贝所属的运费模板ID，如果没有返回则说明没有使用运费模板', - `outer_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商家外部编码(可与商家外部系统对接)。需要授权才能获取。', + `outer_id` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商家外部编码(可与商家外部系统对接)。需要授权才能获取。', `list_time` datetime NULL DEFAULT NULL COMMENT '上架时间（格式：yyyy-MM-dd HH:mm:ss）', - `price` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品价格，格式：5.00；单位：元；精确到：分', - `remark` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `is_ex` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否在外部网店显示', - `is_virtual` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '虚拟商品的状态字段', - `is_taobao` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否在淘宝显示', + `price` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品价格，格式：5.00；单位：元；精确到：分', + `remark` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', + `is_ex` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '是否在外部网店显示', + `is_virtual` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '虚拟商品的状态字段', + `is_taobao` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '是否在淘宝显示', `sold_quantity` int NULL DEFAULT 0 COMMENT '商品销量', - `is_cspu` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否为达尔文挂接成功了的商品', + `is_cspu` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '是否为达尔文挂接成功了的商品', `first_starts_time` datetime NULL DEFAULT NULL COMMENT '商品首次上架时间', `shop_id` int NOT NULL COMMENT '店铺id', `erp_goods_id` int NULL DEFAULT NULL COMMENT 'erp商品id', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1792760663878254594 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝商品表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1792760663878254594 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '淘宝商品表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of oms_tao_goods @@ -12907,7 +12907,7 @@ CREATE TABLE `oms_tao_order` ( `step_paid_fee` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分阶段付款的已付金额（万人团订单已付金额）', `buyer_open_uid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家OpenUid', `mark_desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单出现异常问题的时候，给予用户的描述,没有异常的时候，此值为空', - `buyer_nick` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '买家昵称', + `buyer_nick` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '买家昵称', `num_iid` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品数字编号', `num` int NULL DEFAULT NULL COMMENT '商品购买数量。取值范围：大于零的整数,对于一个trade对应多个order的时候（一笔主订单，对应多笔子订单），num=0，num是一个跟商品关联的属性，一笔订单对应多比子订单的时候，主订单上的num无意义。', `price` decimal(10, 2) NULL DEFAULT NULL COMMENT '商品价格。精确到2位小数；单位：元。如：200.07，表示：200元7分', @@ -12930,17 +12930,17 @@ CREATE TABLE `oms_tao_order` ( `pay_time` datetime NULL DEFAULT NULL COMMENT '付款时间。格式:yyyy-MM-dd HH:mm:ss。订单的付款时间即为物流订单的创建时间。', `consign_time` datetime NULL DEFAULT NULL COMMENT '卖家发货时间。格式:yyyy-MM-dd HH:mm:ss', `end_time` datetime NULL DEFAULT NULL COMMENT '交易结束时间。交易成功时间(更新交易状态为成功的同时更新)/确认收货时间或者交易关闭时间 。格式:yyyy-MM-dd HH:mm:ss', - `seller_memo` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '卖家备忘信息', - `buyer_memo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家备注', - `buyer_message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '买家留言', + `seller_memo` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '卖家备忘信息', + `buyer_memo` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '买家备注', + `buyer_message` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '买家留言', `point_fee` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家使用积分,下单时生成，且一直不变。格式:100;单位:个.', `real_point_fee` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家实际使用积分（扣除部分退款使用的积分），交易完成后生成（交易成功或关闭），交易未完成时该字段值为0。格式:100;单位:个', `buyer_obtain_point_fee` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家获得积分,返点的积分。格式:100;单位:个。返点的积分要交易成功之后才能获得。', `receiving_time` datetime NULL DEFAULT NULL COMMENT '收货时间，这里返回的是完全收货时间', - `status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '交易状态。可选值: * TRADE_NO_CREATE_PAY(没有创建支付宝交易) * WAIT_BUYER_PAY(等待买家付款) * SELLER_CONSIGNED_PART(卖家部分发货) * WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) * WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) * TRADE_BUYER_SIGNED(买家已签收,货到付款专用) * TRADE_FINISHED(交易成功) * TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) * TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) * PAY_PENDING(国际信用卡支付付款确认中) * WAIT_PRE_AUTH_CONFIRM(0元购合约中) * PAID_FORBID_CONSIGN(拼团中订单或者发货强管控的订单，已付款但禁止发货)', - `trade_memo` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交易备注。', - `erp_send_company` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递公司', - `erp_send_code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递单号', + `status` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '交易状态。可选值: * TRADE_NO_CREATE_PAY(没有创建支付宝交易) * WAIT_BUYER_PAY(等待买家付款) * SELLER_CONSIGNED_PART(卖家部分发货) * WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) * WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) * TRADE_BUYER_SIGNED(买家已签收,货到付款专用) * TRADE_FINISHED(交易成功) * TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) * TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) * PAY_PENDING(国际信用卡支付付款确认中) * WAIT_PRE_AUTH_CONFIRM(0元购合约中) * PAID_FORBID_CONSIGN(拼团中订单或者发货强管控的订单，已付款但禁止发货)', + `trade_memo` varchar(2000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '交易备注。', + `erp_send_company` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递公司', + `erp_send_code` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递单号', `erp_send_status` int NULL DEFAULT 0 COMMENT 'erp发货状态', `create_time` datetime NULL DEFAULT NULL COMMENT '数据库创建时间', `update_time` datetime NULL DEFAULT NULL COMMENT '数据库更新时间', @@ -13003,14 +13003,14 @@ CREATE TABLE `oms_tao_order_item` ( `divide_order_fee` decimal(10, 2) NULL DEFAULT NULL COMMENT '分摊之后的实付金额', `part_mjz_discount` decimal(10, 2) NULL DEFAULT NULL COMMENT '优惠分摊', `payment` decimal(10, 2) NULL DEFAULT NULL COMMENT '子订单实付金额。精确到2位小数，单位:元。如:200.07，表示:200元7分。对于多子订单的交易，计算公式如下：payment = price * num + adjust_fee - discount_fee ；单子订单交易，payment与主订单的payment一致，对于退款成功的子订单，由于主订单的优惠分摊金额，会造成该字段可能不为0.00元。建议使用退款前的实付金额减去退款单中的实际退款金额计算。', - `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `pic_path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品主图', + `title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `pic_path` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品主图', `price` decimal(10, 2) NULL DEFAULT NULL COMMENT '商品价格', `num_iid` bigint NULL DEFAULT NULL COMMENT '商品数字ID', `sku_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品的最小库存单位Sku的id.可以通过taobao.item.sku.get获取详细的Sku信息天猫的SKUID', - `outer_iid` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商家外部编码(可与商家外部系统对接)。', - `outer_sku_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部网店自己定义的Sku编号', - `sku_properties_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'SKU的值。如：机身颜色:黑色;手机套餐:官方标配', + `outer_iid` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商家外部编码(可与商家外部系统对接)。', + `outer_sku_id` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '外部网店自己定义的Sku编号', + `sku_properties_name` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'SKU的值。如：机身颜色:黑色;手机套餐:官方标配', `item_meal_id` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '套餐ID', `item_meal_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '套餐的值。如：M8原装电池:便携支架:M8专用座充:莫凡保护袋', `num` int NULL DEFAULT NULL COMMENT '数量', @@ -13029,10 +13029,10 @@ CREATE TABLE `oms_tao_order_item` ( `logistics_company` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子订单发货的快递公司名称', `invoice_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子订单所在包裹的运单号', `bind_oid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '捆绑的子订单号，表示该子订单要和捆绑的子订单一起发货，用于卖家子订单捆绑发货', - `status` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单状态（请关注此状态，如果为TRADE_CLOSED_BY_TAOBAO状态，则不要对此订单进行发货，切记啊！）。可选值:\r\nTRADE_NO_CREATE_PAY(没有创建支付宝交易)\r\nWAIT_BUYER_PAY(等待买家付款)\r\nWAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款)\r\nWAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货)\r\nTRADE_BUYER_SIGNED(买家已签收,货到付款专用)\r\nTRADE_FINISHED(交易成功)\r\nTRADE_CLOSED(付款以后用户退款成功，交易自动关闭)\r\nTRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易)\r\nPAY_PENDING(国际信用卡支付付款确认中)', - `refund_status` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'NO_REFUND' COMMENT '退款状态。退款状态。可选值 WAIT_SELLER_AGREE(买家已经申请退款，等待卖家同意) WAIT_BUYER_RETURN_GOODS(卖家已经同意退款，等待买家退货) WAIT_SELLER_CONFIRM_GOODS(买家已经退货，等待卖家确认收货) SELLER_REFUSE_BUYER(卖家拒绝退款) CLOSED(退款关闭) SUCCESS(退款成功)', + `status` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '订单状态（请关注此状态，如果为TRADE_CLOSED_BY_TAOBAO状态，则不要对此订单进行发货，切记啊！）。可选值:\r\nTRADE_NO_CREATE_PAY(没有创建支付宝交易)\r\nWAIT_BUYER_PAY(等待买家付款)\r\nWAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款)\r\nWAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货)\r\nTRADE_BUYER_SIGNED(买家已签收,货到付款专用)\r\nTRADE_FINISHED(交易成功)\r\nTRADE_CLOSED(付款以后用户退款成功，交易自动关闭)\r\nTRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易)\r\nPAY_PENDING(国际信用卡支付付款确认中)', + `refund_status` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'NO_REFUND' COMMENT '退款状态。退款状态。可选值 WAIT_SELLER_AGREE(买家已经申请退款，等待卖家同意) WAIT_BUYER_RETURN_GOODS(卖家已经同意退款，等待买家退货) WAIT_SELLER_CONFIRM_GOODS(买家已经退货，等待卖家确认收货) SELLER_REFUSE_BUYER(卖家拒绝退款) CLOSED(退款关闭) SUCCESS(退款成功)', `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '最近退款ID', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL, `o_goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)', `o_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)', PRIMARY KEY (`id`) USING BTREE, @@ -13089,7 +13089,7 @@ INSERT INTO `oms_tao_order_promotion` VALUES (2171562603833839077, '2024年618 DROP TABLE IF EXISTS `oms_tao_refund`; CREATE TABLE `oms_tao_refund` ( `id` bigint NOT NULL AUTO_INCREMENT, - `refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款id', + `refund_id` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退款id', `dispute_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款类型，可选值REFUND(仅退款),REFUND_AND_RETURN(退货退款),TMALL_EXCHANGE(天猫换货),TAOBAO_EXCHANGE(淘宝换货),REPAIR(维修),RESHIPPING(补寄),OTHERS(其他)', `shop_id` int NOT NULL COMMENT '店铺id', `tid` bigint NULL DEFAULT NULL COMMENT '淘宝交易单号（订单号）', @@ -13110,21 +13110,21 @@ CREATE TABLE `oms_tao_refund` ( `advance_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款先行垫付默认的未申请状态 0;退款先行垫付申请中 1;退款先行垫付，垫付完成 2;退款先行垫付，卖家拒绝收货 3;退款先行垫付，垫付关闭 4;退款先行垫付，垫付分账成功 5;', `alipay_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付宝交易号', `good_return_time` datetime NULL DEFAULT NULL COMMENT '退货时间。格式:yyyy-MM-dd HH:mm:ss', - `good_status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '货物状态。可选值BUYER_NOT_RECEIVED (买家未收到货) BUYER_RECEIVED (买家已收到货) BUYER_RETURNED_GOODS (买家已退货)', + `good_status` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '货物状态。可选值BUYER_NOT_RECEIVED (买家未收到货) BUYER_RECEIVED (买家已收到货) BUYER_RETURNED_GOODS (买家已退货)', `has_good_return` int NULL DEFAULT NULL COMMENT '买家是否需要退货。可选值:true(是),false(否)', `num_iid` bigint NULL DEFAULT NULL COMMENT '申请退款的商品数字编号', `num` bigint NOT NULL DEFAULT 0 COMMENT '退货数量', `outer_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品外部商家编码', - `reason` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款原因', - `refund_phase` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款阶段，可选值：onsale/aftersale', + `reason` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退款原因', + `refund_phase` varchar(15) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退款阶段，可选值：onsale/aftersale', `shipping_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流方式.可选值:free(卖家包邮),post(平邮),express(快递),ems(EMS).', - `desc1` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退款说明', - `company_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流公司', - `sid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '退货运单号', - `send_time` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家发货时间', + `desc1` varchar(1000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退款说明', + `company_name` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '物流公司', + `sid` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '退货运单号', + `send_time` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '买家发货时间', `end_time` datetime NULL DEFAULT NULL COMMENT ' 完结时间。格式:yyyy-MM-dd HH:mm:ss', - `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', - `sku` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品SKU信息', + `title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `sku` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品SKU信息', `buyer_open_uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家openUid', `buyer_nick` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '买家昵称', `combine_item_info` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组合品信息\r\nnum_iid String 2342344 商品数字编号\r\nitem_name String 测试商品 商品标题\r\nquantity Number 123 数量\r\nsku_id String 123 sku_id\r\nouter_iid String 123 商家外部编码(可与商家外部系统对接)\r\nouter_sku_id String 123 123', @@ -13370,8 +13370,8 @@ CREATE TABLE `oms_wei_order` ( `settle_info` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '结算信息json', `audit_status` int NULL DEFAULT NULL COMMENT '订单审核状态（0待审核1已审核）', `audit_time` datetime NULL DEFAULT NULL COMMENT '订单审核时间', - `erp_send_company` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递公司', - `erp_send_code` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递单号', + `erp_send_company` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递公司', + `erp_send_code` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'erp发货快递单号', `erp_send_status` int NULL DEFAULT 0 COMMENT 'erp发货状态', PRIMARY KEY (`id`) USING BTREE, INDEX `order_id_index`(`order_id`) USING BTREE @@ -13603,14 +13603,14 @@ DROP TABLE IF EXISTS `scm_purchase_order`; CREATE TABLE `scm_purchase_order` ( `id` bigint NOT NULL AUTO_INCREMENT, `supplier_id` bigint NOT NULL COMMENT '供应商id', - `order_num` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '订单编号', + `order_num` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '订单编号', `order_date` date NOT NULL COMMENT '订单日期', `order_time` bigint NOT NULL COMMENT '订单创建时间', `order_amount` decimal(10, 2) NOT NULL COMMENT '订单总金额', `ship_amount` decimal(6, 2) NOT NULL COMMENT '物流费用', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', `status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '订单状态 0待审核1已审核101供应商已确认102供应商已发货2已收货3已入库', - `audit_user` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '采购单审核人', + `audit_user` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '采购单审核人', `audit_time` bigint NULL DEFAULT 0 COMMENT '审核时间', `supplier_confirm_time` datetime NULL DEFAULT NULL COMMENT '供应商确认时间', `supplier_delivery_time` datetime NULL DEFAULT NULL COMMENT '供应商发货时间', @@ -13621,7 +13621,7 @@ CREATE TABLE `scm_purchase_order` ( `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购订单' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '采购订单' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of scm_purchase_order @@ -13669,20 +13669,20 @@ DROP TABLE IF EXISTS `scm_purchase_order_item`; CREATE TABLE `scm_purchase_order_item` ( `id` bigint NOT NULL AUTO_INCREMENT, `order_id` bigint NULL DEFAULT 0 COMMENT '订单id', - `order_num` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '订单编号', - `trans_type` char(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '150501采购 150502退货', + `order_num` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '订单编号', + `trans_type` char(15) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '0' COMMENT '150501采购 150502退货', `amount` double NULL DEFAULT 0 COMMENT '购货金额', `order_date` date NULL DEFAULT NULL COMMENT '订单日期', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注', + `remark` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '备注', `goods_id` bigint NULL DEFAULT 0 COMMENT '商品ID', - `goods_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `goods_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', + `goods_num` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_name` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品名称', `spec_id` bigint NULL DEFAULT 0 COMMENT '商品规格id', - `spec_num` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', - `color_value` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '颜色', - `color_image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图片', - `size_value` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '尺码', - `style_value` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '款式', + `spec_num` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `color_value` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '颜色', + `color_image` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '图片', + `size_value` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '尺码', + `style_value` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '款式', `price` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '单价', `dis_amount` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '折扣额', `dis_rate` decimal(8, 2) NULL DEFAULT 0.00 COMMENT '折扣率', @@ -13698,7 +13698,7 @@ CREATE TABLE `scm_purchase_order_item` ( INDEX `transType`(`trans_type`) USING BTREE, INDEX `iid`(`order_id`) USING BTREE, INDEX `id`(`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1847954716482248705 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购订单明细' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1847954716482248705 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '采购订单明细' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of scm_purchase_order_item @@ -14189,7 +14189,7 @@ CREATE TABLE `sys_user` ( -- ---------------------------- -- Records of sys_user -- ---------------------------- -INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-03-24 11:32:54', 'admin', '2023-08-07 19:31:37', '', '2025-03-24 11:32:53', '管理员'); +INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-03-31 20:19:18', 'admin', '2023-08-07 19:31:37', '', '2025-03-31 20:19:18', '管理员'); INSERT INTO `sys_user` VALUES (2, NULL, 'openapi', 'openApi接口专用', '00', '2806456181@qq.com', '15818590000', '0', '', '$2a$10$fHkhoqbMiyracAsTzl38H.55bu.M.of1FXk2EK7RQBjfic3tLU0Ue', '0', '0', '127.0.0.1', '2024-06-24 10:23:35', 'admin', '2024-03-17 14:55:22', 'admin', '2024-06-24 10:23:35', NULL); INSERT INTO `sys_user` VALUES (101, 101, '15818590119', 'aaa123', '00', '', '', '0', '', '$2a$10$pXcT6cHaObMeKuYd9vZb5uEb8PyUdF2AcqqRN1cBqiA9rV4qYQW7G', '0', '2', '', NULL, 'admin', '2024-08-15 13:45:25', '', NULL, NULL); INSERT INTO `sys_user` VALUES (102, 101, '15818590119', '老齐', '00', '', '', '0', '', '$2a$10$ysk.zgJ8wh25c7vOjKyZ8uarM2hkG0S51j8GYdJSo2kZmc3f8HdKe', '0', '0', '', NULL, 'admin', '2024-08-15 13:49:59', 'admin', '2025-02-10 16:26:20', NULL); @@ -14220,9 +14220,9 @@ DROP TABLE IF EXISTS `wms_inventory_operation`; CREATE TABLE `wms_inventory_operation` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', `goods_id` bigint NOT NULL COMMENT '商品id', - `goods_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_num` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', `sku_id` bigint NOT NULL COMMENT '商品规格id', - `sku_code` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '规格编码（唯一）', + `sku_code` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '规格编码（唯一）', `batch_id` bigint NOT NULL COMMENT '库存批次id', `batch_num` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '库存批次号', `type` int NOT NULL COMMENT '库存类型（1增加库存2减少库存3锁定库存）', @@ -14235,13 +14235,13 @@ CREATE TABLE `wms_inventory_operation` ( `biz_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务单号', `biz_item_id` bigint NOT NULL COMMENT '业务单itemId', `status` int NOT NULL COMMENT '状态（0待结算1已结算）', - `remark` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(250) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', `warehouse_id` bigint NOT NULL COMMENT '仓库id', `position_id` bigint NOT NULL COMMENT '仓位id', `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_by` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', - `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_by` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '更新人', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库库存操作记录表' ROW_FORMAT = DYNAMIC; @@ -14255,16 +14255,16 @@ CREATE TABLE `wms_inventory_operation` ( DROP TABLE IF EXISTS `wms_stock_in`; CREATE TABLE `wms_stock_in` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `stock_in_num` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '入库单据编号', + `stock_in_num` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '入库单据编号', `stock_in_type` int NOT NULL COMMENT '来源类型（1采购订单2退货订单）', - `source_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单号', + `source_no` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '来源单号', `source_id` bigint NULL DEFAULT NULL COMMENT '来源单id', `source_goods_unit` int NULL DEFAULT NULL COMMENT '采购订单商品数', `source_spec_unit_total` int NULL DEFAULT NULL COMMENT '采购订单总件数', `source_spec_unit` int NULL DEFAULT NULL COMMENT '采购订单商品规格数', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', `stock_in_operator_id` bigint NULL DEFAULT NULL COMMENT '操作入库人id', - `stock_in_operator` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作入库人', + `stock_in_operator` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作入库人', `stock_in_time` datetime NULL DEFAULT NULL COMMENT '入库时间', `status` int NOT NULL DEFAULT 0 COMMENT '状态（0待入库1部分入库2全部入库）', `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', @@ -14272,7 +14272,7 @@ CREATE TABLE `wms_stock_in` ( `update_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '入库单' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of wms_stock_in @@ -14288,19 +14288,19 @@ CREATE TABLE `wms_stock_in_item` ( `id` bigint NOT NULL AUTO_INCREMENT, `stock_in_id` bigint NOT NULL COMMENT '入库单id', `stock_in_type` int NULL DEFAULT NULL COMMENT '来源类型（1采购订单2退货订单）', - `source_no` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单号', + `source_no` varchar(5) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '来源单号', `source_id` bigint NULL DEFAULT NULL COMMENT '来源单id', `source_item_id` bigint NOT NULL COMMENT '来源单itemId', `goods_id` bigint NOT NULL COMMENT '商品id', - `goods_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品编码', - `goods_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品名称', - `goods_image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', + `goods_num` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品编码', + `goods_name` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品名称', + `goods_image` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品图片', `sku_id` bigint NOT NULL COMMENT '商品规格id', - `sku_code` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', - `sku_name` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '颜色', + `sku_code` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '商品规格编码', + `sku_name` varchar(55) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '颜色', `quantity` int NOT NULL COMMENT '原始数量', `in_quantity` int NOT NULL DEFAULT 0 COMMENT '入库数量', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注', + `remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '备注', `status` int NULL DEFAULT 0 COMMENT '状态（0待入库1部分入库2全部入库）', `create_by` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', @@ -14308,7 +14308,7 @@ CREATE TABLE `wms_stock_in_item` ( `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, INDEX `specIndex`(`sku_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1837791930231152642 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '入库单明细' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1837791930231152642 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '入库单明细' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of wms_stock_in_item @@ -14322,26 +14322,26 @@ INSERT INTO `wms_stock_in_item` VALUES (1837791930231152642, 2, 1, 'AAA', 0, 0, DROP TABLE IF EXISTS `wms_stock_out`; CREATE TABLE `wms_stock_out` ( `id` bigint NOT NULL AUTO_INCREMENT, - `stock_out_num` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '出库单编号', - `source_num` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源单据号', + `stock_out_num` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '出库单编号', + `source_num` varchar(35) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '来源单据号', `source_id` bigint NULL DEFAULT NULL COMMENT '来源单据Id', `stock_out_type` int NOT NULL DEFAULT 1 COMMENT '出库类型1订单拣货出库2采购退货出库3盘点出库4报损出库', `goods_unit` int NOT NULL COMMENT '商品数', `spec_unit` int NOT NULL COMMENT '商品规格数', `spec_unit_total` int NOT NULL COMMENT '总件数', `out_total` int NULL DEFAULT NULL COMMENT '已出库数量', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '备注', `status` int NOT NULL COMMENT '状态：0待出库1部分出库2全部出库', `print_status` int NOT NULL COMMENT '打印状态：是否打印1已打印0未打印', `print_time` datetime NULL DEFAULT NULL COMMENT '打印时间', `out_time` datetime NULL DEFAULT NULL COMMENT '出库时间', `complete_time` datetime NULL DEFAULT NULL COMMENT '完成出库时间', `operator_id` int NULL DEFAULT 0 COMMENT '出库操作人userid', - `operator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库操作人', + `operator_name` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '出库操作人', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建日期', - `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_by` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_by` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '更新人', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1794205460481933314 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '出库单' ROW_FORMAT = DYNAMIC; @@ -14363,10 +14363,10 @@ CREATE TABLE `wms_stock_out_item` ( `entry_id` bigint NOT NULL COMMENT '出库单id（外键）', `source_order_id` bigint NOT NULL COMMENT '来源订单id', `source_order_item_id` bigint NOT NULL COMMENT '来源订单itemId出库对应的itemId，如：order_item表id、invoice_info表id', - `source_order_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '来源订单号', + `source_order_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '来源订单号', `goods_id` int NOT NULL COMMENT '商品id', `spec_id` int NOT NULL COMMENT '商品规格id', - `spec_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '规格编码', + `spec_num` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '规格编码', `original_quantity` bigint NOT NULL COMMENT '总数量', `out_quantity` bigint NOT NULL DEFAULT 0 COMMENT '已出库数量', `complete_time` datetime NULL DEFAULT NULL COMMENT '完成出库时间', @@ -14399,7 +14399,7 @@ CREATE TABLE `wms_stock_out_item_position` ( `quantity` bigint NOT NULL DEFAULT 0 COMMENT '出库数量', `location_id` int NULL DEFAULT NULL COMMENT '出库仓位ID', `operator_id` int NULL DEFAULT 0 COMMENT '出库操作人userid', - `operator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库操作人', + `operator_name` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '出库操作人', `out_time` datetime NULL DEFAULT NULL COMMENT '出库时间', PRIMARY KEY (`id`) USING BTREE, INDEX `goods_stock_info_item_id_index`(`goods_inventory_detail_id`) USING BTREE diff --git a/vue/src/views/shipping/logistics/company.vue b/vue/src/views/shipping/logistics/company.vue index 2b8ca2e1..d5f79db0 100644 --- a/vue/src/views/shipping/logistics/company.vue +++ b/vue/src/views/shipping/logistics/company.vue @@ -10,7 +10,7 @@ - +