Commit aaafffb4 by 查志伟

fix problem

parent b846b325
...@@ -659,25 +659,28 @@ public class OrderSdkAdapter { ...@@ -659,25 +659,28 @@ public class OrderSdkAdapter {
for (int i = 0; i < queryOrdersRequest.getSource().length; i++) { for (int i = 0; i < queryOrdersRequest.getSource().length; i++) {
if ("saas".equals(queryOrdersRequest.getSource()[i])) { if ("saas".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.SAAS.getIndex()); orderClients.add(OrderClientType.SAAS.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex());
} }
else if ("meals".equals(queryOrdersRequest.getSource()[i])) { else if ("meals".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.WAI_MEAL.getIndex()); orderClients.add(OrderClientType.WAI_MEAL.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex());
} }
else if ("saasmall".equals(queryOrdersRequest.getSource()[i])) { else if ("saasmall".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.SAASMALL.getIndex()); orderClients.add(OrderClientType.SAASMALL.getIndex());
} }
else if ("app".equals(queryOrdersRequest.getSource()[i])) { else if ("app".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.APP.getIndex()); orderClients.add(OrderClientType.APP.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex());
} }
else if ("beautiful".equals(queryOrdersRequest.getSource()[i])) { else if ("beautiful".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.BEAUTIFUL.getIndex()); orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex());
} }
else if ("cashier".equals(queryOrdersRequest.getSource()[i])) { else if ("cashier".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.CASHIER.getIndex()); orderClients.add(OrderClientType.CASHIER.getIndex());
} }
} }
orderClients.add(OrderClientType.TIKTOKPAY.getIndex()); orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex());
orderConditionsReq.setOrderClients(orderClients); orderConditionsReq.setOrderClients(orderClients);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try { try {
......
...@@ -4262,23 +4262,22 @@ public class OrderAdapter { ...@@ -4262,23 +4262,22 @@ public class OrderAdapter {
List<Integer> orderClients = new ArrayList<>(); List<Integer> orderClients = new ArrayList<>();
if (OrderChannelType.IWC.getCode().equals(channelType)) { if (OrderChannelType.IWC.getCode().equals(channelType)) {
orderClients.add(OrderClientType.WAI_MEAL.getIndex()); orderClients.add(OrderClientType.WAI_MEAL.getIndex());
//queryOrdersDto.setSource(new String[]{"meals"}); orderClients.add(OrderClientType.ALIPAY.getIndex());
} else if (OrderChannelType.SAASMALL.getCode().equals(channelType)) { } else if (OrderChannelType.SAASMALL.getCode().equals(channelType)) {
orderClients.add(OrderClientType.SAASMALL.getIndex()); orderClients.add(OrderClientType.SAASMALL.getIndex());
//queryOrdersDto.setSource(new String[]{"saasmall"});
} else if (OrderChannelType.APP.getCode().equals(channelType)) { } else if (OrderChannelType.APP.getCode().equals(channelType)) {
orderClients.add(OrderClientType.APP.getIndex()); orderClients.add(OrderClientType.APP.getIndex());
//queryOrdersDto.setSource(new String[]{"app"}); orderClients.add(OrderClientType.ALIPAY.getIndex());
} else if (OrderChannelType.BEAUTIFUL.getCode().equals(channelType)) {// 美业新加 } else if (OrderChannelType.BEAUTIFUL.getCode().equals(channelType)) {// 美业新加
orderClients.add(OrderClientType.BEAUTIFUL.getIndex()); orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex());
} else if (OrderChannelType.CASHIER.getCode().equals(channelType)) { } else if (OrderChannelType.CASHIER.getCode().equals(channelType)) {
orderClients.add(OrderClientType.CASHIER.getIndex()); orderClients.add(OrderClientType.CASHIER.getIndex());
} else { } else {
orderClients.add(OrderClientType.SAAS.getIndex()); orderClients.add(OrderClientType.SAAS.getIndex());
//queryOrdersDto.setSource(new String[]{"saas"}); orderClients.add(OrderClientType.ALIPAY.getIndex());
} }
orderClients.add(OrderClientType.TIKTOKPAY.getIndex()); orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
orderClients.add(OrderClientType.ALIPAY.getIndex());
queryOrdersDto.setOrderClients(orderClients); queryOrdersDto.setOrderClients(orderClients);
List<Integer> payStatus = new ArrayList<>(); List<Integer> payStatus = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment