Merge remote-tracking branch 'remotes/origin/freature/fix-parking-order' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1035,18 +1035,33 @@ public class OrderAdapter {
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
-            if (ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel())) {
+            if (ordersBean.getPayChannel() != null) {
+                if ("10102".equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("储值卡支付");
-            } else if (ordersBean.getPayChannel() != null && PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
+                }
+                else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("支付宝支付");
-            } else if (ordersBean.getPayChannel() != null && PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
+                }
+                else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("微信支付");
-            } else {
+                }
+                else {
                     responseVo.setOrderPayType("微信支付");
                 }
+            }
+            else {
                 if (OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())) {
                     responseVo.setOrderPayType("支付宝支付");
                 }
+                else if(OrderSourceType.SAAS.getCode().equals(ordersBean.getSource())) {
+                    responseVo.setOrderPayType("微信支付");
+                }
+                else {
+                    responseVo.setOrderPayType("微信支付");
+                }
+            }
+
+
             //取餐码用日订单序号代替- v1.5.4变更为四位随机数
             responseVo.setTakeCode(ordersBean.getOtherCode());
             responseVo.setAmount(ordersBean.getAmount());
@@ -1151,7 +1166,8 @@ public class OrderAdapter {
                         responseVo.setPromotionMessage(promotionMessageDto);
                     }
                     if (OrderAccountType.DELIVERY_AMOUNT.getCode().equals(accountBean.getType())) {
-                        deliveryAmount = accountBean.getPrice();
+                        //deliveryAmount = accountBean.getPrice();
+                        deliveryAmount = null != accountBean.getActualCostAmount() ? accountBean.getActualCostAmount() : accountBean.getPrice();
                     }
                     if (OrderAccountType.PACK_AMOUNT.getCode().equals(accountBean.getType())) {
                         packageAmount = accountBean.getPrice();

order-application-service/src/main/java/cn/freemud/service/impl/ParkingOrderServiceImpl.java

@@ -72,17 +72,18 @@ public class ParkingOrderServiceImpl implements ParkingOrderService {
         request.setPageSize(requestVo.getPageSize());
         request.setPageNum(requestVo.getPageNumber());
         Date date = new Date();
-        request.setStartTimestamp(DateUtil.addMonths(date, -3).getTime()/1000);
-        request.setEndTimestamp(date.getTime()/1000);
+        request.setStartTimestamp(DateUtil.addMonths(date, -3).getTime() / 1000);
+        request.setEndTimestamp(date.getTime() / 1000);
         request.setOrderClients(Arrays.asList(OrderClientType.PARKING.getIndex()));
-        request.setPayStatuses(Arrays.asList(2,3,4));
-        request.setBizTypes(Arrays.asList(1,99));
+        request.setPayStatuses(Arrays.asList(2, 3, 4));
+        request.setBizTypes(Arrays.asList(1, 99));
         BaseDownLoadResponse<List<OrderInfoReqs>> listBaseDownLoadResponse = orderDownLoadSdkService.queryOrderByConditions(request, trackingNo);
-        if(listBaseDownLoadResponse == null && !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(listBaseDownLoadResponse.getCode())){
+        if (listBaseDownLoadResponse == null && !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(listBaseDownLoadResponse.getCode())
+                && listBaseDownLoadResponse.getResult().size() > 0) {
             return ResponseUtil.success();
         }
         List<ParkingOrderResponseVo> dates = new ArrayList<>();
-        for (OrderInfoReqs orderInfo : listBaseDownLoadResponse.getResult()){
+        for (OrderInfoReqs orderInfo : listBaseDownLoadResponse.getResult()) {
             dates.add(convent2QueryOrdersDto(orderInfo));
         }
         responseVo.setDates(dates);

order-management/src/main/java/cn/freemud/management/enums/OrderSource.java

@@ -9,7 +9,8 @@ public enum OrderSource {
     FMWD("fmwd", "非码微店"),
     MALL("mall", "非码Mall"),
     SAAS("saas", "saas点餐"),
-    ALIPAY("alipay", "支付宝");
+    ALIPAY("alipay", "支付宝"),
+    EBAI("ebwm", "饿百外卖");
     private String source;
     private String sourceName;
 

order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java

@@ -30,7 +30,7 @@ public class OrderBeanFactory {
             return  applicationContext.getBean(McCafeMangerServiceImpl.class);
         }
         if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source)
-                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) || OrderSource.FMWD.getSource().equals(source)){
+                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source)){
             return applicationContext.getBean(WaimaiOrderMangerServiceImpl.class);
         }
         return applicationContext.getBean(SaasOrderMangerServiceImpl.class);