From db6284e56be96f34acec246c9b1a74809de9290b Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 16 Apr 2025 14:00:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(lets):=20=E6=B7=BB=E5=8A=A0=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E8=AE=A2=E5=8D=95=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 OnlyAfterSalesBDaoImpl 和 OnlyAfterSalesHDaoImpl 中添加批量插入和更新方法 - 在 IOnlyAfterSalesBDao 和 IOnlyAfterSalesHDao 中添加相应接口- 在 OnlyAfterSalesBEntity 和 OnlyAfterSalesHEntity 中添加业务类型、推送状态等新字段- 更新 OnlyAfterSalesBEntity.xml 映射文件，添加新字段的映射 --- .../plugin/lets/dao/IOnlyAfterSalesBDao.java | 19 +- .../plugin/lets/dao/IOnlyAfterSalesHDao.java | 14 +- .../lets/dao/impl/OnlyAfterSalesBDaoImpl.java | 17 +- .../lets/dao/impl/OnlyAfterSalesHDaoImpl.java | 12 +- .../lets/entity/OnlyAfterSalesBEntity.java | 197 ++- .../lets/entity/OnlyAfterSalesBEntity.xml | 147 ++- .../lets/entity/OnlyAfterSalesHEntity.java | 414 ++++-- .../lets/entity/OnlyAfterSalesHEntity.xml | 130 +- .../entity/OfsPassiveorderDetailEntity.java | 2 + .../entity/OfsPassiveorderHeaderEntity.xml | 3 + .../outsourc/ConsignmachiningCinfurmIn.java | 4 + .../outsourc/ConsignmachiningInReturn.java | 4 + .../sales/PassiveWarehouseReceiptToC.java | 1107 ++++++++++++++++- .../sales/RefundOnlyPluginInitializerToB.java | 6 +- .../sales/RefundOnlyPluginInitializerToC.java | 5 +- .../SoSaleReturnPluginInitializerToC.java | 47 +- .../u8cdto/ConsignmachiningInBodyDto.java | 3 + .../u8cdto/ErrorHeaderDetailsDtoDtoV4.java | 52 + .../u8cdto/PassiveStorageSonDetailsDto2.java | 146 +++ .../PassiveComponentsArchivesCacheUtilV2.java | 653 ++++++++++ .../ConsignmachiningCinfurmInTest.java | 2 +- .../SoSaleReturnPluginInitializerToCTest.java | 18 +- .../report/lets/dao/IOnlyAfterSalesBDao.java | 23 + .../report/lets/dao/IOnlyAfterSalesHDao.java | 14 + .../lets/dao/impl/OnlyAfterSalesBDaoImpl.java | 25 + .../lets/dao/impl/OnlyAfterSalesHDaoImpl.java | 17 + .../report/lets/dto/OnlyAfterSalesBDto.java | 108 ++ .../lets/entity/OnlyAfterSalesBEntity.java | 177 +++ .../lets/entity/OnlyAfterSalesBEntity.xml | 675 ++++++++++ .../lets/entity/OnlyAfterSalesHEntity.java | 308 +++++ .../lets/entity/OnlyAfterSalesHEntity.xml | 973 +++++++++++++++ .../lets/service/ITocofsSaleoutService.java | 14 + .../impl/TocofsSaleoutServiceImpl.java | 86 ++ .../dto/ofssalesordersearch/HeaderDto.java | 2 + .../RerturnGoodsOrderSearchDetails.java | 5 + 35 files changed, 5105 insertions(+), 324 deletions(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ErrorHeaderDetailsDtoDtoV4.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PassiveStorageSonDetailsDto2.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/PassiveComponentsArchivesCacheUtilV2.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/dao/IOnlyAfterSalesBDao.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/dao/IOnlyAfterSalesHDao.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/dao/impl/OnlyAfterSalesBDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/dao/impl/OnlyAfterSalesHDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/dto/OnlyAfterSalesBDto.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesBEntity.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesBEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.java create mode 100644 service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.xml diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesBDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesBDao.java index 31a9ab99..7fe7600f 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesBDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesBDao.java @@ -1,7 +1,9 @@ package com.hzya.frame.plugin.lets.dao; import com.hzya.frame.plugin.lets.entity.OnlyAfterSalesBEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; + +import java.util.List; /** * 售后订单表_仅退款_子表(only_after_sales_b: table)表数据库访问层 @@ -10,6 +12,17 @@ import com.hzya.frame.basedao.dao.IBaseDao; * @since 2024-09-23 10:43:46 */ public interface IOnlyAfterSalesBDao extends IBaseDao { + /** + * 批量插入或更新数据行 + * + * @author liuyang + */ + void entityInsertOrUpdateBatch(List onlyAfterSalesHEntityList) throws Exception; -} - + /** + * 批量插入或更新,推送状态 + * + * @author liuyang + */ + void entityInsertOrUpdateBatchBySuccessOrFail(List onlyAfterSalesHEntityList) throws Exception; +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesHDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesHDao.java index a1c79738..544e247a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesHDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IOnlyAfterSalesHDao.java @@ -12,5 +12,17 @@ import java.util.List; * @since 2024-09-23 10:43:07 */ public interface IOnlyAfterSalesHDao extends IBaseDao { -} + /** + * 批量插入或者更新 + * + * @author liuyang + */ + void insertOrUpdate(List onlyAfterSalesHEntityList) throws Exception; + /** + * 批量更新成功或失败状态 + * + * @author liuyang + */ +// void entityInsertOrUpdateBatchBySuccessOrFail(List onlyAfterSalesHEntityList) throws Exception; +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesBDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesBDaoImpl.java index 90681622..bb6c255c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesBDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesBDaoImpl.java @@ -4,13 +4,24 @@ import com.hzya.frame.plugin.lets.entity.OnlyAfterSalesBEntity; import com.hzya.frame.plugin.lets.dao.IOnlyAfterSalesBDao; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; + +import java.util.List; + /** * 售后订单表_仅退款_子表(OnlyAfterSalesB)表数据库访问层 * * @author makejava * @since 2024-09-23 10:43:46 */ -public class OnlyAfterSalesBDaoImpl extends MybatisGenericDao implements IOnlyAfterSalesBDao{ - -} +public class OnlyAfterSalesBDaoImpl extends MybatisGenericDao implements IOnlyAfterSalesBDao { + @Override + public void entityInsertOrUpdateBatch(List onlyAfterSalesHEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.dao.impl.OnlyAfterSalesBDaoImpl.entityInsertOrUpdateBatch", onlyAfterSalesHEntityList); + } + + @Override + public void entityInsertOrUpdateBatchBySuccessOrFail(List onlyAfterSalesHEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.dao.impl.OnlyAfterSalesBDaoImpl.entityInsertOrUpdateBatchBySuccessOrFail", onlyAfterSalesHEntityList); + } +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesHDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesHDaoImpl.java index bf7b71b7..9ab01ddc 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesHDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/OnlyAfterSalesHDaoImpl.java @@ -2,7 +2,6 @@ package com.hzya.frame.plugin.lets.dao.impl; import com.hzya.frame.plugin.lets.entity.OnlyAfterSalesHEntity; import com.hzya.frame.plugin.lets.dao.IOnlyAfterSalesHDao; -import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; import java.util.List; @@ -13,6 +12,15 @@ import java.util.List; * @author makejava * @since 2024-09-23 10:43:07 */ -public class OnlyAfterSalesHDaoImpl extends MybatisGenericDao implements IOnlyAfterSalesHDao{ +public class OnlyAfterSalesHDaoImpl extends MybatisGenericDao implements IOnlyAfterSalesHDao { + @Override + public void insertOrUpdate(List onlyAfterSalesHEntityList) throws Exception { + insert("com.hzya.frame.plugin.lets.dao.impl.OnlyAfterSalesHDaoImpl.entityInsertOrUpdateBatch", onlyAfterSalesHEntityList); + } + +// @Override +// public void entityInsertOrUpdateBatchBySuccessOrFail(List onlyAfterSalesHEntityList) throws Exception { +// insert("com.hzya.frame.plugin.lets.dao.impl.OnlyAfterSalesHDaoImpl.entityInsertOrUpdateBatchBySuccessOrFail", onlyAfterSalesHEntityList); +// } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.java index 1f6159cf..5ce8c670 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.java @@ -14,60 +14,118 @@ public class OnlyAfterSalesBEntity extends BaseEntity { private String hid; private String ofsid; - /** 退货单ID */ - private Long returnorderid; - /** 退货单号 */ - private String returnordercode; - /** SKU编码 */ - private String skucode; - /** SKU名称 */ - private String skuname; - /** 货主编码 */ - private String companycode; - /** 组织 */ - private String clientcode; - /** 店铺 */ - private String storecode; - /** 退货类型 */ - private String returntype; - /** 是否退款 */ - private String refundind; - /** 请求数量 */ - private String requestqty; - /** 实际退货数量 */ - private String fulfillqty; - /** 货品单位 */ - private String quantityum; - /** 商品零售价 */ - private String msrprice; - /** 总重量 */ - private String totalweight; - /** 总体积 */ - private String totalvolume; - /** 重量单位 */ - private String weightum; - /** 体积单位 */ - private String volumeum; - /** 退货金额 */ - private String totalamount; - /** 平台订单行号 */ - private String sourcelinenum; - /** 原订单号 */ - private String sourceordercode; - /** 原支付单价 */ - private String sourcediscountprice; - /** 原支付金额 */ - private String sourcepayamount; - /** 原购买数量 */ - private String sourcerequestqty; - /** bom类型 */ - private String bomtype; - /** 拆分bom前的明细id */ - private Long originaldetailid; - /** 处理原因 */ - private String reasoncode; - /** 处理备注 */ - private String reasondesc; + /** + * 根据明细主键批量查询 + */ + private String ofsids; + /** + * 退货单ID + */ + private Long returnorderid; + /** + * 退货单号 + */ + private String returnordercode; + /** + * SKU编码 + */ + private String skucode; + /** + * SKU名称 + */ + private String skuname; + /** + * 货主编码 + */ + private String companycode; + /** + * 组织 + */ + private String clientcode; + /** + * 店铺 + */ + private String storecode; + /** + * 退货类型 + */ + private String returntype; + /** + * 是否退款 + */ + private String refundind; + /** + * 请求数量 + */ + private String requestqty; + /** + * 实际退货数量 + */ + private String fulfillqty; + /** + * 货品单位 + */ + private String quantityum; + /** + * 商品零售价 + */ + private String msrprice; + /** + * 总重量 + */ + private String totalweight; + /** + * 总体积 + */ + private String totalvolume; + /** + * 重量单位 + */ + private String weightum; + /** + * 体积单位 + */ + private String volumeum; + /** + * 退货金额 + */ + private String totalamount; + /** + * 平台订单行号 + */ + private String sourcelinenum; + /** + * 原订单号 + */ + private String sourceordercode; + /** + * 原支付单价 + */ + private String sourcediscountprice; + /** + * 原支付金额 + */ + private String sourcepayamount; + /** + * 原购买数量 + */ + private String sourcerequestqty; + /** + * bom类型 + */ + private String bomtype; + /** + * 拆分bom前的明细id + */ + private Long originaldetailid; + /** + * 处理原因 + */ + private String reasoncode; + /** + * 处理备注 + */ + private String reasondesc; //平台优惠，表头的 @@ -79,6 +137,37 @@ public class OnlyAfterSalesBEntity extends BaseEntity { //支付优惠，表头的 private String payDiscounts; + //业务类型 + private String businessType; + //业务日期-退货完成时间或交易成功时间 + private String transactionDate; + + //推送时间 + private String newPushDate; + + //报错详情 + private String newTransmitInfo; + + //推送状态 + private String newState; + + //下游单号 + private String newsystemnumber; + + //下游主键 + private String newsystemprimary; + + private String def1; + + private String def2; + + private String def3; + + private String def4; + + private String def5; + + private String def6; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.xml index 152072e1..ad5e04bb 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesBEntity.xml @@ -37,7 +37,21 @@ + + + + + + + + + + + + + + id @@ -74,13 +88,27 @@ ,merchantDiscounts ,expertDiscounts ,payDiscounts + ,businessType + ,transactionDate + ,newPushDate + ,newTransmitInfo + ,newState + ,newsystemnumber + ,newsystemprimary + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + @@ -159,7 +193,13 @@ and merchantDiscounts = #{merchantDiscounts} and expertDiscounts = #{expertDiscounts} and payDiscounts = #{payDiscounts} - + and businessType = #{businessType} + and transactionDate = #{transactionDate} + and newPushDate = #{newPushDate} + and newTransmitInfo = #{newTransmitInfo} + and newState = #{newState} + and newsystemnumber = #{newsystemnumber} + and newsystemprimary = #{newsystemprimary} order by ${sort} ${order} @@ -205,10 +245,14 @@ and merchantDiscounts like concat('%',#{merchantDiscounts},'%') and expertDiscounts like concat('%',#{expertDiscounts},'%') and payDiscounts like concat('%',#{payDiscounts},'%') - + and businessType like concat('%',#{businessType},'%') + and transactionDate like concat('%',#{transactionDate},'%') + and newPushDate like concat('%',#{newPushDate},'%') + and newTransmitInfo like concat('%',#{newTransmitInfo},'%') + and newState like concat('%',#{newState},'%') + and newsystemnumber like concat('%',#{newsystemnumber},'%') + and newsystemprimary like concat('%',#{newsystemprimary},'%') - - @@ -251,9 +295,14 @@ or merchantDiscounts = #{merchantDiscounts} or expertDiscounts = #{expertDiscounts} or payDiscounts = #{payDiscounts} - + or businessType = #{businessType} + or transactionDate = #{transactionDate} + or newPushDate = #{newPushDate} + or newTransmitInfo = #{newTransmitInfo} + or newState = #{newState} + or newsystemnumber = #{newsystemnumber} + or newsystemprimary = #{newsystemprimary} - @@ -294,6 +343,13 @@ merchantDiscounts , expertDiscounts , payDiscounts , + businessType , + transactionDate , + newPushDate , + newTransmitInfo , + newState , + newsystemnumber , + newsystemprimary , )values( @@ -331,23 +387,32 @@ #{merchantDiscounts} , #{expertDiscounts} , #{payDiscounts} , - + #{businessType} , + #{transactionDate} , + #{newPushDate} , + #{newTransmitInfo} , + #{newState} , + #{newsystemnumber} , + #{newsystemprimary} , + ) + - insert into only_after_sales_b(hid,ofsid,returnOrderId, returnOrderCode, skuCode, skuName, companyCode, clientCode, storeCode, returnType, refundInd, requestQty, fulfillQty, quantityUM, msrPrice, totalWeight, totalVolume, weightUM, volumeUM, totalAmount, sourceLineNum, sourceOrderCode, sourceDiscountPrice, sourcePayAmount, sourceRequestQty, bomType, originalDetailId, reasonCode, reasonDescs) + insert into only_after_sales_b(hid,ofsid,returnOrderId, returnOrderCode, skuCode, skuName, companyCode, clientCode, storeCode, returnType, refundInd, requestQty, fulfillQty, quantityUM, msrPrice, totalWeight, totalVolume, weightUM, volumeUM, totalAmount, sourceLineNum, sourceOrderCode, sourceDiscountPrice, sourcePayAmount, sourceRequestQty, bomType, originalDetailId, reasonCode, reasonDescs,businessType,transactionDate,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary) values - - (#{entity.hid},#{entity.ofsid},#{entity.returnorderid},#{entity.returnordercode},#{entity.skucode},#{entity.skuname},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.returntype},#{entity.refundind},#{entity.requestqty},#{entity.fulfillqty},#{entity.quantityum},#{entity.msrprice},#{entity.totalweight},#{entity.totalvolume},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.sourcelinenum},#{entity.sourceordercode},#{entity.sourcediscountprice},#{entity.sourcepayamount},#{entity.sourcerequestqty},#{entity.bomtype},#{entity.originaldetailid},#{entity.reasoncode},#{entity.reasondesc}) + + (#{entity.hid},#{entity.ofsid},#{entity.returnorderid},#{entity.returnordercode},#{entity.skucode},#{entity.skuname},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.returntype},#{entity.refundind},#{entity.requestqty},#{entity.fulfillqty},#{entity.quantityum},#{entity.msrprice},#{entity.totalweight},#{entity.totalvolume},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.sourcelinenum},#{entity.sourceordercode},#{entity.sourcediscountprice},#{entity.sourcepayamount},#{entity.sourcerequestqty},#{entity.bomtype},#{entity.originaldetailid},#{entity.reasoncode},#{entity.reasondesc},#{entity.businessType},#{entity.transactionDate},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary}) + - insert into only_after_sales_b(hid,ofsid,returnOrderId, returnOrderCode, skuCode, skuName, companyCode, clientCode, storeCode, returnType, refundInd, requestQty, fulfillQty, quantityUM, msrPrice, totalWeight, totalVolume, weightUM, volumeUM, totalAmount, sourceLineNum, sourceOrderCode, sourceDiscountPrice, sourcePayAmount, sourceRequestQty, bomType, originalDetailId, reasonCode, reasonDesc) + insert into only_after_sales_b(hid,ofsid,returnOrderId, returnOrderCode, skuCode, skuName, companyCode, clientCode, storeCode, returnType, refundInd, requestQty, fulfillQty, quantityUM, msrPrice, totalWeight, totalVolume, weightUM, volumeUM, totalAmount, sourceLineNum, sourceOrderCode, sourceDiscountPrice, sourcePayAmount, sourceRequestQty, bomType, originalDetailId, reasonCode, reasonDesc,businessType) values - - (#{entity.hid},#{entity.ofsid},#{entity.returnorderid},#{entity.returnordercode},#{entity.skucode},#{entity.skuname},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.returntype},#{entity.refundind},#{entity.requestqty},#{entity.fulfillqty},#{entity.quantityum},#{entity.msrprice},#{entity.totalweight},#{entity.totalvolume},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.sourcelinenum},#{entity.sourceordercode},#{entity.sourcediscountprice},#{entity.sourcepayamount},#{entity.sourcerequestqty},#{entity.bomtype},#{entity.originaldetailid},#{entity.reasoncode},#{entity.reasondesc}) + + (#{entity.hid},#{entity.ofsid},#{entity.returnorderid},#{entity.returnordercode},#{entity.skucode},#{entity.skuname},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.returntype},#{entity.refundind},#{entity.requestqty},#{entity.fulfillqty},#{entity.quantityum},#{entity.msrprice},#{entity.totalweight},#{entity.totalvolume},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.sourcelinenum},#{entity.sourceordercode},#{entity.sourcediscountprice},#{entity.sourcepayamount},#{entity.sourcerequestqty},#{entity.bomtype},#{entity.originaldetailid},#{entity.reasoncode},#{entity.reasondesc},#{entity.businessType}) on duplicate key update hid = values(hid), @@ -378,7 +443,32 @@ bomType = values(bomType), originalDetailId = values(originalDetailId), reasonCode = values(reasonCode), - reasonDesc = values(reasonDesc) + reasonDesc = values(reasonDesc), + businessType = values(businessType) + + + + + insert into only_after_sales_b(ofsid,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary,def1,def2,def3,def4,def5,def6) + values + + (#{entity.ofsid},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6}) + + on duplicate key update + ofsid = values(ofsid), + newPushDate = values(newPushDate), + newTransmitInfo = values(newTransmitInfo), + newState = values(newState), + newsystemnumber = values(newsystemnumber), + newsystemprimary = values(newsystemprimary), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5), + def6 = values(def6) + + update only_after_sales_b set @@ -416,14 +506,23 @@ update only_after_sales_b set merchantDiscounts = #{merchantDiscounts}, expertDiscounts = #{expertDiscounts}, payDiscounts = #{payDiscounts}, + businessType = #{businessType}, + transactionDate = #{transactionDate}, + newPushDate = #{newPushDate}, + newTransmitInfo = #{newTransmitInfo}, + newState = #{newState}, + newsystemnumber = #{newsystemnumber}, + newsystemprimary = #{newsystemprimary}, where id = #{id} + update only_after_sales_b set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + update only_after_sales_b set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} @@ -462,13 +561,19 @@ update only_after_sales_b set sts= 'N' ,modify_time = #{modify_time},modify_use and merchantDiscounts = #{merchantDiscounts} and expertDiscounts = #{expertDiscounts} and payDiscounts = #{payDiscounts} - - + and businessType = #{businessType} + and transactionDate = #{transactionDate} + and newPushDate = #{newPushDate} + and newTransmitInfo = #{newTransmitInfo} + and newState = #{newState} + and newsystemnumber = #{newsystemnumber} + and newsystemprimary = #{newsystemprimary} + + delete from only_after_sales_b where id = #{id} - - + \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.java index f8a0bae4..db4a6c9c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.java @@ -1,6 +1,7 @@ package com.hzya.frame.plugin.lets.entity; import java.util.Date; + import com.hzya.frame.web.entity.BaseEntity; import lombok.Data; @@ -14,137 +15,267 @@ import lombok.Data; public class OnlyAfterSalesHEntity extends BaseEntity { private String ofsid; - - /** 退货类型 */ - private String returntype; - /** 换货方式 */ - private String exchangetype; - /** 是否退款 */ - private String refundind; - /** 系统内部类型 */ - private String internalordertype; - /** 业务发生渠道 */ - private String bizchannel; - /** 售后凭证单号 */ - private String code; - /** 商家编码 */ - private String companycode; - /** 组织 */ - private String clientcode; - /** 店铺编码 */ - private String storecode; - /** 平台客户账号 */ - private String sourceuseraccount; - /** 平台客户昵称 */ - private String sourceusername; - /** 退货状态 */ - private String returnstatus; - /** 发货状态 */ - private String shipstatus; - /** 退款状态 */ - private String refundstatus; - /** 退回仓库 */ - private String facilitycode; - /** 销售订单编号 */ - private String refordercode; - /** 销售订单ID */ - private Long reforderid; - /** 销售订单类型 */ - private String refordertype; - /** 生成售后订单时的订单状态 */ - private String reforderstatuswhenreturned; - /** 来源平台 */ - private String sourceplatformcode; - /** 平台订单号 */ - private String sourceordercode; - /** 平台订单状态 */ - private String sourceorderstatuswhenreturned; - /** 平台退货单号 */ - private String sourcereturncode; - /** 平台退货单状态 */ - private String sourcereturnstatus; - /** 退货原因 */ - private String reasoncode; - /** 客服备注 */ - private String returnnote; - /** 卖家备注 */ - private String sellernote; - /** 应退金额 */ - private String requestrefundamount; - /** 实退金额 */ - private String actualrefundamount; - /** 应退商品总数 */ - private String totalqty; - /** 实退总数 */ - private String totalfulfillqty; - /** 发货人 */ - private String shipfromattentionto; - /** 地址 */ - private String shipfromaddress; - /** 国家 */ - private String shipfromcountry; - /** 省份 */ - private String shipfromstate; - /** 城市 */ - private String shipfromcity; - /** 区域 */ - private String shipfromdistrict; - /** 邮编 */ - private String shipfrompostalcode; - /** 电话 */ - private String shipfromphone; - /** 手机 */ - private String shipfrommobile; - /** 传真 */ - private String shipfromfax; - /** 电子邮箱 */ - private String shipfromemail; - /** 发货快递公司 */ - private String shipcarrier; - /** 发货快递单号 */ - private String shipwaybillcode; - /** 发货物流状态 */ - private String shiplogisticsstatus; - /** 退回快递公司 */ - private String returncarrier; - /** 退回快递单号 */ - private String returnwaybillcode; - /** 退货物流状态 */ - private String returnlogisticsstatus; - /** 支付账号 */ - private String payaccount; - /** 退款支付交易单号 */ - private String payorderno; - /** 审核人 */ - private String auditby; - /** 审核时间 */ - private Date auditat; - /** 退款方式 */ - private String refundthru; - /** 客服工号 */ - private String csstuff; - /** 仓库备注 */ - private String returnwarehousenote; - /** 锁定原因 */ - private String holdcode; - /** 锁定用户 */ - private String holduser; - /** 锁定时间 */ - private Date holdat; - /** 异常类型 */ - private String errorcode; - /** 异常消息 */ - private String errordesc; - /** 核销状态 */ - private String verificationstatus; - /** 核销异常描述 */ - private String verificationerrordesc; - /** 退款时间 */ - private Date refundedat; - /** 状态 */ - private String status; - /** 处理类型 */ - private String processtype; + + /** + * 退货类型 + */ + private String returntype; + /** + * 换货方式 + */ + private String exchangetype; + /** + * 是否退款 + */ + private String refundind; + /** + * 系统内部类型 + */ + private String internalordertype; + /** + * 业务发生渠道 + */ + private String bizchannel; + /** + * 售后凭证单号 + */ + private String code; + /** + * 商家编码 + */ + private String companycode; + /** + * 组织 + */ + private String clientcode; + /** + * 店铺编码 + */ + private String storecode; + /** + * 平台客户账号 + */ + private String sourceuseraccount; + /** + * 平台客户昵称 + */ + private String sourceusername; + /** + * 退货状态 + */ + private String returnstatus; + /** + * 发货状态 + */ + private String shipstatus; + /** + * 退款状态 + */ + private String refundstatus; + /** + * 退回仓库 + */ + private String facilitycode; + /** + * 销售订单编号 + */ + private String refordercode; + /** + * 销售订单ID + */ + private Long reforderid; + /** + * 销售订单类型 + */ + private String refordertype; + /** + * 生成售后订单时的订单状态 + */ + private String reforderstatuswhenreturned; + /** + * 来源平台 + */ + private String sourceplatformcode; + /** + * 平台订单号 + */ + private String sourceordercode; + /** + * 平台订单状态 + */ + private String sourceorderstatuswhenreturned; + /** + * 平台退货单号 + */ + private String sourcereturncode; + /** + * 平台退货单状态 + */ + private String sourcereturnstatus; + /** + * 退货原因 + */ + private String reasoncode; + /** + * 客服备注 + */ + private String returnnote; + /** + * 卖家备注 + */ + private String sellernote; + /** + * 应退金额 + */ + private String requestrefundamount; + /** + * 实退金额 + */ + private String actualrefundamount; + /** + * 应退商品总数 + */ + private String totalqty; + /** + * 实退总数 + */ + private String totalfulfillqty; + /** + * 发货人 + */ + private String shipfromattentionto; + /** + * 地址 + */ + private String shipfromaddress; + /** + * 国家 + */ + private String shipfromcountry; + /** + * 省份 + */ + private String shipfromstate; + /** + * 城市 + */ + private String shipfromcity; + /** + * 区域 + */ + private String shipfromdistrict; + /** + * 邮编 + */ + private String shipfrompostalcode; + /** + * 电话 + */ + private String shipfromphone; + /** + * 手机 + */ + private String shipfrommobile; + /** + * 传真 + */ + private String shipfromfax; + /** + * 电子邮箱 + */ + private String shipfromemail; + /** + * 发货快递公司 + */ + private String shipcarrier; + /** + * 发货快递单号 + */ + private String shipwaybillcode; + /** + * 发货物流状态 + */ + private String shiplogisticsstatus; + /** + * 退回快递公司 + */ + private String returncarrier; + /** + * 退回快递单号 + */ + private String returnwaybillcode; + /** + * 退货物流状态 + */ + private String returnlogisticsstatus; + /** + * 支付账号 + */ + private String payaccount; + /** + * 退款支付交易单号 + */ + private String payorderno; + /** + * 审核人 + */ + private String auditby; + /** + * 审核时间 + */ + private String auditat; + /** + * 退款方式 + */ + private String refundthru; + /** + * 客服工号 + */ + private String csstuff; + /** + * 仓库备注 + */ + private String returnwarehousenote; + /** + * 锁定原因 + */ + private String holdcode; + /** + * 锁定用户 + */ + private String holduser; + /** + * 锁定时间 + */ + private String holdat; + /** + * 异常类型 + */ + private String errorcode; + /** + * 异常消息 + */ + private String errordesc; + /** + * 核销状态 + */ + private String verificationstatus; + /** + * 核销异常描述 + */ + private String verificationerrordesc; + /** + * 退款时间 + */ + private String refundedat; + /** + * 状态 + */ + private String status; + /** + * 处理类型 + */ + private String processtype; //平台优惠 @@ -156,5 +287,24 @@ public class OnlyAfterSalesHEntity extends BaseEntity { //支付优惠 private String payDiscounts; -} + //业务类型 + private String businessType; + //业务日期-退货完成时间或交易成功时间 + private String transactionDate; + + //推送时间 + private String newPushDate; + + //报错详情 + private String newTransmitInfo; + + //推送状态 + private String newState; + + //下游单号 + private String newsystemnumber; + + //下游主键 + private String newsystemprimary; +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.xml index e9201e9f..56ecba95 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/OnlyAfterSalesHEntity.xml @@ -3,7 +3,7 @@ - + @@ -74,7 +74,16 @@ + + + + + + + + + id @@ -148,7 +157,15 @@ ,merchantDiscounts ,expertDiscounts ,payDiscounts + ,businessType + ,transactionDate + ,newPushDate + ,newTransmitInfo + ,newState + ,newsystemnumber + ,newsystemprimary + @@ -307,7 +328,13 @@ and merchantDiscounts = #{merchantDiscounts} and expertDiscounts = #{expertDiscounts} and payDiscounts = #{payDiscounts} - + and businessType = #{businessType} + and transactionDate = #{transactionDate} + and newPushDate = #{newPushDate} + and newTransmitInfo = #{newTransmitInfo} + and newState = #{newState} + and newsystemnumber = #{newsystemnumber} + and newsystemprimary = #{newsystemprimary} order by ${sort} ${order} @@ -390,7 +417,14 @@ and merchantDiscounts like concat('%',#{merchantDiscounts},'%') and expertDiscounts like concat('%',#{expertDiscounts},'%') and payDiscounts like concat('%',#{payDiscounts},'%') - + and businessType like concat('%',#{businessType},'%') + and transactionDate like concat('%',#{transactionDate},'%') + and newPushDate like concat('%',#{newPushDate},'%') + and newTransmitInfo like concat('%',#{newTransmitInfo},'%') + and newState like concat('%',#{newState},'%') + and newsystemnumber like concat('%',#{newsystemnumber},'%') + and newsystemprimary like concat('%',#{newsystemprimary},'%') + @@ -472,9 +506,14 @@ or merchantDiscounts = #{merchantDiscounts} or expertDiscounts = #{expertDiscounts} or payDiscounts = #{payDiscounts} - + or businessType = #{businessType} + or transactionDate = #{transactionDate} + or newPushDate = #{newPushDate} + or newTransmitInfo = #{newTransmitInfo} + or newState = #{newState} + or newsystemnumber = #{newsystemnumber} + or newsystemprimary = #{newsystemprimary} - @@ -552,6 +591,13 @@ merchantDiscounts , expertDiscounts , payDiscounts , + businessType , + transactionDate , + newPushDate , + newTransmitInfo , + newState , + newsystemnumber , + newsystemprimary , )values( @@ -626,23 +672,32 @@ #{merchantDiscounts} , #{expertDiscounts} , #{payDiscounts} , - + #{businessType} , + #{transactionDate} , + #{newPushDate} , + #{newTransmitInfo} , + #{newState} , + #{newsystemnumber} , + #{newsystemprimary} , + ) + - insert into only_after_sales_h(ofsid,returnType, exchangeType, refundInd, internalOrderType, bizChannel, code, companyCode, clientCode, storeCode, sourceUserAccount, sourceUserName, returnStatus, shipStatus, refundStatus, facilityCode, refOrderCode, refOrderId, refOrderType, refOrderStatusWhenReturned, sourcePlatformCode, sourceOrderCode, sourceOrderStatusWhenReturned, sourceReturnCode, sourceReturnStatus, reasonCode, returnNote, sellerNote, requestRefundAmount, actualRefundAmount, totalQty, totalFulfillQty, shipFromAttentionTo, shipFromAddress, shipFromCountry, shipFromState, shipFromCity, shipFromDistrict, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, shipCarrier, shipWaybillCode, shipLogisticsStatus, returnCarrier, returnWaybillCode, returnLogisticsStatus, payAccount, payOrderNo, auditBy, auditAt, refundThru, csStuff, returnWarehouseNote, holdCode, holdUser, holdAt, errorCode, errorDesc, verificationStatus, verificationErrorDesc, refundedAt, status, processType) + insert into only_after_sales_h(id,ofsid,returnType, exchangeType, refundInd, internalOrderType, bizChannel, code, companyCode, clientCode, storeCode, sourceUserAccount, sourceUserName, returnStatus, shipStatus, refundStatus, facilityCode, refOrderCode, refOrderId, refOrderType, refOrderStatusWhenReturned, sourcePlatformCode, sourceOrderCode, sourceOrderStatusWhenReturned, sourceReturnCode, sourceReturnStatus, reasonCode, returnNote, sellerNote, requestRefundAmount, actualRefundAmount, totalQty, totalFulfillQty, shipFromAttentionTo, shipFromAddress, shipFromCountry, shipFromState, shipFromCity, shipFromDistrict, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, shipCarrier, shipWaybillCode, shipLogisticsStatus, returnCarrier, returnWaybillCode, returnLogisticsStatus, payAccount, payOrderNo, auditBy, auditAt, refundThru, csStuff, returnWarehouseNote, holdCode, holdUser, holdAt, errorCode, errorDesc, verificationStatus, verificationErrorDesc, refundedAt, status, processType,businessType,transactionDate,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary) values - (#{entity.ofsid},#{entity.returntype},#{entity.exchangetype},#{entity.refundind},#{entity.internalordertype},#{entity.bizchannel},#{entity.code},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.sourceuseraccount},#{entity.sourceusername},#{entity.returnstatus},#{entity.shipstatus},#{entity.refundstatus},#{entity.facilitycode},#{entity.refordercode},#{entity.reforderid},#{entity.refordertype},#{entity.reforderstatuswhenreturned},#{entity.sourceplatformcode},#{entity.sourceordercode},#{entity.sourceorderstatuswhenreturned},#{entity.sourcereturncode},#{entity.sourcereturnstatus},#{entity.reasoncode},#{entity.returnnote},#{entity.sellernote},#{entity.requestrefundamount},#{entity.actualrefundamount},#{entity.totalqty},#{entity.totalfulfillqty},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromcountry},#{entity.shipfromstate},#{entity.shipfromcity},#{entity.shipfromdistrict},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.shipcarrier},#{entity.shipwaybillcode},#{entity.shiplogisticsstatus},#{entity.returncarrier},#{entity.returnwaybillcode},#{entity.returnlogisticsstatus},#{entity.payaccount},#{entity.payorderno},#{entity.auditby},#{entity.auditat},#{entity.refundthru},#{entity.csstuff},#{entity.returnwarehousenote},#{entity.holdcode},#{entity.holduser},#{entity.holdat},#{entity.errorcode},#{entity.errordesc},#{entity.verificationstatus},#{entity.verificationerrordesc},#{entity.refundedat},#{entity.status},#{entity.processtype}) + (#{entity.id},#{entity.ofsid},#{entity.returntype},#{entity.exchangetype},#{entity.refundind},#{entity.internalordertype},#{entity.bizchannel},#{entity.code},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.sourceuseraccount},#{entity.sourceusername},#{entity.returnstatus},#{entity.shipstatus},#{entity.refundstatus},#{entity.facilitycode},#{entity.refordercode},#{entity.reforderid},#{entity.refordertype},#{entity.reforderstatuswhenreturned},#{entity.sourceplatformcode},#{entity.sourceordercode},#{entity.sourceorderstatuswhenreturned},#{entity.sourcereturncode},#{entity.sourcereturnstatus},#{entity.reasoncode},#{entity.returnnote},#{entity.sellernote},#{entity.requestrefundamount},#{entity.actualrefundamount},#{entity.totalqty},#{entity.totalfulfillqty},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromcountry},#{entity.shipfromstate},#{entity.shipfromcity},#{entity.shipfromdistrict},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.shipcarrier},#{entity.shipwaybillcode},#{entity.shiplogisticsstatus},#{entity.returncarrier},#{entity.returnwaybillcode},#{entity.returnlogisticsstatus},#{entity.payaccount},#{entity.payorderno},#{entity.auditby},#{entity.auditat},#{entity.refundthru},#{entity.csstuff},#{entity.returnwarehousenote},#{entity.holdcode},#{entity.holduser},#{entity.holdat},#{entity.errorcode},#{entity.errordesc},#{entity.verificationstatus},#{entity.verificationerrordesc},#{entity.refundedat},#{entity.status},#{entity.processtype},#{entity.businessType},#{entity.transactionDate},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary}) + - insert into only_after_sales_h(ofsid,returnType, exchangeType, refundInd, internalOrderType, bizChannel, code, companyCode, clientCode, storeCode, sourceUserAccount, sourceUserName, returnStatus, shipStatus, refundStatus, facilityCode, refOrderCode, refOrderId, refOrderType, refOrderStatusWhenReturned, sourcePlatformCode, sourceOrderCode, sourceOrderStatusWhenReturned, sourceReturnCode, sourceReturnStatus, reasonCode, returnNote, sellerNote, requestRefundAmount, actualRefundAmount, totalQty, totalFulfillQty, shipFromAttentionTo, shipFromAddress, shipFromCountry, shipFromState, shipFromCity, shipFromDistrict, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, shipCarrier, shipWaybillCode, shipLogisticsStatus, returnCarrier, returnWaybillCode, returnLogisticsStatus, payAccount, payOrderNo, auditBy, auditAt, refundThru, csStuff, returnWarehouseNote, holdCode, holdUser, holdAt, errorCode, errorDesc, verificationStatus, verificationErrorDesc, refundedAt, status, processType) + insert into only_after_sales_h(ofsid,returnType, exchangeType, refundInd, internalOrderType, bizChannel, code, companyCode, clientCode, storeCode, sourceUserAccount, sourceUserName, returnStatus, shipStatus, refundStatus, facilityCode, refOrderCode, refOrderId, refOrderType, refOrderStatusWhenReturned, sourcePlatformCode, sourceOrderCode, sourceOrderStatusWhenReturned, sourceReturnCode, sourceReturnStatus, reasonCode, returnNote, sellerNote, requestRefundAmount, actualRefundAmount, totalQty, totalFulfillQty, shipFromAttentionTo, shipFromAddress, shipFromCountry, shipFromState, shipFromCity, shipFromDistrict, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, shipCarrier, shipWaybillCode, shipLogisticsStatus, returnCarrier, returnWaybillCode, returnLogisticsStatus, payAccount, payOrderNo, auditBy, auditAt, refundThru, csStuff, returnWarehouseNote, holdCode, holdUser, holdAt, errorCode, errorDesc, verificationStatus, verificationErrorDesc, refundedAt, status, processType,businessType) values - - (#{entity.ofsid},#{entity.returntype},#{entity.exchangetype},#{entity.refundind},#{entity.internalordertype},#{entity.bizchannel},#{entity.code},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.sourceuseraccount},#{entity.sourceusername},#{entity.returnstatus},#{entity.shipstatus},#{entity.refundstatus},#{entity.facilitycode},#{entity.refordercode},#{entity.reforderid},#{entity.refordertype},#{entity.reforderstatuswhenreturned},#{entity.sourceplatformcode},#{entity.sourceordercode},#{entity.sourceorderstatuswhenreturned},#{entity.sourcereturncode},#{entity.sourcereturnstatus},#{entity.reasoncode},#{entity.returnnote},#{entity.sellernote},#{entity.requestrefundamount},#{entity.actualrefundamount},#{entity.totalqty},#{entity.totalfulfillqty},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromcountry},#{entity.shipfromstate},#{entity.shipfromcity},#{entity.shipfromdistrict},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.shipcarrier},#{entity.shipwaybillcode},#{entity.shiplogisticsstatus},#{entity.returncarrier},#{entity.returnwaybillcode},#{entity.returnlogisticsstatus},#{entity.payaccount},#{entity.payorderno},#{entity.auditby},#{entity.auditat},#{entity.refundthru},#{entity.csstuff},#{entity.returnwarehousenote},#{entity.holdcode},#{entity.holduser},#{entity.holdat},#{entity.errorcode},#{entity.errordesc},#{entity.verificationstatus},#{entity.verificationerrordesc},#{entity.refundedat},#{entity.status},#{entity.processtype}) + + (#{entity.ofsid},#{entity.returntype},#{entity.exchangetype},#{entity.refundind},#{entity.internalordertype},#{entity.bizchannel},#{entity.code},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.sourceuseraccount},#{entity.sourceusername},#{entity.returnstatus},#{entity.shipstatus},#{entity.refundstatus},#{entity.facilitycode},#{entity.refordercode},#{entity.reforderid},#{entity.refordertype},#{entity.reforderstatuswhenreturned},#{entity.sourceplatformcode},#{entity.sourceordercode},#{entity.sourceorderstatuswhenreturned},#{entity.sourcereturncode},#{entity.sourcereturnstatus},#{entity.reasoncode},#{entity.returnnote},#{entity.sellernote},#{entity.requestrefundamount},#{entity.actualrefundamount},#{entity.totalqty},#{entity.totalfulfillqty},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromcountry},#{entity.shipfromstate},#{entity.shipfromcity},#{entity.shipfromdistrict},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.shipcarrier},#{entity.shipwaybillcode},#{entity.shiplogisticsstatus},#{entity.returncarrier},#{entity.returnwaybillcode},#{entity.returnlogisticsstatus},#{entity.payaccount},#{entity.payorderno},#{entity.auditby},#{entity.auditat},#{entity.refundthru},#{entity.csstuff},#{entity.returnwarehousenote},#{entity.holdcode},#{entity.holduser},#{entity.holdat},#{entity.errorcode},#{entity.errordesc},#{entity.verificationstatus},#{entity.verificationerrordesc},#{entity.refundedat},#{entity.status},#{entity.processtype},#{entity.businessType}) on duplicate key update ofsid = values(ofsid), @@ -710,7 +765,29 @@ verificationErrorDesc = values(verificationErrorDesc), refundedAt = values(refundedAt), status = values(status), - processType = values(processType) + processType = values(processType), + businessType = values(businessType) + + + + + + insert into only_after_sales_h(id,businessType,transactionDate,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary) + values + + (#{entity.id},#{entity.businessType},#{entity.transactionDate},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary}) + + on duplicate key update + id = values(id), + businessType = values(businessType), + transactionDate = values(transactionDate), + newPushDate = values(newPushDate), + newTransmitInfo = values(newTransmitInfo), + newState = values(newState), + newsystemnumber = values(newsystemnumber), + newsystemprimary = values(newsystemprimary) + + update only_after_sales_h set @@ -785,14 +862,23 @@ update only_after_sales_h set merchantDiscounts = #{merchantDiscounts}, expertDiscounts = #{expertDiscounts}, payDiscounts = #{payDiscounts}, + businessType = #{businessType}, + transactionDate = #{transactionDate}, + newPushDate = #{newPushDate}, + newTransmitInfo = #{newTransmitInfo}, + newState = #{newState}, + newsystemnumber = #{newsystemnumber}, + newsystemprimary = #{newsystemprimary}, where id = #{id} + update only_after_sales_h set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} + update only_after_sales_h set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} @@ -868,16 +954,20 @@ update only_after_sales_h set sts= 'N' ,modify_time = #{modify_time},modify_use and merchantDiscounts = #{merchantDiscounts} and expertDiscounts = #{expertDiscounts} and payDiscounts = #{payDiscounts} - - + and businessType = #{businessType} + and transactionDate = #{transactionDate} + and newPushDate = #{newPushDate} + and newTransmitInfo = #{newTransmitInfo} + and newState = #{newState} + and newsystemnumber = #{newsystemnumber} + and newsystemprimary = #{newsystemprimary} + + delete from only_after_sales_h where id = #{id} - - - diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderDetailEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderDetailEntity.java index 429fd4c9..b6b985c8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderDetailEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderDetailEntity.java @@ -127,6 +127,8 @@ public class OfsPassiveorderDetailEntity extends BaseEntity { private String def10; +// private String ofsId; + public String getDef1() { return def1; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderHeaderEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderHeaderEntity.xml index ccb9c2cb..39002e05 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderHeaderEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/OfsPassiveorderHeaderEntity.xml @@ -45,6 +45,7 @@ ,lastUpdated ,lastUpdatedBy + + select + + from only_after_sales_b + + and id = #{id} + and hid = #{hid} + and ofsid = #{ofsid} + and returnOrderId = #{returnorderid} + and returnOrderCode = #{returnordercode} + and skuCode = #{skucode} + and skuName = #{skuname} + and companyCode = #{companycode} + and clientCode = #{clientcode} + and storeCode = #{storecode} + and returnType = #{returntype} + and refundInd = #{refundind} + and requestQty = #{requestqty} + and fulfillQty = #{fulfillqty} + and quantityUM = #{quantityum} + and msrPrice = #{msrprice} + and totalWeight = #{totalweight} + and totalVolume = #{totalvolume} + and weightUM = #{weightum} + and volumeUM = #{volumeum} + and totalAmount = #{totalamount} + and sourceLineNum = #{sourcelinenum} + and sourceOrderCode = #{sourceordercode} + and sourceDiscountPrice = #{sourcediscountprice} + and sourcePayAmount = #{sourcepayamount} + and sourceRequestQty = #{sourcerequestqty} + and bomType = #{bomtype} + and originalDetailId = #{originaldetailid} + and reasonCode = #{reasoncode} + and reasonDesc = #{reasondesc} + and platformDiscounts = #{platformDiscounts} + and merchantDiscounts = #{merchantDiscounts} + and expertDiscounts = #{expertDiscounts} + and payDiscounts = #{payDiscounts} + and businessType = #{businessType} + and transactionDate = #{transactionDate} + and newPushDate = #{newPushDate} + and newTransmitInfo = #{newTransmitInfo} + and newState = #{newState} + and newsystemnumber = #{newsystemnumber} + and newsystemprimary = #{newsystemprimary} + + and ofsid in (${ofsids}) + + and transactionDate >= #{transactionDateStart} + + + and transactionDate <= #{transactionDateEnd} + + + + + + + + + + + + + + + + + + + insert into only_after_sales_b( + + id , + hid , + ofsid , + returnOrderId , + returnOrderCode , + skuCode , + skuName , + companyCode , + clientCode , + storeCode , + returnType , + refundInd , + requestQty , + fulfillQty , + quantityUM , + msrPrice , + totalWeight , + totalVolume , + weightUM , + volumeUM , + totalAmount , + sourceLineNum , + sourceOrderCode , + sourceDiscountPrice , + sourcePayAmount , + sourceRequestQty , + bomType , + originalDetailId , + reasonCode , + reasonDesc , + platformDiscounts , + merchantDiscounts , + expertDiscounts , + payDiscounts , + businessType , + transactionDate , + newPushDate , + newTransmitInfo , + newState , + newsystemnumber , + newsystemprimary , + + )values( + + #{id} , + #{hid} , + #{ofsid} , + #{returnorderid} , + #{returnordercode} , + #{skucode} , + #{skuname} , + #{companycode} , + #{clientcode} , + #{storecode} , + #{returntype} , + #{refundind} , + #{requestqty} , + #{fulfillqty} , + #{quantityum} , + #{msrprice} , + #{totalweight} , + #{totalvolume} , + #{weightum} , + #{volumeum} , + #{totalamount} , + #{sourcelinenum} , + #{sourceordercode} , + #{sourcediscountprice} , + #{sourcepayamount} , + #{sourcerequestqty} , + #{bomtype} , + #{originaldetailid} , + #{reasoncode} , + #{reasondesc} , + #{platformDiscounts} , + #{merchantDiscounts} , + #{expertDiscounts} , + #{payDiscounts} , + #{businessType} , + #{transactionDate} , + #{newPushDate} , + #{newTransmitInfo} , + #{newState} , + #{newsystemnumber} , + #{newsystemprimary} , + + ) + + + + + insert into only_after_sales_b(hid,ofsid,returnOrderId, returnOrderCode, skuCode, skuName, companyCode, clientCode, storeCode, returnType, refundInd, requestQty, fulfillQty, quantityUM, msrPrice, totalWeight, totalVolume, weightUM, volumeUM, totalAmount, sourceLineNum, sourceOrderCode, sourceDiscountPrice, sourcePayAmount, sourceRequestQty, bomType, originalDetailId, reasonCode, reasonDescs,businessType,transactionDate,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary) + values + + (#{entity.hid},#{entity.ofsid},#{entity.returnorderid},#{entity.returnordercode},#{entity.skucode},#{entity.skuname},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.returntype},#{entity.refundind},#{entity.requestqty},#{entity.fulfillqty},#{entity.quantityum},#{entity.msrprice},#{entity.totalweight},#{entity.totalvolume},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.sourcelinenum},#{entity.sourceordercode},#{entity.sourcediscountprice},#{entity.sourcepayamount},#{entity.sourcerequestqty},#{entity.bomtype},#{entity.originaldetailid},#{entity.reasoncode},#{entity.reasondesc},#{entity.businessType},#{entity.transactionDate},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary}) + + + + + + insert into only_after_sales_b(hid,ofsid,returnOrderId, returnOrderCode, skuCode, skuName, companyCode, clientCode, storeCode, returnType, refundInd, requestQty, fulfillQty, quantityUM, msrPrice, totalWeight, totalVolume, weightUM, volumeUM, totalAmount, sourceLineNum, sourceOrderCode, sourceDiscountPrice, sourcePayAmount, sourceRequestQty, bomType, originalDetailId, reasonCode, reasonDesc,businessType,transactionDate,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary) + values + + (#{entity.hid},#{entity.ofsid},#{entity.returnorderid},#{entity.returnordercode},#{entity.skucode},#{entity.skuname},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.returntype},#{entity.refundind},#{entity.requestqty},#{entity.fulfillqty},#{entity.quantityum},#{entity.msrprice},#{entity.totalweight},#{entity.totalvolume},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.sourcelinenum},#{entity.sourceordercode},#{entity.sourcediscountprice},#{entity.sourcepayamount},#{entity.sourcerequestqty},#{entity.bomtype},#{entity.originaldetailid},#{entity.reasoncode},#{entity.reasondesc},#{entity.businessType},#{entity.transactionDate},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary}) + + on duplicate key update + hid = values(hid), + ofsid = values(ofsid), + returnOrderId = values(returnOrderId), + returnOrderCode = values(returnOrderCode), + skuCode = values(skuCode), + skuName = values(skuName), + companyCode = values(companyCode), + clientCode = values(clientCode), + storeCode = values(storeCode), + returnType = values(returnType), + refundInd = values(refundInd), + requestQty = values(requestQty), + fulfillQty = values(fulfillQty), + quantityUM = values(quantityUM), + msrPrice = values(msrPrice), + totalWeight = values(totalWeight), + totalVolume = values(totalVolume), + weightUM = values(weightUM), + volumeUM = values(volumeUM), + totalAmount = values(totalAmount), + sourceLineNum = values(sourceLineNum), + sourceOrderCode = values(sourceOrderCode), + sourceDiscountPrice = values(sourceDiscountPrice), + sourcePayAmount = values(sourcePayAmount), + sourceRequestQty = values(sourceRequestQty), + bomType = values(bomType), + originalDetailId = values(originalDetailId), + reasonCode = values(reasonCode), + reasonDesc = values(reasonDesc), + businessType = values(businessType), + transactionDate = values(transactionDate), + newPushDate = values(newPushDate), + newTransmitInfo = values(newTransmitInfo), + newState = values(newState), + newsystemnumber = values(newsystemnumber), + newsystemprimary = values(newsystemprimary) + + + + + insert into only_after_sales_b(ofsid,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary,def1,def2,def3,def4,def5,def6) + values + + (#{entity.ofsid},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6}) + + on duplicate key update + ofsid = values(ofsid), + newPushDate = values(newPushDate), + newTransmitInfo = values(newTransmitInfo), + newState = values(newState), + newsystemnumber = values(newsystemnumber), + newsystemprimary = values(newsystemprimary), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5), + def6 = values(def6) + + + + +update only_after_sales_b set + + hid = #{hid}, + ofsid = #{ofsid}, + returnOrderId = #{returnorderid}, + returnOrderCode = #{returnordercode}, + skuCode = #{skucode}, + skuName = #{skuname}, + companyCode = #{companycode}, + clientCode = #{clientcode}, + storeCode = #{storecode}, + returnType = #{returntype}, + refundInd = #{refundind}, + requestQty = #{requestqty}, + fulfillQty = #{fulfillqty}, + quantityUM = #{quantityum}, + msrPrice = #{msrprice}, + totalWeight = #{totalweight}, + totalVolume = #{totalvolume}, + weightUM = #{weightum}, + volumeUM = #{volumeum}, + totalAmount = #{totalamount}, + sourceLineNum = #{sourcelinenum}, + sourceOrderCode = #{sourceordercode}, + sourceDiscountPrice = #{sourcediscountprice}, + sourcePayAmount = #{sourcepayamount}, + sourceRequestQty = #{sourcerequestqty}, + bomType = #{bomtype}, + originalDetailId = #{originaldetailid}, + reasonCode = #{reasoncode}, + reasonDesc = #{reasondesc}, + platformDiscounts = #{platformDiscounts}, + merchantDiscounts = #{merchantDiscounts}, + expertDiscounts = #{expertDiscounts}, + payDiscounts = #{payDiscounts}, + businessType = #{businessType}, + transactionDate = #{transactionDate}, + newPushDate = #{newPushDate}, + newTransmitInfo = #{newTransmitInfo}, + newState = #{newState}, + newsystemnumber = #{newsystemnumber}, + newsystemprimary = #{newsystemprimary}, + +where id = #{id} + + + + +update only_after_sales_b set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + + +update only_after_sales_b set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and hid = #{hid} + and ofsid = #{ofsid} + and returnOrderId = #{returnorderid} + and returnOrderCode = #{returnordercode} + and skuCode = #{skucode} + and skuName = #{skuname} + and companyCode = #{companycode} + and clientCode = #{clientcode} + and storeCode = #{storecode} + and returnType = #{returntype} + and refundInd = #{refundind} + and requestQty = #{requestqty} + and fulfillQty = #{fulfillqty} + and quantityUM = #{quantityum} + and msrPrice = #{msrprice} + and totalWeight = #{totalweight} + and totalVolume = #{totalvolume} + and weightUM = #{weightum} + and volumeUM = #{volumeum} + and totalAmount = #{totalamount} + and sourceLineNum = #{sourcelinenum} + and sourceOrderCode = #{sourceordercode} + and sourceDiscountPrice = #{sourcediscountprice} + and sourcePayAmount = #{sourcepayamount} + and sourceRequestQty = #{sourcerequestqty} + and bomType = #{bomtype} + and originalDetailId = #{originaldetailid} + and reasonCode = #{reasoncode} + and reasonDesc = #{reasondesc} + and platformDiscounts = #{platformDiscounts} + and merchantDiscounts = #{merchantDiscounts} + and expertDiscounts = #{expertDiscounts} + and payDiscounts = #{payDiscounts} + and businessType = #{businessType} + and transactionDate = #{transactionDate} + and newPushDate = #{newPushDate} + and newTransmitInfo = #{newTransmitInfo} + and newState = #{newState} + and newsystemnumber = #{newsystemnumber} + and newsystemprimary = #{newsystemprimary} + + + + + + delete from only_after_sales_b where id = #{id} + + + \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.java b/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.java new file mode 100644 index 00000000..0f1faa43 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.java @@ -0,0 +1,308 @@ +package com.hzya.frame.report.lets.entity; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * 售后订单表_仅退款_主表(OnlyAfterSalesH)实体类 + * + * @author makejava + * @since 2024-09-23 10:43:08 + */ +@Data +public class OnlyAfterSalesHEntity extends BaseEntity { + + private String ofsid; + + /** + * 退货类型 + */ + private String returntype; + /** + * 换货方式 + */ + private String exchangetype; + /** + * 是否退款 + */ + private String refundind; + /** + * 系统内部类型 + */ + private String internalordertype; + /** + * 业务发生渠道 + */ + private String bizchannel; + /** + * 售后凭证单号 + */ + private String code; + /** + * 商家编码 + */ + private String companycode; + /** + * 组织 + */ + private String clientcode; + /** + * 店铺编码 + */ + private String storecode; + /** + * 平台客户账号 + */ + private String sourceuseraccount; + /** + * 平台客户昵称 + */ + private String sourceusername; + /** + * 退货状态 + */ + private String returnstatus; + /** + * 发货状态 + */ + private String shipstatus; + /** + * 退款状态 + */ + private String refundstatus; + /** + * 退回仓库 + */ + private String facilitycode; + /** + * 销售订单编号 + */ + private String refordercode; + /** + * 销售订单ID + */ + private Long reforderid; + /** + * 销售订单类型 + */ + private String refordertype; + /** + * 生成售后订单时的订单状态 + */ + private String reforderstatuswhenreturned; + /** + * 来源平台 + */ + private String sourceplatformcode; + /** + * 平台订单号 + */ + private String sourceordercode; + /** + * 平台订单状态 + */ + private String sourceorderstatuswhenreturned; + /** + * 平台退货单号 + */ + private String sourcereturncode; + /** + * 平台退货单状态 + */ + private String sourcereturnstatus; + /** + * 退货原因 + */ + private String reasoncode; + /** + * 客服备注 + */ + private String returnnote; + /** + * 卖家备注 + */ + private String sellernote; + /** + * 应退金额 + */ + private String requestrefundamount; + /** + * 实退金额 + */ + private String actualrefundamount; + /** + * 应退商品总数 + */ + private String totalqty; + /** + * 实退总数 + */ + private String totalfulfillqty; + /** + * 发货人 + */ + private String shipfromattentionto; + /** + * 地址 + */ + private String shipfromaddress; + /** + * 国家 + */ + private String shipfromcountry; + /** + * 省份 + */ + private String shipfromstate; + /** + * 城市 + */ + private String shipfromcity; + /** + * 区域 + */ + private String shipfromdistrict; + /** + * 邮编 + */ + private String shipfrompostalcode; + /** + * 电话 + */ + private String shipfromphone; + /** + * 手机 + */ + private String shipfrommobile; + /** + * 传真 + */ + private String shipfromfax; + /** + * 电子邮箱 + */ + private String shipfromemail; + /** + * 发货快递公司 + */ + private String shipcarrier; + /** + * 发货快递单号 + */ + private String shipwaybillcode; + /** + * 发货物流状态 + */ + private String shiplogisticsstatus; + /** + * 退回快递公司 + */ + private String returncarrier; + /** + * 退回快递单号 + */ + private String returnwaybillcode; + /** + * 退货物流状态 + */ + private String returnlogisticsstatus; + /** + * 支付账号 + */ + private String payaccount; + /** + * 退款支付交易单号 + */ + private String payorderno; + /** + * 审核人 + */ + private String auditby; + /** + * 审核时间 + */ + private String auditat; + /** + * 退款方式 + */ + private String refundthru; + /** + * 客服工号 + */ + private String csstuff; + /** + * 仓库备注 + */ + private String returnwarehousenote; + /** + * 锁定原因 + */ + private String holdcode; + /** + * 锁定用户 + */ + private String holduser; + /** + * 锁定时间 + */ + private String holdat; + /** + * 异常类型 + */ + private String errorcode; + /** + * 异常消息 + */ + private String errordesc; + /** + * 核销状态 + */ + private String verificationstatus; + /** + * 核销异常描述 + */ + private String verificationerrordesc; + /** + * 退款时间 + */ + private String refundedat; + /** + * 状态 + */ + private String status; + /** + * 处理类型 + */ + private String processtype; + + + //平台优惠 + private String platformDiscounts; + //商家优惠 + private String merchantDiscounts; + //达人优惠 + private String expertDiscounts; + //支付优惠 + private String payDiscounts; + + //业务类型 + private String businessType; + + //业务日期-退货完成时间或交易成功时间 + private String transactionDate; + + //推送时间 + private String newPushDate; + + //报错详情 + private String newTransmitInfo; + + //推送状态 + private String newState; + + //下游单号 + private String newsystemnumber; + + //下游主键 + private String newsystemprimary; +} \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.xml new file mode 100644 index 00000000..f02be95b --- /dev/null +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesHEntity.xml @@ -0,0 +1,973 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,ofsid + ,returnType + ,exchangeType + ,refundInd + ,internalOrderType + ,bizChannel + ,code + ,companyCode + ,clientCode + ,storeCode + ,sourceUserAccount + ,sourceUserName + ,returnStatus + ,shipStatus + ,refundStatus + ,facilityCode + ,refOrderCode + ,refOrderId + ,refOrderType + ,refOrderStatusWhenReturned + ,sourcePlatformCode + ,sourceOrderCode + ,sourceOrderStatusWhenReturned + ,sourceReturnCode + ,sourceReturnStatus + ,reasonCode + ,returnNote + ,sellerNote + ,requestRefundAmount + ,actualRefundAmount + ,totalQty + ,totalFulfillQty + ,shipFromAttentionTo + ,shipFromAddress + ,shipFromCountry + ,shipFromState + ,shipFromCity + ,shipFromDistrict + ,shipFromPostalCode + ,shipFromPhone + ,shipFromMobile + ,shipFromFax + ,shipFromEmail + ,shipCarrier + ,shipWaybillCode + ,shipLogisticsStatus + ,returnCarrier + ,returnWaybillCode + ,returnLogisticsStatus + ,payAccount + ,payOrderNo + ,auditBy + ,auditAt + ,refundThru + ,csStuff + ,returnWarehouseNote + ,holdCode + ,holdUser + ,holdAt + ,errorCode + ,errorDesc + ,verificationStatus + ,verificationErrorDesc + ,refundedAt + ,status + ,processType + ,platformDiscounts + ,merchantDiscounts + ,expertDiscounts + ,payDiscounts + ,businessType + ,transactionDate + ,newPushDate + ,newTransmitInfo + ,newState + ,newsystemnumber + ,newsystemprimary + + + + + + + + + + + + + + + + + insert into only_after_sales_h( + + id , + ofsid , + returnType , + exchangeType , + refundInd , + internalOrderType , + bizChannel , + code , + companyCode , + clientCode , + storeCode , + sourceUserAccount , + sourceUserName , + returnStatus , + shipStatus , + refundStatus , + facilityCode , + refOrderCode , + refOrderId , + refOrderType , + refOrderStatusWhenReturned , + sourcePlatformCode , + sourceOrderCode , + sourceOrderStatusWhenReturned , + sourceReturnCode , + sourceReturnStatus , + reasonCode , + returnNote , + sellerNote , + requestRefundAmount , + actualRefundAmount , + totalQty , + totalFulfillQty , + shipFromAttentionTo , + shipFromAddress , + shipFromCountry , + shipFromState , + shipFromCity , + shipFromDistrict , + shipFromPostalCode , + shipFromPhone , + shipFromMobile , + shipFromFax , + shipFromEmail , + shipCarrier , + shipWaybillCode , + shipLogisticsStatus , + returnCarrier , + returnWaybillCode , + returnLogisticsStatus , + payAccount , + payOrderNo , + auditBy , + auditAt , + refundThru , + csStuff , + returnWarehouseNote , + holdCode , + holdUser , + holdAt , + errorCode , + errorDesc , + verificationStatus , + verificationErrorDesc , + refundedAt , + status , + processType , + platformDiscounts , + merchantDiscounts , + expertDiscounts , + payDiscounts , + businessType , + transactionDate , + newPushDate , + newTransmitInfo , + newState , + newsystemnumber , + newsystemprimary , + + )values( + + #{id} , + #{ofsid} , + #{returntype} , + #{exchangetype} , + #{refundind} , + #{internalordertype} , + #{bizchannel} , + #{code} , + #{companycode} , + #{clientcode} , + #{storecode} , + #{sourceuseraccount} , + #{sourceusername} , + #{returnstatus} , + #{shipstatus} , + #{refundstatus} , + #{facilitycode} , + #{refordercode} , + #{reforderid} , + #{refordertype} , + #{reforderstatuswhenreturned} , + #{sourceplatformcode} , + #{sourceordercode} , + #{sourceorderstatuswhenreturned} , + #{sourcereturncode} , + #{sourcereturnstatus} , + #{reasoncode} , + #{returnnote} , + #{sellernote} , + #{requestrefundamount} , + #{actualrefundamount} , + #{totalqty} , + #{totalfulfillqty} , + #{shipfromattentionto} , + #{shipfromaddress} , + #{shipfromcountry} , + #{shipfromstate} , + #{shipfromcity} , + #{shipfromdistrict} , + #{shipfrompostalcode} , + #{shipfromphone} , + #{shipfrommobile} , + #{shipfromfax} , + #{shipfromemail} , + #{shipcarrier} , + #{shipwaybillcode} , + #{shiplogisticsstatus} , + #{returncarrier} , + #{returnwaybillcode} , + #{returnlogisticsstatus} , + #{payaccount} , + #{payorderno} , + #{auditby} , + #{auditat} , + #{refundthru} , + #{csstuff} , + #{returnwarehousenote} , + #{holdcode} , + #{holduser} , + #{holdat} , + #{errorcode} , + #{errordesc} , + #{verificationstatus} , + #{verificationerrordesc} , + #{refundedat} , + #{status} , + #{processtype} , + #{platformDiscounts} , + #{merchantDiscounts} , + #{expertDiscounts} , + #{payDiscounts} , + #{businessType} , + #{transactionDate} , + #{newPushDate} , + #{newTransmitInfo} , + #{newState} , + #{newsystemnumber} , + #{newsystemprimary} , + + ) + + + + + insert into only_after_sales_h(id,ofsid,returnType, exchangeType, refundInd, internalOrderType, bizChannel, code, companyCode, clientCode, storeCode, sourceUserAccount, sourceUserName, returnStatus, shipStatus, refundStatus, facilityCode, refOrderCode, refOrderId, refOrderType, refOrderStatusWhenReturned, sourcePlatformCode, sourceOrderCode, sourceOrderStatusWhenReturned, sourceReturnCode, sourceReturnStatus, reasonCode, returnNote, sellerNote, requestRefundAmount, actualRefundAmount, totalQty, totalFulfillQty, shipFromAttentionTo, shipFromAddress, shipFromCountry, shipFromState, shipFromCity, shipFromDistrict, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, shipCarrier, shipWaybillCode, shipLogisticsStatus, returnCarrier, returnWaybillCode, returnLogisticsStatus, payAccount, payOrderNo, auditBy, auditAt, refundThru, csStuff, returnWarehouseNote, holdCode, holdUser, holdAt, errorCode, errorDesc, verificationStatus, verificationErrorDesc, refundedAt, status, processType,businessType,transactionDate,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary) + values + + (#{entity.id},#{entity.ofsid},#{entity.returntype},#{entity.exchangetype},#{entity.refundind},#{entity.internalordertype},#{entity.bizchannel},#{entity.code},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.sourceuseraccount},#{entity.sourceusername},#{entity.returnstatus},#{entity.shipstatus},#{entity.refundstatus},#{entity.facilitycode},#{entity.refordercode},#{entity.reforderid},#{entity.refordertype},#{entity.reforderstatuswhenreturned},#{entity.sourceplatformcode},#{entity.sourceordercode},#{entity.sourceorderstatuswhenreturned},#{entity.sourcereturncode},#{entity.sourcereturnstatus},#{entity.reasoncode},#{entity.returnnote},#{entity.sellernote},#{entity.requestrefundamount},#{entity.actualrefundamount},#{entity.totalqty},#{entity.totalfulfillqty},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromcountry},#{entity.shipfromstate},#{entity.shipfromcity},#{entity.shipfromdistrict},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.shipcarrier},#{entity.shipwaybillcode},#{entity.shiplogisticsstatus},#{entity.returncarrier},#{entity.returnwaybillcode},#{entity.returnlogisticsstatus},#{entity.payaccount},#{entity.payorderno},#{entity.auditby},#{entity.auditat},#{entity.refundthru},#{entity.csstuff},#{entity.returnwarehousenote},#{entity.holdcode},#{entity.holduser},#{entity.holdat},#{entity.errorcode},#{entity.errordesc},#{entity.verificationstatus},#{entity.verificationerrordesc},#{entity.refundedat},#{entity.status},#{entity.processtype},#{entity.businessType},#{entity.transactionDate},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary}) + + + + + + insert into only_after_sales_h(ofsid,returnType, exchangeType, refundInd, internalOrderType, bizChannel, code, companyCode, clientCode, storeCode, sourceUserAccount, sourceUserName, returnStatus, shipStatus, refundStatus, facilityCode, refOrderCode, refOrderId, refOrderType, refOrderStatusWhenReturned, sourcePlatformCode, sourceOrderCode, sourceOrderStatusWhenReturned, sourceReturnCode, sourceReturnStatus, reasonCode, returnNote, sellerNote, requestRefundAmount, actualRefundAmount, totalQty, totalFulfillQty, shipFromAttentionTo, shipFromAddress, shipFromCountry, shipFromState, shipFromCity, shipFromDistrict, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, shipCarrier, shipWaybillCode, shipLogisticsStatus, returnCarrier, returnWaybillCode, returnLogisticsStatus, payAccount, payOrderNo, auditBy, auditAt, refundThru, csStuff, returnWarehouseNote, holdCode, holdUser, holdAt, errorCode, errorDesc, verificationStatus, verificationErrorDesc, refundedAt, status, processType,businessType) + values + + (#{entity.ofsid},#{entity.returntype},#{entity.exchangetype},#{entity.refundind},#{entity.internalordertype},#{entity.bizchannel},#{entity.code},#{entity.companycode},#{entity.clientcode},#{entity.storecode},#{entity.sourceuseraccount},#{entity.sourceusername},#{entity.returnstatus},#{entity.shipstatus},#{entity.refundstatus},#{entity.facilitycode},#{entity.refordercode},#{entity.reforderid},#{entity.refordertype},#{entity.reforderstatuswhenreturned},#{entity.sourceplatformcode},#{entity.sourceordercode},#{entity.sourceorderstatuswhenreturned},#{entity.sourcereturncode},#{entity.sourcereturnstatus},#{entity.reasoncode},#{entity.returnnote},#{entity.sellernote},#{entity.requestrefundamount},#{entity.actualrefundamount},#{entity.totalqty},#{entity.totalfulfillqty},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromcountry},#{entity.shipfromstate},#{entity.shipfromcity},#{entity.shipfromdistrict},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.shipcarrier},#{entity.shipwaybillcode},#{entity.shiplogisticsstatus},#{entity.returncarrier},#{entity.returnwaybillcode},#{entity.returnlogisticsstatus},#{entity.payaccount},#{entity.payorderno},#{entity.auditby},#{entity.auditat},#{entity.refundthru},#{entity.csstuff},#{entity.returnwarehousenote},#{entity.holdcode},#{entity.holduser},#{entity.holdat},#{entity.errorcode},#{entity.errordesc},#{entity.verificationstatus},#{entity.verificationerrordesc},#{entity.refundedat},#{entity.status},#{entity.processtype},#{entity.businessType}) + + on duplicate key update + ofsid = values(ofsid), + returnType = values(returnType), + exchangeType = values(exchangeType), + refundInd = values(refundInd), + internalOrderType = values(internalOrderType), + bizChannel = values(bizChannel), + code = values(code), + companyCode = values(companyCode), + clientCode = values(clientCode), + storeCode = values(storeCode), + sourceUserAccount = values(sourceUserAccount), + sourceUserName = values(sourceUserName), + returnStatus = values(returnStatus), + shipStatus = values(shipStatus), + refundStatus = values(refundStatus), + facilityCode = values(facilityCode), + refOrderCode = values(refOrderCode), + refOrderId = values(refOrderId), + refOrderType = values(refOrderType), + refOrderStatusWhenReturned = values(refOrderStatusWhenReturned), + sourcePlatformCode = values(sourcePlatformCode), + sourceOrderCode = values(sourceOrderCode), + sourceOrderStatusWhenReturned = values(sourceOrderStatusWhenReturned), + sourceReturnCode = values(sourceReturnCode), + sourceReturnStatus = values(sourceReturnStatus), + reasonCode = values(reasonCode), + returnNote = values(returnNote), + sellerNote = values(sellerNote), + requestRefundAmount = values(requestRefundAmount), + actualRefundAmount = values(actualRefundAmount), + totalQty = values(totalQty), + totalFulfillQty = values(totalFulfillQty), + shipFromAttentionTo = values(shipFromAttentionTo), + shipFromAddress = values(shipFromAddress), + shipFromCountry = values(shipFromCountry), + shipFromState = values(shipFromState), + shipFromCity = values(shipFromCity), + shipFromDistrict = values(shipFromDistrict), + shipFromPostalCode = values(shipFromPostalCode), + shipFromPhone = values(shipFromPhone), + shipFromMobile = values(shipFromMobile), + shipFromFax = values(shipFromFax), + shipFromEmail = values(shipFromEmail), + shipCarrier = values(shipCarrier), + shipWaybillCode = values(shipWaybillCode), + shipLogisticsStatus = values(shipLogisticsStatus), + returnCarrier = values(returnCarrier), + returnWaybillCode = values(returnWaybillCode), + returnLogisticsStatus = values(returnLogisticsStatus), + payAccount = values(payAccount), + payOrderNo = values(payOrderNo), + auditBy = values(auditBy), + auditAt = values(auditAt), + refundThru = values(refundThru), + csStuff = values(csStuff), + returnWarehouseNote = values(returnWarehouseNote), + holdCode = values(holdCode), + holdUser = values(holdUser), + holdAt = values(holdAt), + errorCode = values(errorCode), + errorDesc = values(errorDesc), + verificationStatus = values(verificationStatus), + verificationErrorDesc = values(verificationErrorDesc), + refundedAt = values(refundedAt), + status = values(status), + processType = values(processType), + businessType = values(businessType) + + + + + + insert into only_after_sales_h(id,businessType,transactionDate,newPushDate,newTransmitInfo,newState,newsystemnumber,newsystemprimary) + values + + (#{entity.id},#{entity.businessType},#{entity.transactionDate},#{entity.newPushDate},#{entity.newTransmitInfo},#{entity.newState},#{entity.newsystemnumber},#{entity.newsystemprimary}) + + on duplicate key update + id = values(id), + businessType = values(businessType), + transactionDate = values(transactionDate), + newPushDate = values(newPushDate), + newTransmitInfo = values(newTransmitInfo), + newState = values(newState), + newsystemnumber = values(newsystemnumber), + newsystemprimary = values(newsystemprimary) + + + + +update only_after_sales_h set + + ofsid = #{ofsid}, + returnType = #{returntype}, + exchangeType = #{exchangetype}, + refundInd = #{refundind}, + internalOrderType = #{internalordertype}, + bizChannel = #{bizchannel}, + code = #{code}, + companyCode = #{companycode}, + clientCode = #{clientcode}, + storeCode = #{storecode}, + sourceUserAccount = #{sourceuseraccount}, + sourceUserName = #{sourceusername}, + returnStatus = #{returnstatus}, + shipStatus = #{shipstatus}, + refundStatus = #{refundstatus}, + facilityCode = #{facilitycode}, + refOrderCode = #{refordercode}, + refOrderId = #{reforderid}, + refOrderType = #{refordertype}, + refOrderStatusWhenReturned = #{reforderstatuswhenreturned}, + sourcePlatformCode = #{sourceplatformcode}, + sourceOrderCode = #{sourceordercode}, + sourceOrderStatusWhenReturned = #{sourceorderstatuswhenreturned}, + sourceReturnCode = #{sourcereturncode}, + sourceReturnStatus = #{sourcereturnstatus}, + reasonCode = #{reasoncode}, + returnNote = #{returnnote}, + sellerNote = #{sellernote}, + requestRefundAmount = #{requestrefundamount}, + actualRefundAmount = #{actualrefundamount}, + totalQty = #{totalqty}, + totalFulfillQty = #{totalfulfillqty}, + shipFromAttentionTo = #{shipfromattentionto}, + shipFromAddress = #{shipfromaddress}, + shipFromCountry = #{shipfromcountry}, + shipFromState = #{shipfromstate}, + shipFromCity = #{shipfromcity}, + shipFromDistrict = #{shipfromdistrict}, + shipFromPostalCode = #{shipfrompostalcode}, + shipFromPhone = #{shipfromphone}, + shipFromMobile = #{shipfrommobile}, + shipFromFax = #{shipfromfax}, + shipFromEmail = #{shipfromemail}, + shipCarrier = #{shipcarrier}, + shipWaybillCode = #{shipwaybillcode}, + shipLogisticsStatus = #{shiplogisticsstatus}, + returnCarrier = #{returncarrier}, + returnWaybillCode = #{returnwaybillcode}, + returnLogisticsStatus = #{returnlogisticsstatus}, + payAccount = #{payaccount}, + payOrderNo = #{payorderno}, + auditBy = #{auditby}, + auditAt = #{auditat}, + refundThru = #{refundthru}, + csStuff = #{csstuff}, + returnWarehouseNote = #{returnwarehousenote}, + holdCode = #{holdcode}, + holdUser = #{holduser}, + holdAt = #{holdat}, + errorCode = #{errorcode}, + errorDesc = #{errordesc}, + verificationStatus = #{verificationstatus}, + verificationErrorDesc = #{verificationerrordesc}, + refundedAt = #{refundedat}, + status = #{status}, + processType = #{processtype}, + platformDiscounts = #{platformDiscounts}, + merchantDiscounts = #{merchantDiscounts}, + expertDiscounts = #{expertDiscounts}, + payDiscounts = #{payDiscounts}, + businessType = #{businessType}, + transactionDate = #{transactionDate}, + newPushDate = #{newPushDate}, + newTransmitInfo = #{newTransmitInfo}, + newState = #{newState}, + newsystemnumber = #{newsystemnumber}, + newsystemprimary = #{newsystemprimary}, + +where id = #{id} + + + + +update only_after_sales_h set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} +where id = #{id} + + + + +update only_after_sales_h set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and ofsid = #{ofsid} + and returnType = #{returntype} + and exchangeType = #{exchangetype} + and refundInd = #{refundind} + and internalOrderType = #{internalordertype} + and bizChannel = #{bizchannel} + and code = #{code} + and companyCode = #{companycode} + and clientCode = #{clientcode} + and storeCode = #{storecode} + and sourceUserAccount = #{sourceuseraccount} + and sourceUserName = #{sourceusername} + and returnStatus = #{returnstatus} + and shipStatus = #{shipstatus} + and refundStatus = #{refundstatus} + and facilityCode = #{facilitycode} + and refOrderCode = #{refordercode} + and refOrderId = #{reforderid} + and refOrderType = #{refordertype} + and refOrderStatusWhenReturned = #{reforderstatuswhenreturned} + and sourcePlatformCode = #{sourceplatformcode} + and sourceOrderCode = #{sourceordercode} + and sourceOrderStatusWhenReturned = #{sourceorderstatuswhenreturned} + and sourceReturnCode = #{sourcereturncode} + and sourceReturnStatus = #{sourcereturnstatus} + and reasonCode = #{reasoncode} + and returnNote = #{returnnote} + and sellerNote = #{sellernote} + and requestRefundAmount = #{requestrefundamount} + and actualRefundAmount = #{actualrefundamount} + and totalQty = #{totalqty} + and totalFulfillQty = #{totalfulfillqty} + and shipFromAttentionTo = #{shipfromattentionto} + and shipFromAddress = #{shipfromaddress} + and shipFromCountry = #{shipfromcountry} + and shipFromState = #{shipfromstate} + and shipFromCity = #{shipfromcity} + and shipFromDistrict = #{shipfromdistrict} + and shipFromPostalCode = #{shipfrompostalcode} + and shipFromPhone = #{shipfromphone} + and shipFromMobile = #{shipfrommobile} + and shipFromFax = #{shipfromfax} + and shipFromEmail = #{shipfromemail} + and shipCarrier = #{shipcarrier} + and shipWaybillCode = #{shipwaybillcode} + and shipLogisticsStatus = #{shiplogisticsstatus} + and returnCarrier = #{returncarrier} + and returnWaybillCode = #{returnwaybillcode} + and returnLogisticsStatus = #{returnlogisticsstatus} + and payAccount = #{payaccount} + and payOrderNo = #{payorderno} + and auditBy = #{auditby} + and auditAt = #{auditat} + and refundThru = #{refundthru} + and csStuff = #{csstuff} + and returnWarehouseNote = #{returnwarehousenote} + and holdCode = #{holdcode} + and holdUser = #{holduser} + and holdAt = #{holdat} + and errorCode = #{errorcode} + and errorDesc = #{errordesc} + and verificationStatus = #{verificationstatus} + and verificationErrorDesc = #{verificationerrordesc} + and refundedAt = #{refundedat} + and status = #{status} + and processType = #{processtype} + and platformDiscounts = #{platformDiscounts} + and merchantDiscounts = #{merchantDiscounts} + and expertDiscounts = #{expertDiscounts} + and payDiscounts = #{payDiscounts} + and businessType = #{businessType} + and transactionDate = #{transactionDate} + and newPushDate = #{newPushDate} + and newTransmitInfo = #{newTransmitInfo} + and newState = #{newState} + and newsystemnumber = #{newsystemnumber} + and newsystemprimary = #{newsystemprimary} + + + + + + delete from only_after_sales_h where id = #{id} + + + + diff --git a/service/src/main/java/com/hzya/frame/report/lets/service/ITocofsSaleoutService.java b/service/src/main/java/com/hzya/frame/report/lets/service/ITocofsSaleoutService.java index 0ff7db69..2cc9007a 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/service/ITocofsSaleoutService.java +++ b/service/src/main/java/com/hzya/frame/report/lets/service/ITocofsSaleoutService.java @@ -51,4 +51,18 @@ public interface ITocofsSaleoutService extends IBaseService onlyAfterSalesBEntityList = iOnlyAfterSalesBDao.query(onlyAfterSalesBEntity); + PageInfo pageInfo = new PageInfo(onlyAfterSalesBEntityList); + return BaseResult.getSuccessMessageEntity("查询成功", pageInfo); + } else if ("excel".equals(qType)) { + //导出模式 + List onlyAfterSalesBDtoArrayList = new ArrayList<>(); + try { + onlyAfterSalesBDtoArrayList = iOnlyAfterSalesBDao.queryPassiveComponentsExport(onlyAfterSalesBEntity); + } catch (Exception e) { + logger.error("导出模式下，查询目标数据失败！", e); + } + return BaseResult.getSuccessMessageEntity("查询成功", onlyAfterSalesBDtoArrayList); + } else { + return BaseResult.getFailureMessageEntity("查询失败，无法确定查询模式！请选择：查询模式 query、导出模式 excel！"); + } + } + + @Override + public JsonResultEntity queryRefundPassiveComponentsExcel(JSONObject jsonObject) throws Exception { + Assert.notNull(jsonObject, "jsonObject不能为空"); + JSONObject jsonStr = getstrObj("jsonStr", jsonObject); + Assert.notNull(jsonStr, "jsonStr对象不能为空！"); + jsonStr.put("qType", "excel"); + jsonObject.put("jsonStr", jsonStr); + + JsonResultEntity jsonResultEntity = queryRefundPassiveComponents(jsonObject); + if (jsonResultEntity != null && jsonResultEntity.getAttribute() != null) { + InputStream templateFileName = this.getClass().getClassLoader().getResourceAsStream(reportTemplatesurl); + String[] excelFile = createExcelFile(); + + List jsonResultEntityAttribute = (List) jsonResultEntity.getAttribute(); + EasyExcel.write(excelFile[0], OnlyAfterSalesBDto.class).withTemplate(templateFileName).sheet().doWrite(jsonResultEntityAttribute); + return BaseResult.getSuccessMessageEntity(excelFile[1]); + } else { + return BaseResult.getFailureMessageEntity("导出Excel，查询数据失败！"); + } + } } diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssalesordersearch/HeaderDto.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssalesordersearch/HeaderDto.java index 48783013..8b35fcfc 100755 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssalesordersearch/HeaderDto.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofssalesordersearch/HeaderDto.java @@ -98,6 +98,8 @@ public class HeaderDto { private String shipmentCode; private String isFinanical; private String finanicalStatus; + //交易成功时间 + private String tradeSuccessAt; //会员id private String memberId; diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java index f546a171..3899975c 100755 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java @@ -74,4 +74,9 @@ public class RerturnGoodsOrderSearchDetails { private String expertDiscounts; //支付优惠 private String payDiscounts; + //售后订单表头 + private RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader; + + //目标业务时间 + private String targetBusinessDate; } \ No newline at end of file