Merge remote-tracking branch 'origin/master'

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -37,6 +37,7 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemR
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
 import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -141,7 +142,8 @@ public class OrderCallBackMQService {
         }
         try {
             OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
-            if (orderInfoReqs != null && OrderClientType.SAAS.getIndex().equals(orderInfoReqs.getOrderClient()) &&
+            List<Integer> allowOrderClientList = Lists.newArrayList(OrderClientType.SAAS.getIndex(), OrderClientType.ALIPAY.getIndex());
+            if (orderInfoReqs != null && allowOrderClientList.contains(orderInfoReqs.getOrderClient()) &&
                     ((body.getOperateType() == 0 && NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())) ||
                             (body.getOperateType() == 1 && NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())))) {
                 return orderInfoReqs;
@@ -218,6 +220,7 @@ public class OrderCallBackMQService {
             dishInfo.setCount(item.getProductQuantity());
             dishInfo.setName(item.getProductName());
             dishInfo.setPrice(item.getProductPrice().intValue());
+            dishInfo.setUrl(item.getProductPicUrl());
             dishList.add(dishInfo);
         }
         wechatReportOrderDto.setDishList(dishList);

call-back-service/src/main/java/cn/freemud/entities/dto/WechatReportOrderDto.java

@@ -115,6 +115,10 @@ public class WechatReportOrderDto {
          * 菜品数量
          */
         private float count;
+        /**
+         * 图片
+         */
+        private String url;
     }
 
     @Data