huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善jd拉取订单、消息

This commit is contained in:
老齐 2024-06-13 16:36:44 +08:00
parent 99955e31a8
commit 8b0e857630
47 changed files with 703 additions and 3686 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/qihang-erp.sql
View File

@ -11,7 +11,7 @@
Target Server Version : 80032
File Encoding : 65001
Date: 13/06/2024 10:41:56
Date: 13/06/2024 16:35:52
*/
SET NAMES utf8mb4;
@ -811,7 +811,7 @@ CREATE TABLE `oms_dou_refund` (
`pull_time` datetime(0) DEFAULT NULL COMMENT '第一次拉取时间',
`pull_last_time` datetime(0) DEFAULT NULL COMMENT '最后一次拉取时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1798648692590739458 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '抖店退款表' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 1800783607092436995 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '抖店退款表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for oms_jd_after_sale
@ -1258,7 +1258,7 @@ CREATE TABLE `oms_tao_goods` (
`erp_supplier_id` bigint(0) DEFAULT NULL COMMENT 'erp系统供应商ID',
`create_time` datetime(0) DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1800363757383634946 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '淘宝商品表' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 1800363757383634947 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '淘宝商品表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for oms_tao_goods_sku
@ -1285,7 +1285,7 @@ CREATE TABLE `oms_tao_goods_sku` (
`shop_id` bigint(0) DEFAULT NULL COMMENT '店铺id',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1800370800777670658 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '淘宝商品SKU表' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 1800370800777670659 CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '淘宝商品SKU表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for oms_tao_order
@ -1375,7 +1375,7 @@ CREATE TABLE `oms_tao_order` (
`audit_status` int(0) DEFAULT NULL COMMENT '订单审核状态（0待审核1已审核）',
`audit_time` datetime(0) DEFAULT NULL COMMENT '订单审核时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1800446659075866625 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单表' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 1801145793522417666 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for oms_tao_order_item
@ -1422,7 +1422,7 @@ CREATE TABLE `oms_tao_order_item` (
`refund_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近退款ID',
`remark` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1800446659088449539 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单明细表' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 1801145793685995522 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '淘宝订单明细表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for oms_tao_order_promotion
@ -1760,14 +1760,14 @@ CREATE TABLE `s_shop_platform` (
-- ----------------------------
DROP TABLE IF EXISTS `s_shop_pull_lasttime`;
CREATE TABLE `s_shop_pull_lasttime` (
`id` int(0) NOT NULL AUTO_INCREMENT,
`id` bigint(0) NOT NULL AUTO_INCREMENT,
`shop_id` int(0) DEFAULT NULL COMMENT '店铺id',
`pull_type` enum('ORDER','REFUND') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型（ORDER:订单，REFUND:退款）',
`lasttime` datetime(0) DEFAULT NULL COMMENT '最后更新时间',
`create_time` datetime(0) DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '店铺更新最后时间记录' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 2128068611 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '店铺更新最后时间记录' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for s_shop_pull_logs
@ -2292,7 +2292,7 @@ CREATE TABLE `sys_logininfor` (
PRIMARY KEY (`info_id`) USING BTREE,
INDEX `idx_sys_logininfor_s`(`status`) USING BTREE,
INDEX `idx_sys_logininfor_lt`(`login_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 298 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 303 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for sys_menu
@ -2348,7 +2348,7 @@ CREATE TABLE `sys_oper_log` (
INDEX `idx_sys_oper_log_bt`(`business_type`) USING BTREE,
INDEX `idx_sys_oper_log_s`(`status`) USING BTREE,
INDEX `idx_sys_oper_log_ot`(`oper_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 452 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 453 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for sys_oss

428
oms-api/src/main/java/com/qihang/oms/domain/JdGoodsSku.java
View File

@ -1,428 +0,0 @@
package com.qihang.oms.domain;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
*
* @TableName jd_goods_sku
*/
public class JdGoodsSku implements Serializable {
/**
*
*/
private Long id;
/**
* 外键（jd_goods表id）
*/
private Long goodsId;
/**
*
*/
private Long wareId;
/**
*
*/
private Long skuId;
/**
*
*/
private Integer status;
/**
*
*/
private BigDecimal jdPrice;
/**
*
*/
private String outerId;
/**
*
*/
private String barCode;
/**
*
*/
private String logo;
/**
*
*/
private String saleAttrs;
private String attrs;
/**
*
*/
private String skuName;
/**
*
*/
private Integer stockNum;
/**
*
*/
private Date modified;
/**
*
*/
private Date created;
/**
*
*/
private String currencySpuId;
/**
* erp商品id
*/
private Long erpGoodsId;
/**
* erp商品sku id
*/
private Long erpSkuId;
private static final long serialVersionUID = 1L;
public String getAttrs() {
return attrs;
}
public void setAttrs(String attrs) {
this.attrs = attrs;
}
/**
*
*/
public Long getId() {
return id;
}
/**
*
*/
public void setId(Long id) {
this.id = id;
}
/**
* 外键（jd_goods表id）
*/
public Long getGoodsId() {
return goodsId;
}
/**
* 外键（jd_goods表id）
*/
public void setGoodsId(Long goodsId) {
this.goodsId = goodsId;
}
/**
*
*/
public Long getWareId() {
return wareId;
}
/**
*
*/
public void setWareId(Long wareId) {
this.wareId = wareId;
}
/**
*
*/
public Long getSkuId() {
return skuId;
}
/**
*
*/
public void setSkuId(Long skuId) {
this.skuId = skuId;
}
/**
*
*/
public Integer getStatus() {
return status;
}
/**
*
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
*
*/
public BigDecimal getJdPrice() {
return jdPrice;
}
/**
*
*/
public void setJdPrice(BigDecimal jdPrice) {
this.jdPrice = jdPrice;
}
/**
*
*/
public String getOuterId() {
return outerId;
}
/**
*
*/
public void setOuterId(String outerId) {
this.outerId = outerId;
}
/**
*
*/
public String getBarCode() {
return barCode;
}
/**
*
*/
public void setBarCode(String barCode) {
this.barCode = barCode;
}
/**
*
*/
public String getLogo() {
return logo;
}
/**
*
*/
public void setLogo(String logo) {
this.logo = logo;
}
/**
*
*/
public String getSaleAttrs() {
return saleAttrs;
}
/**
*
*/
public void setSaleAttrs(String saleAttrs) {
this.saleAttrs = saleAttrs;
}
/**
*
*/
public String getSkuName() {
return skuName;
}
/**
*
*/
public void setSkuName(String skuName) {
this.skuName = skuName;
}
/**
*
*/
public Integer getStockNum() {
return stockNum;
}
/**
*
*/
public void setStockNum(Integer stockNum) {
this.stockNum = stockNum;
}
/**
*
*/
public Date getModified() {
return modified;
}
/**
*
*/
public void setModified(Date modified) {
this.modified = modified;
}
/**
*
*/
public Date getCreated() {
return created;
}
/**
*
*/
public void setCreated(Date created) {
this.created = created;
}
/**
*
*/
public String getCurrencySpuId() {
return currencySpuId;
}
/**
*
*/
public void setCurrencySpuId(String currencySpuId) {
this.currencySpuId = currencySpuId;
}
/**
* erp商品id
*/
public Long getErpGoodsId() {
return erpGoodsId;
}
/**
* erp商品id
*/
public void setErpGoodsId(Long erpGoodsId) {
this.erpGoodsId = erpGoodsId;
}
/**
* erp商品sku id
*/
public Long getErpSkuId() {
return erpSkuId;
}
/**
* erp商品sku id
*/
public void setErpSkuId(Long erpSkuId) {
this.erpSkuId = erpSkuId;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
JdGoodsSku other = (JdGoodsSku) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
&& (this.getWareId() == null ? other.getWareId() == null : this.getWareId().equals(other.getWareId()))
&& (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getJdPrice() == null ? other.getJdPrice() == null : this.getJdPrice().equals(other.getJdPrice()))
&& (this.getOuterId() == null ? other.getOuterId() == null : this.getOuterId().equals(other.getOuterId()))
&& (this.getBarCode() == null ? other.getBarCode() == null : this.getBarCode().equals(other.getBarCode()))
&& (this.getLogo() == null ? other.getLogo() == null : this.getLogo().equals(other.getLogo()))
&& (this.getSaleAttrs() == null ? other.getSaleAttrs() == null : this.getSaleAttrs().equals(other.getSaleAttrs()))
&& (this.getSkuName() == null ? other.getSkuName() == null : this.getSkuName().equals(other.getSkuName()))
&& (this.getStockNum() == null ? other.getStockNum() == null : this.getStockNum().equals(other.getStockNum()))
&& (this.getModified() == null ? other.getModified() == null : this.getModified().equals(other.getModified()))
&& (this.getCreated() == null ? other.getCreated() == null : this.getCreated().equals(other.getCreated()))
&& (this.getCurrencySpuId() == null ? other.getCurrencySpuId() == null : this.getCurrencySpuId().equals(other.getCurrencySpuId()))
&& (this.getErpGoodsId() == null ? other.getErpGoodsId() == null : this.getErpGoodsId().equals(other.getErpGoodsId()))
&& (this.getErpSkuId() == null ? other.getErpSkuId() == null : this.getErpSkuId().equals(other.getErpSkuId()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
result = prime * result + ((getWareId() == null) ? 0 : getWareId().hashCode());
result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getJdPrice() == null) ? 0 : getJdPrice().hashCode());
result = prime * result + ((getOuterId() == null) ? 0 : getOuterId().hashCode());
result = prime * result + ((getBarCode() == null) ? 0 : getBarCode().hashCode());
result = prime * result + ((getLogo() == null) ? 0 : getLogo().hashCode());
result = prime * result + ((getSaleAttrs() == null) ? 0 : getSaleAttrs().hashCode());
result = prime * result + ((getSkuName() == null) ? 0 : getSkuName().hashCode());
result = prime * result + ((getStockNum() == null) ? 0 : getStockNum().hashCode());
result = prime * result + ((getModified() == null) ? 0 : getModified().hashCode());
result = prime * result + ((getCreated() == null) ? 0 : getCreated().hashCode());
result = prime * result + ((getCurrencySpuId() == null) ? 0 : getCurrencySpuId().hashCode());
result = prime * result + ((getErpGoodsId() == null) ? 0 : getErpGoodsId().hashCode());
result = prime * result + ((getErpSkuId() == null) ? 0 : getErpSkuId().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(", goodsId=").append(goodsId);
sb.append(", wareId=").append(wareId);
sb.append(", skuId=").append(skuId);
sb.append(", status=").append(status);
sb.append(", jdPrice=").append(jdPrice);
sb.append(", outerId=").append(outerId);
sb.append(", barCode=").append(barCode);
sb.append(", logo=").append(logo);
sb.append(", saleAttrs=").append(saleAttrs);
sb.append(", skuName=").append(skuName);
sb.append(", stockNum=").append(stockNum);
sb.append(", modified=").append(modified);
sb.append(", created=").append(created);
sb.append(", currencySpuId=").append(currencySpuId);
sb.append(", erpGoodsId=").append(erpGoodsId);
sb.append(", erpSkuId=").append(erpSkuId);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

1100
oms-api/src/main/java/com/qihang/oms/domain/JdOrder.java
View File

File diff suppressed because it is too large Load Diff

881
oms-api/src/main/java/com/qihang/oms/domain/JdOrderAfter.java
View File

@ -1,881 +0,0 @@
package com.qihang.oms.domain;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 京东售后
* @TableName jd_order_after
*/
public class JdOrderAfter implements Serializable {
/**
*
*/
private Long id;
/**
* 店铺id
*/
private Integer shopId;
/**
* 申请单号
*/
private Long applyId;
/**
* 服务单号
*/
private Long serviceId;
/**
* 申请时间
*/
private Date applyTime;
/**
* 客户期望(10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款)
*/
private Integer customerExpect;
/**
* 客户期望名称
*/
private String customerExpectName;
/**
* 服务单状态（10000-待审核领取 10001-待审核 10002-待客户反馈 10004-审核关闭 10005-待收货 10006-待处理领取 10007-待处理 10009-待用户确认 10010-完成 10011-取消 10012-客户已反馈 10013-待审核和待客户反馈 10041-提交退款申请 1100-待下发维修中心接单 12000-上门维修中 14000-上门检测中 13000-商家催收待处理 13000-未收货，待收款 13000-已收货，待收款）
*/
private Integer serviceStatus;
/**
* 服务单状态名称
*/
private String serviceStatusName;
/**
* 客户账号
*/
private String customerPin;
/**
* 客户姓名
*/
private String customerName;
/**
* 用户电话
*/
private String customerTel;
/**
* 取件地址
*/
private String pickwareAddress;
/**
* 取件方式(4-上门取件 5-上门换新取件 7-客户送货 8-大家电上门取件 9-大家电换新取件 40-客户发货 70-送货至门店 71-快递至门店 72-门店上门取件 80-京东快运上门取件 85-德邦取件)
*/
private Integer pickwareType;
/**
* 订单号
*/
private Long orderId;
/**
* 订单类型(0-一般订单 2-拍卖订单 11-售后调货 15-返修发货 16-直接赔偿 21-POPFBP 22-POPSOP 23-POPLBP 24-POPLBV 25-POPSOPL 18-厂商直送 19-客服补件 42-通用合约 61-EPT订单 69-京东服务产品订单 19-客服补件 75-LOC订单 77-LSP订单 42-虚拟订单 88-总代订单 96-sop虚拟订单 100-提货卡订单 33-电子礼品卡 49-礼品卡 108-京东维修服务产品订单 131-X无人超市订单 142-企业店铺IBS订单 151-品牌门店线下订单 112-自营采购，以销定结 159-领货码订单 89-移动仓库订单 170-实体领货码订单 140-商家采购订单 193-scf订单 54-线下礼品卡订单 202-月卡订单 4-虚拟商品)
*/
private Integer orderType;
/**
* 订单类型名称
*/
private String orderTypeName;
/**
* 实付金额
*/
private BigDecimal actualPayPrice;
/**
* 商品编号
*/
private Long skuId;
/**
* 售后商品类型(10-申请主商品 20-申请的赠品 30-附件 40-发票 50-发票复印件 60-出检报告 70-包装 80-防损吊牌 90-贺卡 100-礼品购包装 110-loc订单验证码 120-服务产品标识)
*/
private Integer wareType;
/**
* 商品类型名称
*/
private String wareTypeName;
/**
* 商品名称
*/
private String wareName;
/**
* 商品类型(1-单品 2-赠品套装中的主商品 3-赠品套装中的赠品 4-套装中的单品 5-套装中的赠品 6-加价购赠品 7-延保通 8-延保通赠品)
*/
private Integer skuType;
/**
* skuType对应名称
*/
private String skuTypeName;
/**
* 审核人账号
*/
private String approvePin;
/**
* 审核人姓名
*/
private String approveName;
/**
* 审核时间
*/
private Date approveTime;
/**
* 审核结果(11-直赔积分 12-直赔余额 13-直赔优惠卷 14-直赔京豆 21-直赔商品 22-上门换新 31-自营取件 32-客户送货 33-客户发货 34-闪电退款 35-虚拟退款 36-上门检测 37-客户送货至门店 38-保外维修 39-快递至门店 40-门店上门取件 80-大家电检测 81-大家电安装 82-大家电移机 83-大家电维修 84-大家电其它 85-闪电催收 86-上门维修 87-补发商品 91-退款不退货 92-预授权冻结 93-ACS换新 95-(超级体验店)门店换新 96-(超级体验店)主站换新 97-厂商维修-寄修 98-厂商维修-上门维修 99-厂商维修-送修 101-厂商大家电检测鉴定 102-厂商大家电安装 103-厂商大家电移机拆机 104-厂商大家电维修(上门维修) 105-厂商大家电拆机鉴定 106-换货 100-客户退货至团长 107-3c上门维修 108-增值服务 109-退货(筋斗云使用) 110-直赔(筋斗云使用) 111-上门检测取件)
*/
private Integer approveResult;
/**
* 审核结果名称
*/
private String approveResultName;
/**
* 处理人账号
*/
private String processPin;
/**
* 处理人姓名
*/
private String processName;
/**
* 处理时间
*/
private Date processTime;
/**
* 处理结果(0-初始化 1-安装完成 2-维修完成 3-检测完成 4-拆机完成 5-咨询解释 6-取消 70-原返 80-换货 100-赔付)
*/
private Integer processResult;
/**
* 处理结果名称
*/
private String processResultName;
/**
* 平台来源
*/
private Integer platformSrc;
/**
* 平台来源名称
*/
private String platformSrcName;
/**
* 服务单售后数量
*/
private Integer serviceCount;
/**
* 用户电话
*/
private String desenCustomerTel;
private static final long serialVersionUID = 1L;
/**
*
*/
public Long getId() {
return id;
}
/**
*
*/
public void setId(Long id) {
this.id = id;
}
/**
* 店铺id
*/
public Integer getShopId() {
return shopId;
}
/**
* 店铺id
*/
public void setShopId(Integer shopId) {
this.shopId = shopId;
}
/**
* 申请单号
*/
public Long getApplyId() {
return applyId;
}
/**
* 申请单号
*/
public void setApplyId(Long applyId) {
this.applyId = applyId;
}
/**
* 服务单号
*/
public Long getServiceId() {
return serviceId;
}
/**
* 服务单号
*/
public void setServiceId(Long serviceId) {
this.serviceId = serviceId;
}
/**
* 申请时间
*/
public Date getApplyTime() {
return applyTime;
}
/**
* 申请时间
*/
public void setApplyTime(Date applyTime) {
this.applyTime = applyTime;
}
/**
* 客户期望(10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款)
*/
public Integer getCustomerExpect() {
return customerExpect;
}
/**
* 客户期望(10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款)
*/
public void setCustomerExpect(Integer customerExpect) {
this.customerExpect = customerExpect;
}
/**
* 客户期望名称
*/
public String getCustomerExpectName() {
return customerExpectName;
}
/**
* 客户期望名称
*/
public void setCustomerExpectName(String customerExpectName) {
this.customerExpectName = customerExpectName;
}
/**
* 服务单状态（10000-待审核领取 10001-待审核 10002-待客户反馈 10004-审核关闭 10005-待收货 10006-待处理领取 10007-待处理 10009-待用户确认 10010-完成 10011-取消 10012-客户已反馈 10013-待审核和待客户反馈 10041-提交退款申请 1100-待下发维修中心接单 12000-上门维修中 14000-上门检测中 13000-商家催收待处理 13000-未收货，待收款 13000-已收货，待收款）
*/
public Integer getServiceStatus() {
return serviceStatus;
}
/**
* 服务单状态（10000-待审核领取 10001-待审核 10002-待客户反馈 10004-审核关闭 10005-待收货 10006-待处理领取 10007-待处理 10009-待用户确认 10010-完成 10011-取消 10012-客户已反馈 10013-待审核和待客户反馈 10041-提交退款申请 1100-待下发维修中心接单 12000-上门维修中 14000-上门检测中 13000-商家催收待处理 13000-未收货，待收款 13000-已收货，待收款）
*/
public void setServiceStatus(Integer serviceStatus) {
this.serviceStatus = serviceStatus;
}
/**
* 服务单状态名称
*/
public String getServiceStatusName() {
return serviceStatusName;
}
/**
* 服务单状态名称
*/
public void setServiceStatusName(String serviceStatusName) {
this.serviceStatusName = serviceStatusName;
}
/**
* 客户账号
*/
public String getCustomerPin() {
return customerPin;
}
/**
* 客户账号
*/
public void setCustomerPin(String customerPin) {
this.customerPin = customerPin;
}
/**
* 客户姓名
*/
public String getCustomerName() {
return customerName;
}
/**
* 客户姓名
*/
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
/**
* 用户电话
*/
public String getCustomerTel() {
return customerTel;
}
/**
* 用户电话
*/
public void setCustomerTel(String customerTel) {
this.customerTel = customerTel;
}
/**
* 取件地址
*/
public String getPickwareAddress() {
return pickwareAddress;
}
/**
* 取件地址
*/
public void setPickwareAddress(String pickwareAddress) {
this.pickwareAddress = pickwareAddress;
}
/**
* 取件方式(4-上门取件 5-上门换新取件 7-客户送货 8-大家电上门取件 9-大家电换新取件 40-客户发货 70-送货至门店 71-快递至门店 72-门店上门取件 80-京东快运上门取件 85-德邦取件)
*/
public Integer getPickwareType() {
return pickwareType;
}
/**
* 取件方式(4-上门取件 5-上门换新取件 7-客户送货 8-大家电上门取件 9-大家电换新取件 40-客户发货 70-送货至门店 71-快递至门店 72-门店上门取件 80-京东快运上门取件 85-德邦取件)
*/
public void setPickwareType(Integer pickwareType) {
this.pickwareType = pickwareType;
}
/**
* 订单号
*/
public Long getOrderId() {
return orderId;
}
/**
* 订单号
*/
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
/**
* 订单类型(0-一般订单 2-拍卖订单 11-售后调货 15-返修发货 16-直接赔偿 21-POPFBP 22-POPSOP 23-POPLBP 24-POPLBV 25-POPSOPL 18-厂商直送 19-客服补件 42-通用合约 61-EPT订单 69-京东服务产品订单 19-客服补件 75-LOC订单 77-LSP订单 42-虚拟订单 88-总代订单 96-sop虚拟订单 100-提货卡订单 33-电子礼品卡 49-礼品卡 108-京东维修服务产品订单 131-X无人超市订单 142-企业店铺IBS订单 151-品牌门店线下订单 112-自营采购，以销定结 159-领货码订单 89-移动仓库订单 170-实体领货码订单 140-商家采购订单 193-scf订单 54-线下礼品卡订单 202-月卡订单 4-虚拟商品)
*/
public Integer getOrderType() {
return orderType;
}
/**
* 订单类型(0-一般订单 2-拍卖订单 11-售后调货 15-返修发货 16-直接赔偿 21-POPFBP 22-POPSOP 23-POPLBP 24-POPLBV 25-POPSOPL 18-厂商直送 19-客服补件 42-通用合约 61-EPT订单 69-京东服务产品订单 19-客服补件 75-LOC订单 77-LSP订单 42-虚拟订单 88-总代订单 96-sop虚拟订单 100-提货卡订单 33-电子礼品卡 49-礼品卡 108-京东维修服务产品订单 131-X无人超市订单 142-企业店铺IBS订单 151-品牌门店线下订单 112-自营采购，以销定结 159-领货码订单 89-移动仓库订单 170-实体领货码订单 140-商家采购订单 193-scf订单 54-线下礼品卡订单 202-月卡订单 4-虚拟商品)
*/
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
/**
* 订单类型名称
*/
public String getOrderTypeName() {
return orderTypeName;
}
/**
* 订单类型名称
*/
public void setOrderTypeName(String orderTypeName) {
this.orderTypeName = orderTypeName;
}
/**
* 实付金额
*/
public BigDecimal getActualPayPrice() {
return actualPayPrice;
}
/**
* 实付金额
*/
public void setActualPayPrice(BigDecimal actualPayPrice) {
this.actualPayPrice = actualPayPrice;
}
/**
* 商品编号
*/
public Long getSkuId() {
return skuId;
}
/**
* 商品编号
*/
public void setSkuId(Long skuId) {
this.skuId = skuId;
}
/**
* 售后商品类型(10-申请主商品 20-申请的赠品 30-附件 40-发票 50-发票复印件 60-出检报告 70-包装 80-防损吊牌 90-贺卡 100-礼品购包装 110-loc订单验证码 120-服务产品标识)
*/
public Integer getWareType() {
return wareType;
}
/**
* 售后商品类型(10-申请主商品 20-申请的赠品 30-附件 40-发票 50-发票复印件 60-出检报告 70-包装 80-防损吊牌 90-贺卡 100-礼品购包装 110-loc订单验证码 120-服务产品标识)
*/
public void setWareType(Integer wareType) {
this.wareType = wareType;
}
/**
* 商品类型名称
*/
public String getWareTypeName() {
return wareTypeName;
}
/**
* 商品类型名称
*/
public void setWareTypeName(String wareTypeName) {
this.wareTypeName = wareTypeName;
}
/**
* 商品名称
*/
public String getWareName() {
return wareName;
}
/**
* 商品名称
*/
public void setWareName(String wareName) {
this.wareName = wareName;
}
/**
* 商品类型(1-单品 2-赠品套装中的主商品 3-赠品套装中的赠品 4-套装中的单品 5-套装中的赠品 6-加价购赠品 7-延保通 8-延保通赠品)
*/
public Integer getSkuType() {
return skuType;
}
/**
* 商品类型(1-单品 2-赠品套装中的主商品 3-赠品套装中的赠品 4-套装中的单品 5-套装中的赠品 6-加价购赠品 7-延保通 8-延保通赠品)
*/
public void setSkuType(Integer skuType) {
this.skuType = skuType;
}
/**
* skuType对应名称
*/
public String getSkuTypeName() {
return skuTypeName;
}
/**
* skuType对应名称
*/
public void setSkuTypeName(String skuTypeName) {
this.skuTypeName = skuTypeName;
}
/**
* 审核人账号
*/
public String getApprovePin() {
return approvePin;
}
/**
* 审核人账号
*/
public void setApprovePin(String approvePin) {
this.approvePin = approvePin;
}
/**
* 审核人姓名
*/
public String getApproveName() {
return approveName;
}
/**
* 审核人姓名
*/
public void setApproveName(String approveName) {
this.approveName = approveName;
}
/**
* 审核时间
*/
public Date getApproveTime() {
return approveTime;
}
/**
* 审核时间
*/
public void setApproveTime(Date approveTime) {
this.approveTime = approveTime;
}
/**
* 审核结果(11-直赔积分 12-直赔余额 13-直赔优惠卷 14-直赔京豆 21-直赔商品 22-上门换新 31-自营取件 32-客户送货 33-客户发货 34-闪电退款 35-虚拟退款 36-上门检测 37-客户送货至门店 38-保外维修 39-快递至门店 40-门店上门取件 80-大家电检测 81-大家电安装 82-大家电移机 83-大家电维修 84-大家电其它 85-闪电催收 86-上门维修 87-补发商品 91-退款不退货 92-预授权冻结 93-ACS换新 95-(超级体验店)门店换新 96-(超级体验店)主站换新 97-厂商维修-寄修 98-厂商维修-上门维修 99-厂商维修-送修 101-厂商大家电检测鉴定 102-厂商大家电安装 103-厂商大家电移机拆机 104-厂商大家电维修(上门维修) 105-厂商大家电拆机鉴定 106-换货 100-客户退货至团长 107-3c上门维修 108-增值服务 109-退货(筋斗云使用) 110-直赔(筋斗云使用) 111-上门检测取件)
*/
public Integer getApproveResult() {
return approveResult;
}
/**
* 审核结果(11-直赔积分 12-直赔余额 13-直赔优惠卷 14-直赔京豆 21-直赔商品 22-上门换新 31-自营取件 32-客户送货 33-客户发货 34-闪电退款 35-虚拟退款 36-上门检测 37-客户送货至门店 38-保外维修 39-快递至门店 40-门店上门取件 80-大家电检测 81-大家电安装 82-大家电移机 83-大家电维修 84-大家电其它 85-闪电催收 86-上门维修 87-补发商品 91-退款不退货 92-预授权冻结 93-ACS换新 95-(超级体验店)门店换新 96-(超级体验店)主站换新 97-厂商维修-寄修 98-厂商维修-上门维修 99-厂商维修-送修 101-厂商大家电检测鉴定 102-厂商大家电安装 103-厂商大家电移机拆机 104-厂商大家电维修(上门维修) 105-厂商大家电拆机鉴定 106-换货 100-客户退货至团长 107-3c上门维修 108-增值服务 109-退货(筋斗云使用) 110-直赔(筋斗云使用) 111-上门检测取件)
*/
public void setApproveResult(Integer approveResult) {
this.approveResult = approveResult;
}
/**
* 审核结果名称
*/
public String getApproveResultName() {
return approveResultName;
}
/**
* 审核结果名称
*/
public void setApproveResultName(String approveResultName) {
this.approveResultName = approveResultName;
}
/**
* 处理人账号
*/
public String getProcessPin() {
return processPin;
}
/**
* 处理人账号
*/
public void setProcessPin(String processPin) {
this.processPin = processPin;
}
/**
* 处理人姓名
*/
public String getProcessName() {
return processName;
}
/**
* 处理人姓名
*/
public void setProcessName(String processName) {
this.processName = processName;
}
/**
* 处理时间
*/
public Date getProcessTime() {
return processTime;
}
/**
* 处理时间
*/
public void setProcessTime(Date processTime) {
this.processTime = processTime;
}
/**
* 处理结果(0-初始化 1-安装完成 2-维修完成 3-检测完成 4-拆机完成 5-咨询解释 6-取消 70-原返 80-换货 100-赔付)
*/
public Integer getProcessResult() {
return processResult;
}
/**
* 处理结果(0-初始化 1-安装完成 2-维修完成 3-检测完成 4-拆机完成 5-咨询解释 6-取消 70-原返 80-换货 100-赔付)
*/
public void setProcessResult(Integer processResult) {
this.processResult = processResult;
}
/**
* 处理结果名称
*/
public String getProcessResultName() {
return processResultName;
}
/**
* 处理结果名称
*/
public void setProcessResultName(String processResultName) {
this.processResultName = processResultName;
}
/**
* 平台来源
*/
public Integer getPlatformSrc() {
return platformSrc;
}
/**
* 平台来源
*/
public void setPlatformSrc(Integer platformSrc) {
this.platformSrc = platformSrc;
}
/**
* 平台来源名称
*/
public String getPlatformSrcName() {
return platformSrcName;
}
/**
* 平台来源名称
*/
public void setPlatformSrcName(String platformSrcName) {
this.platformSrcName = platformSrcName;
}
/**
* 服务单售后数量
*/
public Integer getServiceCount() {
return serviceCount;
}
/**
* 服务单售后数量
*/
public void setServiceCount(Integer serviceCount) {
this.serviceCount = serviceCount;
}
/**
* 用户电话
*/
public String getDesenCustomerTel() {
return desenCustomerTel;
}
/**
* 用户电话
*/
public void setDesenCustomerTel(String desenCustomerTel) {
this.desenCustomerTel = desenCustomerTel;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
JdOrderAfter other = (JdOrderAfter) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId()))
&& (this.getApplyId() == null ? other.getApplyId() == null : this.getApplyId().equals(other.getApplyId()))
&& (this.getServiceId() == null ? other.getServiceId() == null : this.getServiceId().equals(other.getServiceId()))
&& (this.getApplyTime() == null ? other.getApplyTime() == null : this.getApplyTime().equals(other.getApplyTime()))
&& (this.getCustomerExpect() == null ? other.getCustomerExpect() == null : this.getCustomerExpect().equals(other.getCustomerExpect()))
&& (this.getCustomerExpectName() == null ? other.getCustomerExpectName() == null : this.getCustomerExpectName().equals(other.getCustomerExpectName()))
&& (this.getServiceStatus() == null ? other.getServiceStatus() == null : this.getServiceStatus().equals(other.getServiceStatus()))
&& (this.getServiceStatusName() == null ? other.getServiceStatusName() == null : this.getServiceStatusName().equals(other.getServiceStatusName()))
&& (this.getCustomerPin() == null ? other.getCustomerPin() == null : this.getCustomerPin().equals(other.getCustomerPin()))
&& (this.getCustomerName() == null ? other.getCustomerName() == null : this.getCustomerName().equals(other.getCustomerName()))
&& (this.getCustomerTel() == null ? other.getCustomerTel() == null : this.getCustomerTel().equals(other.getCustomerTel()))
&& (this.getPickwareAddress() == null ? other.getPickwareAddress() == null : this.getPickwareAddress().equals(other.getPickwareAddress()))
&& (this.getPickwareType() == null ? other.getPickwareType() == null : this.getPickwareType().equals(other.getPickwareType()))
&& (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()))
&& (this.getOrderType() == null ? other.getOrderType() == null : this.getOrderType().equals(other.getOrderType()))
&& (this.getOrderTypeName() == null ? other.getOrderTypeName() == null : this.getOrderTypeName().equals(other.getOrderTypeName()))
&& (this.getActualPayPrice() == null ? other.getActualPayPrice() == null : this.getActualPayPrice().equals(other.getActualPayPrice()))
&& (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId()))
&& (this.getWareType() == null ? other.getWareType() == null : this.getWareType().equals(other.getWareType()))
&& (this.getWareTypeName() == null ? other.getWareTypeName() == null : this.getWareTypeName().equals(other.getWareTypeName()))
&& (this.getWareName() == null ? other.getWareName() == null : this.getWareName().equals(other.getWareName()))
&& (this.getSkuType() == null ? other.getSkuType() == null : this.getSkuType().equals(other.getSkuType()))
&& (this.getSkuTypeName() == null ? other.getSkuTypeName() == null : this.getSkuTypeName().equals(other.getSkuTypeName()))
&& (this.getApprovePin() == null ? other.getApprovePin() == null : this.getApprovePin().equals(other.getApprovePin()))
&& (this.getApproveName() == null ? other.getApproveName() == null : this.getApproveName().equals(other.getApproveName()))
&& (this.getApproveTime() == null ? other.getApproveTime() == null : this.getApproveTime().equals(other.getApproveTime()))
&& (this.getApproveResult() == null ? other.getApproveResult() == null : this.getApproveResult().equals(other.getApproveResult()))
&& (this.getApproveResultName() == null ? other.getApproveResultName() == null : this.getApproveResultName().equals(other.getApproveResultName()))
&& (this.getProcessPin() == null ? other.getProcessPin() == null : this.getProcessPin().equals(other.getProcessPin()))
&& (this.getProcessName() == null ? other.getProcessName() == null : this.getProcessName().equals(other.getProcessName()))
&& (this.getProcessTime() == null ? other.getProcessTime() == null : this.getProcessTime().equals(other.getProcessTime()))
&& (this.getProcessResult() == null ? other.getProcessResult() == null : this.getProcessResult().equals(other.getProcessResult()))
&& (this.getProcessResultName() == null ? other.getProcessResultName() == null : this.getProcessResultName().equals(other.getProcessResultName()))
&& (this.getPlatformSrc() == null ? other.getPlatformSrc() == null : this.getPlatformSrc().equals(other.getPlatformSrc()))
&& (this.getPlatformSrcName() == null ? other.getPlatformSrcName() == null : this.getPlatformSrcName().equals(other.getPlatformSrcName()))
&& (this.getServiceCount() == null ? other.getServiceCount() == null : this.getServiceCount().equals(other.getServiceCount()))
&& (this.getDesenCustomerTel() == null ? other.getDesenCustomerTel() == null : this.getDesenCustomerTel().equals(other.getDesenCustomerTel()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode());
result = prime * result + ((getApplyId() == null) ? 0 : getApplyId().hashCode());
result = prime * result + ((getServiceId() == null) ? 0 : getServiceId().hashCode());
result = prime * result + ((getApplyTime() == null) ? 0 : getApplyTime().hashCode());
result = prime * result + ((getCustomerExpect() == null) ? 0 : getCustomerExpect().hashCode());
result = prime * result + ((getCustomerExpectName() == null) ? 0 : getCustomerExpectName().hashCode());
result = prime * result + ((getServiceStatus() == null) ? 0 : getServiceStatus().hashCode());
result = prime * result + ((getServiceStatusName() == null) ? 0 : getServiceStatusName().hashCode());
result = prime * result + ((getCustomerPin() == null) ? 0 : getCustomerPin().hashCode());
result = prime * result + ((getCustomerName() == null) ? 0 : getCustomerName().hashCode());
result = prime * result + ((getCustomerTel() == null) ? 0 : getCustomerTel().hashCode());
result = prime * result + ((getPickwareAddress() == null) ? 0 : getPickwareAddress().hashCode());
result = prime * result + ((getPickwareType() == null) ? 0 : getPickwareType().hashCode());
result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode());
result = prime * result + ((getOrderType() == null) ? 0 : getOrderType().hashCode());
result = prime * result + ((getOrderTypeName() == null) ? 0 : getOrderTypeName().hashCode());
result = prime * result + ((getActualPayPrice() == null) ? 0 : getActualPayPrice().hashCode());
result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode());
result = prime * result + ((getWareType() == null) ? 0 : getWareType().hashCode());
result = prime * result + ((getWareTypeName() == null) ? 0 : getWareTypeName().hashCode());
result = prime * result + ((getWareName() == null) ? 0 : getWareName().hashCode());
result = prime * result + ((getSkuType() == null) ? 0 : getSkuType().hashCode());
result = prime * result + ((getSkuTypeName() == null) ? 0 : getSkuTypeName().hashCode());
result = prime * result + ((getApprovePin() == null) ? 0 : getApprovePin().hashCode());
result = prime * result + ((getApproveName() == null) ? 0 : getApproveName().hashCode());
result = prime * result + ((getApproveTime() == null) ? 0 : getApproveTime().hashCode());
result = prime * result + ((getApproveResult() == null) ? 0 : getApproveResult().hashCode());
result = prime * result + ((getApproveResultName() == null) ? 0 : getApproveResultName().hashCode());
result = prime * result + ((getProcessPin() == null) ? 0 : getProcessPin().hashCode());
result = prime * result + ((getProcessName() == null) ? 0 : getProcessName().hashCode());
result = prime * result + ((getProcessTime() == null) ? 0 : getProcessTime().hashCode());
result = prime * result + ((getProcessResult() == null) ? 0 : getProcessResult().hashCode());
result = prime * result + ((getProcessResultName() == null) ? 0 : getProcessResultName().hashCode());
result = prime * result + ((getPlatformSrc() == null) ? 0 : getPlatformSrc().hashCode());
result = prime * result + ((getPlatformSrcName() == null) ? 0 : getPlatformSrcName().hashCode());
result = prime * result + ((getServiceCount() == null) ? 0 : getServiceCount().hashCode());
result = prime * result + ((getDesenCustomerTel() == null) ? 0 : getDesenCustomerTel().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(", shopId=").append(shopId);
sb.append(", applyId=").append(applyId);
sb.append(", serviceId=").append(serviceId);
sb.append(", applyTime=").append(applyTime);
sb.append(", customerExpect=").append(customerExpect);
sb.append(", customerExpectName=").append(customerExpectName);
sb.append(", serviceStatus=").append(serviceStatus);
sb.append(", serviceStatusName=").append(serviceStatusName);
sb.append(", customerPin=").append(customerPin);
sb.append(", customerName=").append(customerName);
sb.append(", customerTel=").append(customerTel);
sb.append(", pickwareAddress=").append(pickwareAddress);
sb.append(", pickwareType=").append(pickwareType);
sb.append(", orderId=").append(orderId);
sb.append(", orderType=").append(orderType);
sb.append(", orderTypeName=").append(orderTypeName);
sb.append(", actualPayPrice=").append(actualPayPrice);
sb.append(", skuId=").append(skuId);
sb.append(", wareType=").append(wareType);
sb.append(", wareTypeName=").append(wareTypeName);
sb.append(", wareName=").append(wareName);
sb.append(", skuType=").append(skuType);
sb.append(", skuTypeName=").append(skuTypeName);
sb.append(", approvePin=").append(approvePin);
sb.append(", approveName=").append(approveName);
sb.append(", approveTime=").append(approveTime);
sb.append(", approveResult=").append(approveResult);
sb.append(", approveResultName=").append(approveResultName);
sb.append(", processPin=").append(processPin);
sb.append(", processName=").append(processName);
sb.append(", processTime=").append(processTime);
sb.append(", processResult=").append(processResult);
sb.append(", processResultName=").append(processResultName);
sb.append(", platformSrc=").append(platformSrc);
sb.append(", platformSrcName=").append(platformSrcName);
sb.append(", serviceCount=").append(serviceCount);
sb.append(", desenCustomerTel=").append(desenCustomerTel);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

307
oms-api/src/main/java/com/qihang/oms/domain/JdOrderItem.java
View File

@ -1,307 +0,0 @@
package com.qihang.oms.domain;
import java.io.Serializable;
/**
*
* @TableName jd_order_item
*/
public class JdOrderItem implements Serializable {
/**
*
*/
private Long id;
/**
* 外键id（jd_order表id）
*/
private Long orderId;
/**
* 京东内部SKU的ID
*/
private String skuId;
/**
* SKU外部ID（极端情况下不保证返回，建议从商品接口获取
*/
private String outerSkuId;
/**
* 商品的名称+SKU规格
*/
private String skuName;
/**
* SKU的京东价
*/
private String jdPrice;
/**
* 赠送积分
*/
private String giftPoint;
/**
* 京东内部商品ID（极端情况下不保证返回，建议从商品接口获取）
*/
private String wareId;
/**
* 数量
*/
private String itemTotal;
/**
*
*/
private String productNo;
/**
*
*/
private String serviceName;
/**
*
*/
private String newStoreId;
private static final long serialVersionUID = 1L;
/**
*
*/
public Long getId() {
return id;
}
/**
*
*/
public void setId(Long id) {
this.id = id;
}
/**
* 外键id（jd_order表id）
*/
public Long getOrderId() {
return orderId;
}
/**
* 外键id（jd_order表id）
*/
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
/**
* 京东内部SKU的ID
*/
public String getSkuId() {
return skuId;
}
/**
* 京东内部SKU的ID
*/
public void setSkuId(String skuId) {
this.skuId = skuId;
}
/**
* SKU外部ID（极端情况下不保证返回，建议从商品接口获取
*/
public String getOuterSkuId() {
return outerSkuId;
}
/**
* SKU外部ID（极端情况下不保证返回，建议从商品接口获取
*/
public void setOuterSkuId(String outerSkuId) {
this.outerSkuId = outerSkuId;
}
/**
* 商品的名称+SKU规格
*/
public String getSkuName() {
return skuName;
}
/**
* 商品的名称+SKU规格
*/
public void setSkuName(String skuName) {
this.skuName = skuName;
}
/**
* SKU的京东价
*/
public String getJdPrice() {
return jdPrice;
}
/**
* SKU的京东价
*/
public void setJdPrice(String jdPrice) {
this.jdPrice = jdPrice;
}
/**
* 赠送积分
*/
public String getGiftPoint() {
return giftPoint;
}
/**
* 赠送积分
*/
public void setGiftPoint(String giftPoint) {
this.giftPoint = giftPoint;
}
/**
* 京东内部商品ID（极端情况下不保证返回，建议从商品接口获取）
*/
public String getWareId() {
return wareId;
}
/**
* 京东内部商品ID（极端情况下不保证返回，建议从商品接口获取）
*/
public void setWareId(String wareId) {
this.wareId = wareId;
}
/**
* 数量
*/
public String getItemTotal() {
return itemTotal;
}
/**
* 数量
*/
public void setItemTotal(String itemTotal) {
this.itemTotal = itemTotal;
}
/**
*
*/
public String getProductNo() {
return productNo;
}
/**
*
*/
public void setProductNo(String productNo) {
this.productNo = productNo;
}
/**
*
*/
public String getServiceName() {
return serviceName;
}
/**
*
*/
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
/**
*
*/
public String getNewStoreId() {
return newStoreId;
}
/**
*
*/
public void setNewStoreId(String newStoreId) {
this.newStoreId = newStoreId;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
JdOrderItem other = (JdOrderItem) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()))
&& (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId()))
&& (this.getOuterSkuId() == null ? other.getOuterSkuId() == null : this.getOuterSkuId().equals(other.getOuterSkuId()))
&& (this.getSkuName() == null ? other.getSkuName() == null : this.getSkuName().equals(other.getSkuName()))
&& (this.getJdPrice() == null ? other.getJdPrice() == null : this.getJdPrice().equals(other.getJdPrice()))
&& (this.getGiftPoint() == null ? other.getGiftPoint() == null : this.getGiftPoint().equals(other.getGiftPoint()))
&& (this.getWareId() == null ? other.getWareId() == null : this.getWareId().equals(other.getWareId()))
&& (this.getItemTotal() == null ? other.getItemTotal() == null : this.getItemTotal().equals(other.getItemTotal()))
&& (this.getProductNo() == null ? other.getProductNo() == null : this.getProductNo().equals(other.getProductNo()))
&& (this.getServiceName() == null ? other.getServiceName() == null : this.getServiceName().equals(other.getServiceName()))
&& (this.getNewStoreId() == null ? other.getNewStoreId() == null : this.getNewStoreId().equals(other.getNewStoreId()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode());
result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode());
result = prime * result + ((getOuterSkuId() == null) ? 0 : getOuterSkuId().hashCode());
result = prime * result + ((getSkuName() == null) ? 0 : getSkuName().hashCode());
result = prime * result + ((getJdPrice() == null) ? 0 : getJdPrice().hashCode());
result = prime * result + ((getGiftPoint() == null) ? 0 : getGiftPoint().hashCode());
result = prime * result + ((getWareId() == null) ? 0 : getWareId().hashCode());
result = prime * result + ((getItemTotal() == null) ? 0 : getItemTotal().hashCode());
result = prime * result + ((getProductNo() == null) ? 0 : getProductNo().hashCode());
result = prime * result + ((getServiceName() == null) ? 0 : getServiceName().hashCode());
result = prime * result + ((getNewStoreId() == null) ? 0 : getNewStoreId().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(", orderId=").append(orderId);
sb.append(", skuId=").append(skuId);
sb.append(", outerSkuId=").append(outerSkuId);
sb.append(", skuName=").append(skuName);
sb.append(", jdPrice=").append(jdPrice);
sb.append(", giftPoint=").append(giftPoint);
sb.append(", wareId=").append(wareId);
sb.append(", itemTotal=").append(itemTotal);
sb.append(", productNo=").append(productNo);
sb.append(", serviceName=").append(serviceName);
sb.append(", newStoreId=").append(newStoreId);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

285
oms-api/src/main/java/com/qihang/oms/domain/JdRefund.java
View File

@ -1,285 +0,0 @@
package com.qihang.oms.domain;
import java.io.Serializable;
/**
*
* @TableName jd_refund
*/
public class JdRefund implements Serializable {
/**
*
*/
private Long id;
/**
* 店铺id
*/
private Integer shopId;
/**
* 退款单id
*/
private String refundId;
/**
* 客户帐号
*/
private String buyerId;
/**
* 客户姓名
*/
private String buyerName;
/**
* 审核日期
*/
private String checkTime;
/**
* 申请时间
*/
private String applyTime;
/**
* 退款金额
*/
private String applyRefundSum;
/**
* 审核状态: 0代表未审核， 1代表审核通过 2代表审核不通过 3代表京东财务审核通过；4代表京东财务审核不通过
*/
private String status;
/**
* 审核人
*/
private String checkUsername;
/**
* 订单号
*/
private String orderId;
private static final long serialVersionUID = 1L;
/**
*
*/
public Long getId() {
return id;
}
/**
*
*/
public void setId(Long id) {
this.id = id;
}
/**
* 店铺id
*/
public Integer getShopId() {
return shopId;
}
/**
* 店铺id
*/
public void setShopId(Integer shopId) {
this.shopId = shopId;
}
/**
* 退款单id
*/
public String getRefundId() {
return refundId;
}
/**
* 退款单id
*/
public void setRefundId(String refundId) {
this.refundId = refundId;
}
/**
* 客户帐号
*/
public String getBuyerId() {
return buyerId;
}
/**
* 客户帐号
*/
public void setBuyerId(String buyerId) {
this.buyerId = buyerId;
}
/**
* 客户姓名
*/
public String getBuyerName() {
return buyerName;
}
/**
* 客户姓名
*/
public void setBuyerName(String buyerName) {
this.buyerName = buyerName;
}
/**
* 审核日期
*/
public String getCheckTime() {
return checkTime;
}
/**
* 审核日期
*/
public void setCheckTime(String checkTime) {
this.checkTime = checkTime;
}
/**
* 申请时间
*/
public String getApplyTime() {
return applyTime;
}
/**
* 申请时间
*/
public void setApplyTime(String applyTime) {
this.applyTime = applyTime;
}
/**
* 退款金额
*/
public String getApplyRefundSum() {
return applyRefundSum;
}
/**
* 退款金额
*/
public void setApplyRefundSum(String applyRefundSum) {
this.applyRefundSum = applyRefundSum;
}
/**
* 审核状态: 0代表未审核， 1代表审核通过 2代表审核不通过 3代表京东财务审核通过；4代表京东财务审核不通过
*/
public String getStatus() {
return status;
}
/**
* 审核状态: 0代表未审核， 1代表审核通过 2代表审核不通过 3代表京东财务审核通过；4代表京东财务审核不通过
*/
public void setStatus(String status) {
this.status = status;
}
/**
* 审核人
*/
public String getCheckUsername() {
return checkUsername;
}
/**
* 审核人
*/
public void setCheckUsername(String checkUsername) {
this.checkUsername = checkUsername;
}
/**
* 订单号
*/
public String getOrderId() {
return orderId;
}
/**
* 订单号
*/
public void setOrderId(String orderId) {
this.orderId = orderId;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
JdRefund other = (JdRefund) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId()))
&& (this.getRefundId() == null ? other.getRefundId() == null : this.getRefundId().equals(other.getRefundId()))
&& (this.getBuyerId() == null ? other.getBuyerId() == null : this.getBuyerId().equals(other.getBuyerId()))
&& (this.getBuyerName() == null ? other.getBuyerName() == null : this.getBuyerName().equals(other.getBuyerName()))
&& (this.getCheckTime() == null ? other.getCheckTime() == null : this.getCheckTime().equals(other.getCheckTime()))
&& (this.getApplyTime() == null ? other.getApplyTime() == null : this.getApplyTime().equals(other.getApplyTime()))
&& (this.getApplyRefundSum() == null ? other.getApplyRefundSum() == null : this.getApplyRefundSum().equals(other.getApplyRefundSum()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCheckUsername() == null ? other.getCheckUsername() == null : this.getCheckUsername().equals(other.getCheckUsername()))
&& (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode());
result = prime * result + ((getRefundId() == null) ? 0 : getRefundId().hashCode());
result = prime * result + ((getBuyerId() == null) ? 0 : getBuyerId().hashCode());
result = prime * result + ((getBuyerName() == null) ? 0 : getBuyerName().hashCode());
result = prime * result + ((getCheckTime() == null) ? 0 : getCheckTime().hashCode());
result = prime * result + ((getApplyTime() == null) ? 0 : getApplyTime().hashCode());
result = prime * result + ((getApplyRefundSum() == null) ? 0 : getApplyRefundSum().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCheckUsername() == null) ? 0 : getCheckUsername().hashCode());
result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().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(", shopId=").append(shopId);
sb.append(", refundId=").append(refundId);
sb.append(", buyerId=").append(buyerId);
sb.append(", buyerName=").append(buyerName);
sb.append(", checkTime=").append(checkTime);
sb.append(", applyTime=").append(applyTime);
sb.append(", applyRefundSum=").append(applyRefundSum);
sb.append(", status=").append(status);
sb.append(", checkUsername=").append(checkUsername);
sb.append(", orderId=").append(orderId);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

105
oms-api/src/main/java/com/qihang/oms/domain/OmsJdGoodsSku.java Normal file
View File

@ -0,0 +1,105 @@
package com.qihang.oms.domain;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
/**
* 京东商品SKU表
* @TableName oms_jd_goods_sku
*/
@Data
public class OmsJdGoodsSku implements Serializable {
/**
*
*/
private Long id;
/**
* 店铺id
*/
private Long shopId;
/**
* 商品id
*/
private Long wareId;
/**
* skuid
*/
private Long skuId;
/**
* 状态
*/
private Integer status;
/**
*
*/
private BigDecimal jdPrice;
/**
*
*/
private String outerId;
/**
*
*/
private String barCode;
/**
*
*/
private String logo;
/**
*
*/
private String saleAttrs;
/**
* sku属性名称
*/
private String attrs;
/**
*
*/
private String skuName;
/**
*
*/
private Integer stockNum;
/**
*
*/
private Date modified;
/**
*
*/
private Date created;
/**
*
*/
private String currencySpuId;
/**
* erp商品id
*/
private Long erpGoodsId;
/**
* erp商品sku id
*/
private Long erpGoodsSkuId;
private static final long serialVersionUID = 1L;
}

264
oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrder.java Normal file
View File

@ -0,0 +1,264 @@
package com.qihang.oms.domain;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 京东订单表
* @TableName oms_jd_order
*/
@Data
public class OmsJdOrder implements Serializable {
/**
*
*/
private Long id;
/**
* 店铺id
*/
private Integer shopId;
/**
* 订单id（京东平台）
*/
private String orderId;
/**
* 商家id
*/
private String venderId;
/**
* 订单类型（22 SOP；75 LOC） 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String orderType;
/**
* 支付方式（1货到付款, 2邮局汇款, 3自提, 4在线支付, 5公司转账, 6银行卡转账）
*/
private String payType;
/**
* 订单总金额。总金额=订单金额（不减优惠，不加运费服务费税费）
*/
private String orderTotalPrice;
/**
* 订单货款金额（订单总金额-商家优惠金额）
*/
private String orderSellerPrice;
/**
* 用户应付金额。应付款=货款-用户优惠-余额+运费+税费+服务费。
*/
private String orderPayment;
/**
* 商品的运费
*/
private String freightPrice;
/**
* 商家优惠金额
*/
private String sellerDiscount;
/**
* 1）WAIT_SELLER_STOCK_OUT 等待出库 2）WAIT_GOODS_RECEIVE_CONFIRM 等待确认收货 3）WAIT_SELLER_DELIVERY等待发货（只适用于海外购商家，含义为'等待境内发货'标签下的订单,非海外购商家无需使用） 4) POP_ORDER_PAUSE POP暂停 5）FINISHED_L 完成 6）TRADE_CANCELED 取消 7）LOCKED 已锁定 8）WAIT_SEND_CODE 等待发码
*/
private String orderState;
/**
* 订单状态说明（中文）
*/
private String orderStateRemark;
/**
* 送货（日期）类型（1-只工作日送货(双休日、假日不用送);2-只双休日、假日送货(工作日不用送);3-工作日、双休日与假日均可送货;其他值-返回“任意时间”）
*/
private String deliveryType;
/**
* 发票信息 “invoice_info: 不需要开具发票”下无需开具发票；其它返回值请正常开具发票 。（没有电子发票具体信息）
*/
private String invoiceInfo;
/**
* 普通发票纳税人识别码
*/
private String invoiceCode;
/**
* 买家下单时订单备注
*/
private String orderRemark;
/**
* 下单时间
*/
private String orderStartTime;
/**
* 结单时间 如返回信息为“0001-01-01 00:00:00”和“1970-01-01 00:00:00”，可认为此订单为未完成状态。
*/
private String orderEndTime;
/**
* 姓名
*/
private String fullname;
/**
* 固定电话
*/
private String telephone;
/**
* 手机
*/
private String mobile;
/**
* 地址
*/
private String fullAddress;
/**
*
*/
private String province;
/**
*
*/
private String city;
/**
*
*/
private String county;
/**
*
*/
private String town;
/**
*
*/
private String provinceId;
/**
*
*/
private String cityId;
/**
*
*/
private String countyId;
/**
*
*/
private String townId;
/**
* 商家订单备注（不大于500字符） 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String venderRemark;
/**
* 余额支付金额 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String balanceUsed;
/**
* 买家的账号信息
*/
private String pin;
/**
* 售后订单标记 0:不是换货订单 1返修发货,直接赔偿,客服补件 2售后调货 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String returnOrder;
/**
* 付款确认时间 如果没有付款时间 默认返回0001-01-01 00:00:00 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String paymentConfirmTime;
/**
* 运单号(当厂家自送时运单号可为空，不同物流公司的运单号用|分隔，如果同一物流公司有多个运单号，则用英文逗号分隔) 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String waybill;
/**
* 物流公司ID 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String logisticsId;
/**
* 订单更新时间
*/
private String modified;
/**
* 直接父订单号 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String directParentOrderId;
/**
* 根父订单号 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String parentOrderId;
/**
* 订单来源。如：移动端订单
*/
private String orderSource;
/**
* 京仓订单/云仓订单/空“”
*/
private String storeOrder;
/**
* 是否京配。68=京配，69=京配自提
*/
private String idSopShipmenttype;
/**
* 买家的账号信息(区分大小写) 可选字段，需要在输入参数optional_fields中写入才能返回
*/
private String realPin;
/**
* 买家的账号信息
*/
private String openId;
/**
* 买家的账号信息(区分大小写) 可选字段
*/
private String openIdBuyer;
/**
*
*/
private Date createTime;
/**
* 订单审核状态（0待审核1已审核）
*/
private Integer auditStatus;
/**
* 订单审核时间
*/
private Date auditTime;
private static final long serialVersionUID = 1L;
}

73
oms-api/src/main/java/com/qihang/oms/domain/OmsJdOrderItem.java Normal file
View File

@ -0,0 +1,73 @@
package com.qihang.oms.domain;
import java.io.Serializable;
import lombok.Data;
/**
* 京东订单明细表
* @TableName oms_jd_order_item
*/
@Data
public class OmsJdOrderItem implements Serializable {
/**
*
*/
private Long id;
/**
* 订单id（京东平台）
*/
private Long orderId;
/**
* 京东内部SKU的ID
*/
private String skuId;
/**
* SKU外部ID（极端情况下不保证返回，建议从商品接口获取
*/
private String outerSkuId;
/**
* 商品的名称+SKU规格
*/
private String skuName;
/**
* SKU的京东价
*/
private String jdPrice;
/**
* 赠送积分
*/
private String giftPoint;
/**
* 京东内部商品ID（极端情况下不保证返回，建议从商品接口获取）
*/
private String wareId;
/**
* 数量
*/
private String itemTotal;
/**
*
*/
private String productNo;
/**
*
*/
private String serviceName;
/**
*
*/
private String newStoreId;
private static final long serialVersionUID = 1L;
}

18
oms-api/src/main/java/com/qihang/oms/mapper/JdGoodsSkuMapper.java
View File

@ -1,18 +0,0 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.JdGoodsSku;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【jd_goods_sku】的数据库操作Mapper
* @createDate 2024-03-11 14:24:49
* @Entity com.qihang.oms.domain.JdGoodsSku
*/
public interface JdGoodsSkuMapper extends BaseMapper<JdGoodsSku> {
}

18
oms-api/src/main/java/com/qihang/oms/mapper/JdOrderAfterMapper.java
View File

@ -1,18 +0,0 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.JdOrderAfter;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【jd_order_after(京东售后)】的数据库操作Mapper
* @createDate 2024-03-11 14:24:49
* @Entity com.qihang.oms.domain.JdOrderAfter
*/
public interface JdOrderAfterMapper extends BaseMapper<JdOrderAfter> {
}

18
oms-api/src/main/java/com/qihang/oms/mapper/JdOrderItemMapper.java
View File

@ -1,18 +0,0 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.JdOrderItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【jd_order_item】的数据库操作Mapper
* @createDate 2024-03-11 14:24:49
* @Entity com.qihang.oms.domain.JdOrderItem
*/
public interface JdOrderItemMapper extends BaseMapper<JdOrderItem> {
}

18
oms-api/src/main/java/com/qihang/oms/mapper/JdOrderMapper.java
View File

@ -1,18 +0,0 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.JdOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【jd_order(京东订单表)】的数据库操作Mapper
* @createDate 2024-03-11 14:24:49
* @Entity com.qihang.oms.domain.JdOrder
*/
public interface JdOrderMapper extends BaseMapper<JdOrder> {
}

18
oms-api/src/main/java/com/qihang/oms/mapper/JdRefundMapper.java
View File

@ -1,18 +0,0 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.JdRefund;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【jd_refund】的数据库操作Mapper
* @createDate 2024-03-11 14:24:49
* @Entity com.qihang.oms.domain.JdRefund
*/
public interface JdRefundMapper extends BaseMapper<JdRefund> {
}

18
oms-api/src/main/java/com/qihang/oms/mapper/OmsJdGoodsSkuMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.OmsJdGoodsSku;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【oms_jd_goods_sku(京东商品SKU表)】的数据库操作Mapper
* @createDate 2024-06-13 16:21:55
* @Entity com.qihang.oms.domain.OmsJdGoodsSku
*/
public interface OmsJdGoodsSkuMapper extends BaseMapper<OmsJdGoodsSku> {
}

18
oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderItemMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.OmsJdOrderItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【oms_jd_order_item(京东订单明细表)】的数据库操作Mapper
* @createDate 2024-06-13 16:21:55
* @Entity com.qihang.oms.domain.OmsJdOrderItem
*/
public interface OmsJdOrderItemMapper extends BaseMapper<OmsJdOrderItem> {
}

18
oms-api/src/main/java/com/qihang/oms/mapper/OmsJdOrderMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.qihang.oms.mapper;
import com.qihang.oms.domain.OmsJdOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author TW
* @description 针对表【oms_jd_order(京东订单表)】的数据库操作Mapper
* @createDate 2024-06-13 16:21:55
* @Entity com.qihang.oms.domain.OmsJdOrder
*/
public interface OmsJdOrderMapper extends BaseMapper<OmsJdOrder> {
}

13
oms-api/src/main/java/com/qihang/oms/service/JdGoodsSkuService.java
View File

@ -1,13 +0,0 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.JdGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【jd_goods_sku】的数据库操作Service
* @createDate 2024-03-11 14:24:49
*/
public interface JdGoodsSkuService extends IService<JdGoodsSku> {
}

13
oms-api/src/main/java/com/qihang/oms/service/JdOrderAfterService.java
View File

@ -1,13 +0,0 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.JdOrderAfter;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【jd_order_after(京东售后)】的数据库操作Service
* @createDate 2024-03-11 14:24:49
*/
public interface JdOrderAfterService extends IService<JdOrderAfter> {
}

13
oms-api/src/main/java/com/qihang/oms/service/JdOrderItemService.java
View File

@ -1,13 +0,0 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.JdOrderItem;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【jd_order_item】的数据库操作Service
* @createDate 2024-03-11 14:24:49
*/
public interface JdOrderItemService extends IService<JdOrderItem> {
}

13
oms-api/src/main/java/com/qihang/oms/service/JdOrderService.java
View File

@ -1,13 +0,0 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.JdOrder;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【jd_order(京东订单表)】的数据库操作Service
* @createDate 2024-03-11 14:24:49
*/
public interface JdOrderService extends IService<JdOrder> {
}

13
oms-api/src/main/java/com/qihang/oms/service/JdRefundService.java
View File

@ -1,13 +0,0 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.JdRefund;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【jd_refund】的数据库操作Service
* @createDate 2024-03-11 14:24:49
*/
public interface JdRefundService extends IService<JdRefund> {
}

13
oms-api/src/main/java/com/qihang/oms/service/OmsJdGoodsSkuService.java Normal file
View File

@ -0,0 +1,13 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.OmsJdGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【oms_jd_goods_sku(京东商品SKU表)】的数据库操作Service
* @createDate 2024-06-13 16:21:55
*/
public interface OmsJdGoodsSkuService extends IService<OmsJdGoodsSku> {
}

13
oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderItemService.java Normal file
View File

@ -0,0 +1,13 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.OmsJdOrderItem;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【oms_jd_order_item(京东订单明细表)】的数据库操作Service
* @createDate 2024-06-13 16:21:55
*/
public interface OmsJdOrderItemService extends IService<OmsJdOrderItem> {
}

13
oms-api/src/main/java/com/qihang/oms/service/OmsJdOrderService.java Normal file
View File

@ -0,0 +1,13 @@
package com.qihang.oms.service;
import com.qihang.oms.domain.OmsJdOrder;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author TW
* @description 针对表【oms_jd_order(京东订单表)】的数据库操作Service
* @createDate 2024-06-13 16:21:55
*/
public interface OmsJdOrderService extends IService<OmsJdOrder> {
}

30
oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java
View File

@ -36,9 +36,9 @@ public class ErpSaleOrderServiceImpl extends ServiceImpl<ErpSaleOrderMapper, Erp
private final ErpSaleOrderMapper orderMapper;
private final ErpSaleOrderItemMapper orderItemMapper;
private final JdOrderMapper jdOrderMapper;
private final JdOrderItemMapper jdOrderItemMapper;
private final JdGoodsSkuMapper jdGoodsSkuMapper;
private final OmsJdOrderMapper jdOrderMapper;
private final OmsJdOrderItemMapper jdOrderItemMapper;
private final OmsJdGoodsSkuMapper jdGoodsSkuMapper;
private final OmsTaoOrderMapper taoOrderMapper;
private final OmsTaoOrderItemMapper taoOrderItemMapper;
private final OmsTaoGoodsSkuMapper taoGoodsSkuMapper;
@ -47,12 +47,12 @@ public class ErpSaleOrderServiceImpl extends ServiceImpl<ErpSaleOrderMapper, Erp
@Override
public ResultVo<Integer> jdOrderMessage(String orderId) {
log.info("京东订单消息处理"+orderId);
List<JdOrder> jdOrders = jdOrderMapper.selectList(new LambdaQueryWrapper<JdOrder>().eq(JdOrder::getOrderId, orderId));
List<OmsJdOrder> jdOrders = jdOrderMapper.selectList(new LambdaQueryWrapper<OmsJdOrder>().eq(OmsJdOrder::getOrderId, orderId));
if(jdOrders == null || jdOrders.size() == 0) {
// 没有找到订单信息
return ResultVo.error(ResultVoEnum.NotFound,"没有找到JD订单："+orderId);
}
JdOrder jdOrder = jdOrders.get(0);
OmsJdOrder jdOrder = jdOrders.get(0);
List<ErpSaleOrder> oOrders = orderMapper.selectList(new LambdaQueryWrapper<ErpSaleOrder>().eq(ErpSaleOrder::getOrderNum, orderId));
if(oOrders == null || oOrders.isEmpty()) {
@ -77,6 +77,16 @@ public class ErpSaleOrderServiceImpl extends ServiceImpl<ErpSaleOrderMapper, Erp
double orderSellerPrice = StringUtils.isEmpty(jdOrder.getOrderSellerPrice()) ? 0.0 : Double.parseDouble(jdOrder.getOrderSellerPrice());
double freightPrice = StringUtils.isEmpty(jdOrder.getFreightPrice()) ? 0.0 : Double.parseDouble(jdOrder.getFreightPrice());
insert.setAmount(orderSellerPrice + freightPrice);
try {
insert.setPostage(org.springframework.util.StringUtils.hasText(jdOrder.getFreightPrice())?Double.parseDouble(jdOrder.getFreightPrice()):0.0);
}catch (Exception e){
insert.setPostage(0.0);
}
try {
insert.setDiscountAmount(org.springframework.util.StringUtils.hasText(jdOrder.getSellerDiscount())?Double.parseDouble(jdOrder.getSellerDiscount()):0.0);
}catch (Exception e){
insert.setDiscountAmount(0.0);
}
insert.setReceiverName(jdOrder.getFullname());
insert.setReceiverPhone(jdOrder.getMobile());
insert.setAddress(jdOrder.getFullAddress());
@ -90,7 +100,9 @@ public class ErpSaleOrderServiceImpl extends ServiceImpl<ErpSaleOrderMapper, Erp
insert.setCreateBy("ORDER_MESSAGE");
orderMapper.insert(insert);
List<JdOrderItem> jdOrderItems = jdOrderItemMapper.selectList(new LambdaQueryWrapper<JdOrderItem>().eq(JdOrderItem::getOrderId, jdOrder.getId()));
List<OmsJdOrderItem> jdOrderItems = jdOrderItemMapper.selectList(
new LambdaQueryWrapper<OmsJdOrderItem>().eq(OmsJdOrderItem::getOrderId, jdOrder.getOrderId()));
if(jdOrderItems!=null && jdOrderItems.size()>0) {
for (var item : jdOrderItems) {
ErpSaleOrderItem orderItem = new ErpSaleOrderItem();
@ -102,10 +114,10 @@ public class ErpSaleOrderServiceImpl extends ServiceImpl<ErpSaleOrderMapper, Erp
Long erpGoodsId = 0L;
Long erpSkuId = 0L;
List<JdGoodsSku> jdGoodsSkus = jdGoodsSkuMapper.selectList(new LambdaQueryWrapper<JdGoodsSku>().eq(JdGoodsSku::getSkuId, item.getSkuId()));
List<OmsJdGoodsSku> jdGoodsSkus = jdGoodsSkuMapper.selectList(new LambdaQueryWrapper<OmsJdGoodsSku>().eq(OmsJdGoodsSku::getSkuId, item.getSkuId()));
if (jdGoodsSkus != null && !jdGoodsSkus.isEmpty()) {
erpGoodsId = jdGoodsSkus.get(0).getErpGoodsId();
erpSkuId = jdGoodsSkus.get(0).getErpSkuId();
erpSkuId = jdGoodsSkus.get(0).getErpGoodsSkuId();
orderItem.setGoodsImg(jdGoodsSkus.get(0).getLogo());
orderItem.setGoodsSpec(jdGoodsSkus.get(0).getSaleAttrs());
orderItem.setSpecNum(jdGoodsSkus.get(0).getOuterId());
@ -127,6 +139,8 @@ public class ErpSaleOrderServiceImpl extends ServiceImpl<ErpSaleOrderMapper, Erp
orderItem.setRefundStatus(1);
orderItem.setRefundCount(0);
}
orderItem.setShopId(jdOrder.getShopId());
orderItem.setShipStatus(0);
orderItem.setCreateTime(new Date());
orderItem.setCreateBy("ORDER_MESSAGE");
orderItemMapper.insert(orderItem);

22
oms-api/src/main/java/com/qihang/oms/service/impl/JdGoodsSkuServiceImpl.java
View File

@ -1,22 +0,0 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.JdGoodsSku;
import com.qihang.oms.service.JdGoodsSkuService;
import com.qihang.oms.mapper.JdGoodsSkuMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【jd_goods_sku】的数据库操作Service实现
* @createDate 2024-03-11 14:24:49
*/
@Service
public class JdGoodsSkuServiceImpl extends ServiceImpl<JdGoodsSkuMapper, JdGoodsSku>
implements JdGoodsSkuService{
}

22
oms-api/src/main/java/com/qihang/oms/service/impl/JdOrderAfterServiceImpl.java
View File

@ -1,22 +0,0 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.JdOrderAfter;
import com.qihang.oms.service.JdOrderAfterService;
import com.qihang.oms.mapper.JdOrderAfterMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【jd_order_after(京东售后)】的数据库操作Service实现
* @createDate 2024-03-11 14:24:49
*/
@Service
public class JdOrderAfterServiceImpl extends ServiceImpl<JdOrderAfterMapper, JdOrderAfter>
implements JdOrderAfterService{
}

22
oms-api/src/main/java/com/qihang/oms/service/impl/JdOrderItemServiceImpl.java
View File

@ -1,22 +0,0 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.JdOrderItem;
import com.qihang.oms.service.JdOrderItemService;
import com.qihang.oms.mapper.JdOrderItemMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【jd_order_item】的数据库操作Service实现
* @createDate 2024-03-11 14:24:49
*/
@Service
public class JdOrderItemServiceImpl extends ServiceImpl<JdOrderItemMapper, JdOrderItem>
implements JdOrderItemService{
}

22
oms-api/src/main/java/com/qihang/oms/service/impl/JdOrderServiceImpl.java
View File

@ -1,22 +0,0 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.JdOrder;
import com.qihang.oms.service.JdOrderService;
import com.qihang.oms.mapper.JdOrderMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【jd_order(京东订单表)】的数据库操作Service实现
* @createDate 2024-03-11 14:24:49
*/
@Service
public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder>
implements JdOrderService{
}

22
oms-api/src/main/java/com/qihang/oms/service/impl/JdRefundServiceImpl.java
View File

@ -1,22 +0,0 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.JdRefund;
import com.qihang.oms.service.JdRefundService;
import com.qihang.oms.mapper.JdRefundMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【jd_refund】的数据库操作Service实现
* @createDate 2024-03-11 14:24:49
*/
@Service
public class JdRefundServiceImpl extends ServiceImpl<JdRefundMapper, JdRefund>
implements JdRefundService{
}

22
oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdGoodsSkuServiceImpl.java Normal file
View File

@ -0,0 +1,22 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.OmsJdGoodsSku;
import com.qihang.oms.service.OmsJdGoodsSkuService;
import com.qihang.oms.mapper.OmsJdGoodsSkuMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【oms_jd_goods_sku(京东商品SKU表)】的数据库操作Service实现
* @createDate 2024-06-13 16:21:55
*/
@Service
public class OmsJdGoodsSkuServiceImpl extends ServiceImpl<OmsJdGoodsSkuMapper, OmsJdGoodsSku>
implements OmsJdGoodsSkuService{
}

22
oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderItemServiceImpl.java Normal file
View File

@ -0,0 +1,22 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.OmsJdOrderItem;
import com.qihang.oms.service.OmsJdOrderItemService;
import com.qihang.oms.mapper.OmsJdOrderItemMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【oms_jd_order_item(京东订单明细表)】的数据库操作Service实现
* @createDate 2024-06-13 16:21:55
*/
@Service
public class OmsJdOrderItemServiceImpl extends ServiceImpl<OmsJdOrderItemMapper, OmsJdOrderItem>
implements OmsJdOrderItemService{
}

22
oms-api/src/main/java/com/qihang/oms/service/impl/OmsJdOrderServiceImpl.java Normal file
View File

@ -0,0 +1,22 @@
package com.qihang.oms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.qihang.oms.domain.OmsJdOrder;
import com.qihang.oms.service.OmsJdOrderService;
import com.qihang.oms.mapper.OmsJdOrderMapper;
import org.springframework.stereotype.Service;
/**
* @author TW
* @description 针对表【oms_jd_order(京东订单表)】的数据库操作Service实现
* @createDate 2024-06-13 16:21:55
*/
@Service
public class OmsJdOrderServiceImpl extends ServiceImpl<OmsJdOrderMapper, OmsJdOrder>
implements OmsJdOrderService{
}

63
oms-api/src/main/resources/mapper/JdOrderAfterMapper.xml
View File

@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qihang.oms.mapper.JdOrderAfterMapper">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.JdOrderAfter">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="INTEGER"/>
<result property="applyId" column="apply_id" jdbcType="BIGINT"/>
<result property="serviceId" column="service_id" jdbcType="BIGINT"/>
<result property="applyTime" column="apply_time" jdbcType="TIMESTAMP"/>
<result property="customerExpect" column="customer_expect" jdbcType="INTEGER"/>
<result property="customerExpectName" column="customer_expect_name" jdbcType="VARCHAR"/>
<result property="serviceStatus" column="service_status" jdbcType="INTEGER"/>
<result property="serviceStatusName" column="service_status_name" jdbcType="VARCHAR"/>
<result property="customerPin" column="customer_pin" jdbcType="VARCHAR"/>
<result property="customerName" column="customer_name" jdbcType="VARCHAR"/>
<result property="customerTel" column="customer_tel" jdbcType="VARCHAR"/>
<result property="pickwareAddress" column="pickware_address" jdbcType="VARCHAR"/>
<result property="pickwareType" column="pickware_type" jdbcType="INTEGER"/>
<result property="orderId" column="order_id" jdbcType="BIGINT"/>
<result property="orderType" column="order_type" jdbcType="INTEGER"/>
<result property="orderTypeName" column="order_type_name" jdbcType="VARCHAR"/>
<result property="actualPayPrice" column="actual_pay_price" jdbcType="DECIMAL"/>
<result property="skuId" column="sku_id" jdbcType="BIGINT"/>
<result property="wareType" column="ware_type" jdbcType="INTEGER"/>
<result property="wareTypeName" column="ware_type_name" jdbcType="VARCHAR"/>
<result property="wareName" column="ware_name" jdbcType="VARCHAR"/>
<result property="skuType" column="sku_type" jdbcType="INTEGER"/>
<result property="skuTypeName" column="sku_type_name" jdbcType="VARCHAR"/>
<result property="approvePin" column="approve_pin" jdbcType="VARCHAR"/>
<result property="approveName" column="approve_name" jdbcType="VARCHAR"/>
<result property="approveTime" column="approve_time" jdbcType="TIMESTAMP"/>
<result property="approveResult" column="approve_result" jdbcType="INTEGER"/>
<result property="approveResultName" column="approve_result_name" jdbcType="VARCHAR"/>
<result property="processPin" column="process_pin" jdbcType="VARCHAR"/>
<result property="processName" column="process_name" jdbcType="VARCHAR"/>
<result property="processTime" column="process_time" jdbcType="TIMESTAMP"/>
<result property="processResult" column="process_result" jdbcType="INTEGER"/>
<result property="processResultName" column="process_result_name" jdbcType="VARCHAR"/>
<result property="platformSrc" column="platform_src" jdbcType="INTEGER"/>
<result property="platformSrcName" column="platform_src_name" jdbcType="VARCHAR"/>
<result property="serviceCount" column="service_count" jdbcType="INTEGER"/>
<result property="desenCustomerTel" column="desen_customer_tel" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,shop_id,apply_id,
service_id,apply_time,customer_expect,
customer_expect_name,service_status,service_status_name,
customer_pin,customer_name,customer_tel,
pickware_address,pickware_type,order_id,
order_type,order_type_name,actual_pay_price,
sku_id,ware_type,ware_type_name,
ware_name,sku_type,sku_type_name,
approve_pin,approve_name,approve_time,
approve_result,approve_result_name,process_pin,
process_name,process_time,process_result,
process_result_name,platform_src,platform_src_name,
service_count,desen_customer_tel
</sql>
</mapper>

27
oms-api/src/main/resources/mapper/JdRefundMapper.xml
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qihang.oms.mapper.JdRefundMapper">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.JdRefund">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="INTEGER"/>
<result property="refundId" column="refund_id" jdbcType="VARCHAR"/>
<result property="buyerId" column="buyer_id" jdbcType="VARCHAR"/>
<result property="buyerName" column="buyer_name" jdbcType="VARCHAR"/>
<result property="checkTime" column="check_time" jdbcType="VARCHAR"/>
<result property="applyTime" column="apply_time" jdbcType="VARCHAR"/>
<result property="applyRefundSum" column="apply_refund_sum" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="VARCHAR"/>
<result property="checkUsername" column="check_username" jdbcType="VARCHAR"/>
<result property="orderId" column="order_id" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,shop_id,refund_id,
buyer_id,buyer_name,check_time,
apply_time,apply_refund_sum,status,
check_username,order_id
</sql>
</mapper>

16
oms-api/src/main/resources/mapper/JdGoodsSkuMapper.xml → oms-api/src/main/resources/mapper/OmsJdGoodsSkuMapper.xml
View File

@ -2,11 +2,11 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qihang.oms.mapper.JdGoodsSkuMapper">
<mapper namespace="com.qihang.oms.mapper.OmsJdGoodsSkuMapper">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.JdGoodsSku">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.OmsJdGoodsSku">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="BIGINT"/>
<result property="wareId" column="ware_id" jdbcType="BIGINT"/>
<result property="skuId" column="sku_id" jdbcType="BIGINT"/>
<result property="status" column="status" jdbcType="INTEGER"/>
@ -22,15 +22,15 @@
<result property="created" column="created" jdbcType="TIMESTAMP"/>
<result property="currencySpuId" column="currency_spu_id" jdbcType="VARCHAR"/>
<result property="erpGoodsId" column="erp_goods_id" jdbcType="BIGINT"/>
<result property="erpSkuId" column="erp_sku_id" jdbcType="BIGINT"/>
<result property="erpGoodsSkuId" column="erp_goods_sku_id" jdbcType="BIGINT"/>
</resultMap>
<sql id="Base_Column_List">
id,goods_id,ware_id,
id,shop_id,ware_id,
sku_id,status,jd_price,
outer_id,bar_code,logo,
sale_attrs,sku_name,stock_num,
modified,created,currency_spu_id,
erp_goods_id,erp_sku_id
sale_attrs,attrs,sku_name,
stock_num,modified,created,
currency_spu_id,erp_goods_id,erp_goods_sku_id
</sql>
</mapper>

4
oms-api/src/main/resources/mapper/JdOrderItemMapper.xml → oms-api/src/main/resources/mapper/OmsJdOrderItemMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qihang.oms.mapper.JdOrderItemMapper">
<mapper namespace="com.qihang.oms.mapper.OmsJdOrderItemMapper">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.JdOrderItem">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.OmsJdOrderItem">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="orderId" column="order_id" jdbcType="BIGINT"/>
<result property="skuId" column="sku_id" jdbcType="VARCHAR"/>

9
oms-api/src/main/resources/mapper/JdOrderMapper.xml → oms-api/src/main/resources/mapper/OmsJdOrderMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qihang.oms.mapper.JdOrderMapper">
<mapper namespace="com.qihang.oms.mapper.OmsJdOrderMapper">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.JdOrder">
<resultMap id="BaseResultMap" type="com.qihang.oms.domain.OmsJdOrder">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="INTEGER"/>
<result property="orderId" column="order_id" jdbcType="VARCHAR"/>
@ -53,6 +53,8 @@
<result property="openId" column="open_id" jdbcType="VARCHAR"/>
<result property="openIdBuyer" column="open_id_buyer" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="auditStatus" column="audit_status" jdbcType="INTEGER"/>
<result property="auditTime" column="audit_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
@ -71,6 +73,7 @@
waybill,logistics_id,modified,
direct_parent_order_id,parent_order_id,order_source,
store_order,id_sop_shipmenttype,real_pin,
open_id,open_id_buyer,create_time
open_id,open_id_buyer,create_time,
audit_status,audit_time
</sql>
</mapper>

11
open-api/jd-api/src/main/java/com/qihang/jd/controller/OrderApiController.java
View File

@ -3,6 +3,7 @@ package com.qihang.jd.controller;
import cn.qihangerp.open.jd.OrderApiHelper;
import cn.qihangerp.open.jd.common.ApiResultVo;
import cn.qihangerp.open.jd.model.OrderInfo;
import com.alibaba.fastjson2.JSONObject;
import com.qihang.common.common.AjaxResult;
import com.qihang.common.common.ResultVoEnum;
import com.qihang.common.enums.EnumShopType;
@ -21,6 +22,7 @@ import com.qihang.jd.service.SysShopPullLasttimeService;
import com.qihang.jd.service.SysShopPullLogsService;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@ -37,10 +39,11 @@ import java.util.List;
public class OrderApiController {
private final ApiCommon apiCommon;
// private final RedisCache redisCache;
private final MqUtils mqUtils;
// private final MqUtils mqUtils;
private final OmsJdOrderService orderService;
private final SysShopPullLasttimeService pullLasttimeService;
private final SysShopPullLogsService pullLogsService;
private final KafkaTemplate<String,Object> kafkaTemplate;
@RequestMapping(value = "/pull_order_jd", method = RequestMethod.POST)
public AjaxResult pullList(@RequestBody PullRequest params) throws Exception {
@ -107,10 +110,12 @@ public class OrderApiController {
if (result.getCode() == ResultVoEnum.DataExist.getIndex()) {
//已经存在
hasExistOrder++;
mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD,MqType.ORDER_MESSAGE,order.getOrderId()));
kafkaTemplate.send(MqType.ORDER_MQ, JSONObject.toJSONString(MqMessage.build(EnumShopType.JD, MqType.ORDER_MESSAGE,order.getOrderId())));
// mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD,MqType.ORDER_MESSAGE,order.getOrderId()));
} else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
insertSuccess++;
mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD,MqType.ORDER_MESSAGE,order.getOrderId()));
kafkaTemplate.send(MqType.ORDER_MQ, JSONObject.toJSONString(MqMessage.build(EnumShopType.JD, MqType.ORDER_MESSAGE,order.getOrderId())));
// mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD,MqType.ORDER_MESSAGE,order.getOrderId()));
} else {
totalError++;
}

8
open-api/jd-api/src/main/java/com/qihang/jd/controller/OrderController.java
View File

@ -1,5 +1,6 @@
package com.qihang.jd.controller;
import com.alibaba.fastjson2.JSONObject;
import com.qihang.common.common.AjaxResult;
import com.qihang.common.common.PageQuery;
import com.qihang.common.common.PageResult;
@ -14,6 +15,7 @@ import com.qihang.jd.domain.bo.JdOrderPushBo;
import com.qihang.jd.service.OmsJdOrderService;
import com.qihang.security.common.BaseController;
import lombok.AllArgsConstructor;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.web.bind.annotation.*;
@AllArgsConstructor
@ -21,7 +23,8 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/order")
public class OrderController extends BaseController {
private final OmsJdOrderService orderService;
private final MqUtils mqUtils;
// private final MqUtils mqUtils;
private final KafkaTemplate<String,Object> kafkaTemplate;
@RequestMapping(value = "/list", method = RequestMethod.GET)
public TableDataInfo orderList(JdOrderBo bo, PageQuery pageQuery) {
PageResult<OmsJdOrder> result = orderService.queryPageList(bo, pageQuery);
@ -34,7 +37,8 @@ public class OrderController extends BaseController {
// TODO:需要优化消息格式
if(bo!=null && bo.getIds()!=null) {
for(String id: bo.getIds()) {
mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD, MqType.ORDER_MESSAGE, id));
kafkaTemplate.send(MqType.ORDER_MQ, JSONObject.toJSONString(MqMessage.build(EnumShopType.JD, MqType.ORDER_MESSAGE,id)));
// mqUtils.sendApiMessage(MqMessage.build(EnumShopType.JD, MqType.ORDER_MESSAGE, id));
}
}
return success();

264
vue/src/views/jd/goods/index.vue
View File

@ -1,264 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
<el-form-item label="平台SkuId" prop="skuId">
<el-input
v-model="queryParams.skuId"
placeholder="请输入平台SkuId"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商家sku编码" prop="outerId">
<el-input
v-model="queryParams.outerId"
placeholder="请输入商家sku编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="ERP skuId" prop="erpSkuId">
<el-input
v-model="queryParams.erpSkuId"
placeholder="请输入ERP skuId"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="店铺" prop="shopId">
<el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
<el-option
v-for="item in shopList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-download"
size="mini"
@click="handlePull"
>API拉取商品数据</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column label="ID" align="center" prop="id" />-->
<el-table-column label="商品ID" align="center" prop="wareId" />
<el-table-column label="Sku Id" align="center" prop="skuId" />
<el-table-column label="sku名称" align="center" prop="skuName" />
<el-table-column label="图片" align="center" prop="logo" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.logo" :width="50" :height="50"/>
</template>
</el-table-column>
<!-- <el-table-column label="店铺" align="center" prop="categoryId" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag size="small">{{categoryList.find(x=>x.id === scope.row.categoryId).name}}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="商家编码" align="center" prop="outerId" />
<el-table-column label="京东价" align="center" prop="jdPrice" />
<el-table-column label="ERP SKU ID" align="center" prop="erpSkuId" />
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<el-tag size="small" v-if="scope.row.status === 1">销售中</el-tag>
<el-tag size="small" v-if="scope.row.status === 2">已下架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleLink(scope.row)"
>关联ERP</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改商品管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="ERP商品SkuId" prop="erpSkuId">
<el-input v-model.number="form.erpSkuId" placeholder="请输入ERP商品SkuId" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {getToken} from "@/utils/auth";
import {listGoodsSku,getGoodsSku,linkErpGoodsSkuId,pullGoodsList} from "@/api/jd/goods";
import {listShop} from "@/api/shop/shop";
import {MessageBox} from "element-ui";
import {isRelogin} from "@/utils/request";
export default {
name: "GoodsJd",
components: { Treeselect },
data() {
return {
importOpen:false,
headers: { 'Authorization': 'Bearer ' + getToken() },
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 商品管理表格数据
goodsList: [],
shopList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: null
},
// 表单参数
form: {},
supplierList: [],
categoryList: [],
categoryTree: [],
// 表单校验
rules: {
id: [
{ required: true, message: "不能为空", trigger: "change" }
],
erpSkuId: [
{ required: true, message: "不能为空", trigger: "blur" }
],
}
};
},
created() {
listShop({platform:2}).then(response => {
this.shopList = response.rows;
});
this.getList();
},
methods: {
/** 查询商品管理列表 */
getList() {
this.loading = true;
listGoodsSku(this.queryParams).then(response => {
this.goodsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
erpSkuId: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleLink(row) {
this.reset();
const id = row.id || this.ids
getGoodsSku(id).then(response => {
console.log('=====00000000============',response)
this.form = response.data;
this.open = true;
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
linkErpGoodsSkuId(this.form).then(response => {
this.$modal.msgSuccess("关联成功");
this.open = false;
this.getList();
});
}
});
},
handlePull() {
if(this.$route.query.shopId){
pullGoodsList({shopId:this.$route.query.shopId}).then(response => {
console.log('拉取JD商品接口返回=====',response)
if(response.code === 1401) {
MessageBox.confirm('Token已过期，需要重新授权', '系统提示', { confirmButtonText: '重新授权', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false;
// store.dispatch('LogOut').then(() => {
location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId
// })
}).catch(() => {
isRelogin.show = false;
});
// return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
}else
this.$modal.msgSuccess(JSON.stringify(response));
})
}else{
this.$modal.msgSuccess("请先选择店铺");
}
// this.$modal.msgSuccess("请先配置API");
},
}
};
</script>

49
vue/src/views/sale/order/index.vue
View File

@ -17,15 +17,15 @@
:label="item.name"
:value="item.id">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 1">1688</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 2">视频号小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 3">京东</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 4">淘宝天猫</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 5">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 6">抖店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 7">小红书</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 8">快手</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 99">其他渠道</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 1">1688</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 2">视频号小店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 3">京东</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 4">淘宝天猫</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 5">拼多多</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 6">抖店</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 7">小红书</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 8">快手</span>
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.platform === 99">其他渠道</span>
</el-option>
</el-select>
</el-form-item>
@ -68,16 +68,16 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-refresh"
size="mini"
:disabled="multiple"
@click="handlePushOms"
>手动将选中订单推送到ERP</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-refresh"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handlePushOms"-->
<!-- >手动将选中订单推送到ERP</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
@ -94,12 +94,17 @@
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="订单ID" align="center" prop="id" />-->
<el-table-column label="订单编号" align="center" prop="orderNum" />
<el-table-column label="店铺" align="center" prop="shopId" >
<el-table-column label="订单编号" align="center" prop="orderNum" >
<template slot-scope="scope">
<span>{{ shopList.find(x=>x.id === scope.row.shopId).name }}</span>
<p>{{scope.row.orderNum}}</p>
<el-tag>{{ shopList.find(x=>x.id === scope.row.shopId).name }}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="店铺" align="center" prop="shopId" >-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ shopList.find(x=>x.id === scope.row.shopId).name }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="商品" width="350">
<template slot-scope="scope">

2
vue/src/views/sale/order/pull/index.vue
View File

@ -21,7 +21,7 @@
<script>
import OrderTao from "@/views/shop/tao/order/index";
import OrderJd from "@/views/jd/order/index";
import OrderJd from "@/views/shop/jd/order/index";
import OrderDou from "@/views/dou/order/index";
import OrderPdd from "@/views/pdd/order/index";
export default {

15
vue/src/views/jd/order/index.vue → vue/src/views/shop/jd/order/index.vue
View File

@ -56,22 +56,23 @@
size="mini"
:disabled="multiple"
@click="handlePushOms"
>手动将选中订单推送到OMS</el-button>
>手动推送订单</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单ID" align="center" prop="orderId" />
<el-table-column label="店铺" align="center" prop="shopId" >
<!-- <el-table-column label="订单ID" align="center" prop="orderId" />-->
<el-table-column label="订单号" align="center" prop="orderId" >
<template slot-scope="scope">
<p>{{scope.row.orderId}}</p>
<el-tag size="small">{{shopList.find(x=>x.id === scope.row.shopId).name}}</el-tag>
</template>
</el-table-column>
<el-table-column label="商品" width="350">
<template slot-scope="scope">
<el-row v-for="item in scope.row.items" :key="item.id" :gutter="20">
<el-row v-for="item in scope.row.itemList" :key="item.id" :gutter="20">
<div style="float: left;display: flex;align-items: center;" >
<!-- <el-image style="width: 70px; height: 70px;" :src="item.picPath"></el-image>-->
@ -161,8 +162,12 @@ export default {
created() {
listShop({platform:3}).then(response => {
this.shopList = response.rows;
});
if (this.shopList && this.shopList.length > 0) {
this.queryParams.shopId = this.shopList[0].id
}
this.getList();
});
// this.getList();
},
methods: {
/** 查询商品管理列表 */

2
vue/src/views/shop/order_index.vue
View File

@ -24,7 +24,7 @@
<script>
import OrderTao from "@/views/shop/tao/order/index";
import OrderJd from "@/views/jd/order/index";
import OrderJd from "@/views/shop/jd/order/index";
import OrderDou from "@/views/dou/order/index";
import OrderPdd from "@/views/pdd/order/index";
import OrderWei from "@/views/shop/wei/order/index";

2
vue/src/views/shop/tao/order/index.vue
View File

@ -73,7 +73,7 @@
size="mini"
:disabled="multiple"
@click="handlePushOms"
>批量推送订单</el-button>
>手动推送订单</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>