From 3e85a137adb035e4808e95edf7017f7f204900d9 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 22 May 2021 09:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-form.html           |    4 ++--
 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java
index 492ccdb..2ea6cb0 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java
@@ -61,11 +61,16 @@
                     i.getCount()).append(";"));
             ShopDeliveryInfo addInfo = shopDeliveryInfoDao.selectByOrderId(orderId);
 
+            String shippingMethod="物流配送";
+            if(AppConstance.SHIPPING_METHOD_SELF .equals(order.getShippingMethod())){
+                shippingMethod="门店自提";
+            }
             DingDingRobotUtil.sendText(wxOrderNoticeDingdingToken.getParamValue(),
                     "新订单,微商城订单编号 "+order.getOrderNo()
                             +"; 订单金额:¥"+order.getOrderMoney()
                             +";订单内容:"+ content.toString()
                             +";收货电话:"+ order.getUserTel()+",收货人:"+ order.getUserName()+",收货地址:"+ addInfo.getReceiveAddress()
+                        +"配送方式:"+shippingMethod
                     ,"");
         }else{
             LogUtil.debug("未配置订单钉钉提醒");
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-form.html
index 0030e60..ff23851 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-form.html
@@ -94,8 +94,8 @@
             <label class="col-sm-2 control-label">配送方式
             </label>
             <div class="col-sm-4">
-                <input autocomplete="off"   type="text" class="form-control" readonly="readonly"
-                       th:value="${orderInfo.shippingMethod}" nullmsg="订单备注不能为空">
+                <input autocomplete="off"   type="text" class="form-control" readonly="readonly" th:if="${orderInfo.shippingMethod==1}" th:value="物流配送"  >
+                <input autocomplete="off"   type="text" class="form-control" readonly="readonly" th:if="${orderInfo.shippingMethod==2}" th:value="门店自提"  >
             </div>
         </div>
         <div class="form-group">

--
Gitblit v1.9.1