丽知:1、toc/tob仅退款修改日期取值问题(23:59:59取不到)
This commit is contained in:
parent
9d6966498c
commit
c06610b90c
|
@ -58,6 +58,7 @@ import java.util.stream.Collectors;
|
||||||
* refundInd:1 退款
|
* refundInd:1 退款
|
||||||
* <p>
|
* <p>
|
||||||
* 按天推送
|
* 按天推送
|
||||||
|
* 因为ofs 的接口查询限制原因>= < 故取2024-12-12当天单据时 : 2024-12-12 00:00:00 / 2024-12-13 00:00:00 ,单据日期为12-12丹当天的所有数据,tmdofs
|
||||||
*
|
*
|
||||||
* @Date:2024/9/21 17:19
|
* @Date:2024/9/21 17:19
|
||||||
*/
|
*/
|
||||||
|
@ -164,7 +165,7 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
|
||||||
|
|
||||||
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
||||||
queryReturnOrderRequestVO.setRefundedAt_start(previousDay + " 00:00:00");
|
queryReturnOrderRequestVO.setRefundedAt_start(previousDay + " 00:00:00");
|
||||||
queryReturnOrderRequestVO.setRefundedAt_end(previousDay+" 23:59:59");
|
queryReturnOrderRequestVO.setRefundedAt_end(today + " 00:00:00");
|
||||||
List<RerturnGoodsOrderSearchData> returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO);
|
List<RerturnGoodsOrderSearchData> returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO);
|
||||||
if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) {
|
if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) {
|
||||||
return;
|
return;
|
||||||
|
@ -224,16 +225,15 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 退款时间区间
|
* 退款时间区间
|
||||||
*
|
|
||||||
* @param startTime
|
|
||||||
* @param endTime
|
|
||||||
*/
|
*/
|
||||||
public void start(String startTime, String endTime) {
|
public void start(String startTime, String endTime) {
|
||||||
try {
|
try {
|
||||||
Date business_start = DateUtil.parse(startTime);
|
LocalDate start_parse = LocalDate.parse(startTime);
|
||||||
Date business_end = DateUtil.parse(endTime);
|
LocalDate end_parse = LocalDate.parse(endTime).plusDays(1);
|
||||||
String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00";
|
|
||||||
String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59";
|
String start = start_parse + " 00:00:00";
|
||||||
|
String end = end_parse + " 00:00:00";
|
||||||
|
|
||||||
|
|
||||||
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
||||||
queryReturnOrderRequestVO.setRefundedAt_start(start);
|
queryReturnOrderRequestVO.setRefundedAt_start(start);
|
||||||
|
|
|
@ -48,6 +48,7 @@ import org.springframework.stereotype.Service;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@ -60,6 +61,7 @@ import java.util.stream.Collectors;
|
||||||
* refundInd:1 退款
|
* refundInd:1 退款
|
||||||
* <p>
|
* <p>
|
||||||
* 按天推送
|
* 按天推送
|
||||||
|
* 因为ofs 的接口查询限制原因>= < 故取2024-12-12当天单据时 : 2024-12-12 00:00:00 / 2024-12-13 00:00:00 ,单据日期为12-12丹当天的所有数据,tmdofs
|
||||||
*
|
*
|
||||||
* @Date:2024/9/21 17:19
|
* @Date:2024/9/21 17:19
|
||||||
*/
|
*/
|
||||||
|
@ -166,7 +168,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
|
||||||
|
|
||||||
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
||||||
queryReturnOrderRequestVO.setRefundedAt_start(previousDay + " 00:00:00");
|
queryReturnOrderRequestVO.setRefundedAt_start(previousDay + " 00:00:00");
|
||||||
queryReturnOrderRequestVO.setRefundedAt_end(previousDay+" 23:59:59");
|
queryReturnOrderRequestVO.setRefundedAt_end(today + " 00:00:00");
|
||||||
List<RerturnGoodsOrderSearchData> returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO);
|
List<RerturnGoodsOrderSearchData> returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO);
|
||||||
if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) {
|
if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) {
|
||||||
return;
|
return;
|
||||||
|
@ -226,16 +228,15 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 退款时间区间
|
* 退款时间区间
|
||||||
*
|
|
||||||
* @param startTime
|
|
||||||
* @param endTime
|
|
||||||
*/
|
*/
|
||||||
public void start(String startTime, String endTime) {
|
public void start(String startTime, String endTime) {
|
||||||
try {
|
try {
|
||||||
Date business_start = DateUtil.parse(startTime);
|
|
||||||
Date business_end = DateUtil.parse(endTime);
|
LocalDate start_parse = LocalDate.parse(startTime);
|
||||||
String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00";
|
LocalDate end_parse = LocalDate.parse(endTime).plusDays(1);
|
||||||
String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59";
|
|
||||||
|
String start = start_parse + " 00:00:00";
|
||||||
|
String end = end_parse + " 00:00:00";
|
||||||
|
|
||||||
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO();
|
||||||
queryReturnOrderRequestVO.setRefundedAt_start(start);
|
queryReturnOrderRequestVO.setRefundedAt_start(start);
|
||||||
|
@ -665,6 +666,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 公司转换
|
* 公司转换
|
||||||
|
*
|
||||||
* @param allHeader
|
* @param allHeader
|
||||||
*/
|
*/
|
||||||
public void transCorp(List<RerturnGoodsOrderSearchHeader> allHeader) {
|
public void transCorp(List<RerturnGoodsOrderSearchHeader> allHeader) {
|
||||||
|
@ -680,11 +682,13 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
|
||||||
* TOC仅退款:JTK TOB仅退款:BJTK
|
* TOC仅退款:JTK TOB仅退款:BJTK
|
||||||
* parentvo.setXslxbm("JTK");
|
* parentvo.setXslxbm("JTK");
|
||||||
* 非b及c
|
* 非b及c
|
||||||
|
*
|
||||||
* @param parentvo
|
* @param parentvo
|
||||||
* @param shop
|
* @param shop
|
||||||
*/
|
*/
|
||||||
@Autowired
|
@Autowired
|
||||||
private ShopTobOrToCUtil shopTobOrToCUtil;
|
private ShopTobOrToCUtil shopTobOrToCUtil;
|
||||||
|
|
||||||
public String checkFlow(ArapDjzbVO.Parentt parentvo, String shop) {
|
public String checkFlow(ArapDjzbVO.Parentt parentvo, String shop) {
|
||||||
String tobShop = shopTobOrToCUtil.getCommaShop("TOB");
|
String tobShop = shopTobOrToCUtil.getCommaShop("TOB");
|
||||||
String tocShop = shopTobOrToCUtil.getCommaShop("TOC");
|
String tocShop = shopTobOrToCUtil.getCommaShop("TOC");
|
||||||
|
|
Loading…
Reference in New Issue