Commit cd0cabd7 by xiaoer.li@freemud.com

fix

parent 89c660f6
...@@ -49,6 +49,7 @@ import org.springframework.stereotype.Component; ...@@ -49,6 +49,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -68,7 +69,7 @@ public class OrderCallBackMQService { ...@@ -68,7 +69,7 @@ public class OrderCallBackMQService {
@Autowired @Autowired
private AssortmentOpenPlatformWxappManager openPlatformWxappManager; private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
@Value("${saas.order.invoice.report.partnerIds}") @Value("${saas.order.invoice.report.partnerIds}")
private String InvoicePartnerIds; private String invoicePartnerIds;
public void sendOrderMQ(OrderCallBackRequestVo body) { public void sendOrderMQ(OrderCallBackRequestVo body) {
//发送订单回调 //发送订单回调
...@@ -235,17 +236,12 @@ public class OrderCallBackMQService { ...@@ -235,17 +236,12 @@ public class OrderCallBackMQService {
return ; return ;
} }
OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class); OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
if ( if (orderInfoReqs==null
( || !Arrays.asList(invoicePartnerIds.split(",")).contains(orderInfoReqs.getPartnerId())
orderInfoReqs == null || !NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())
|| !NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState()) || orderInfoReqs.getBizType()!=1) {
|| orderInfoReqs.getBizType()!=1
)
&& !InvoicePartnerIds.contains(orderInfoReqs.getPartnerId())
) {
return; return;
} }
try { try {
Header header = new Header("report", "call-back-service-api", Header header = new Header("report", "call-back-service-api",
OrderCallBackConfig.INVOICE_ROUTE_KEY, OrderCallBackConfig.INVOICE_QUEUE); OrderCallBackConfig.INVOICE_ROUTE_KEY, OrderCallBackConfig.INVOICE_QUEUE);
......
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