Merge remote-tracking branch 'origin/div' into div

admin

2019-07-25 09476adf2ae2bcc2f6685dafe4707938fd82bc78

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -457,7 +457,7 @@
   public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {

      if (orderList != null)

         for (TaoBaoWeiQuanOrder order : orderList) {

            if (order.getState().equalsIgnoreCase("维权成功")) {

            if (order.getState().contains("维权成功")) {

               CMQManager.getInstance().addWeiQuanOrderMsg(order);

            }

         }