Merge remote-tracking branch 'remotes/origin/feature/uiapp-fix'

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

@@ -918,18 +918,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());
@@ -1034,7 +1049,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();