Merge remote-tracking branch 'upsteam/master'

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -432,7 +432,7 @@
                         <div class="modal-body">
                                 <div class="row" style="border:0">
                                     <div class="col-md-3" id="orderNo">订单编号: {{orderEntity.orderSn}}</div>
-                                    <div class="col-md-3" id="serialNumber">支付流水号: <span>{{orderProcessRecord.payTransactionId}}</span></div>
+                                    <div class="col-md-3" id="serialNumber">支付流水号: <span>{{orderEntity.payTransactionId}}</span></div>
                                     <div class="col-md-3" id="waybillNo">运单编号: {{orderProcessRecord.logisticsNo}}</div>
                                     <div class="col-md-3" id="inventoryNo">清单编号: {{orderProcessRecord.invtNo}}</div>
                                 </div>

kmall-admin/src/main/webapp/WEB-INF/page/sys/main.html

@@ -17,8 +17,8 @@
                     <i class="fa fa-shopping-bag"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toOrderByShipStatus()" class="small-box-footer">详情 <i-->
-<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toOrderByShipStatus()" class="small-box-footer">详情 <i
+                        class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
@@ -31,8 +31,8 @@
                     <i class="fa fa-shopping-bag"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toOrderByShipStatus(0)" class="small-box-footer">详情 <i-->
-<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toOrderByShipStatus(0)" class="small-box-footer">详情 <i
+                        class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
@@ -45,8 +45,8 @@
                     <i class="fa fa-shopping-bag"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toOrderByShipStatus(1)" class="small-box-footer">详情 <i-->
-<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toOrderByShipStatus(1)" class="small-box-footer">详情 <i
+                        class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
@@ -59,8 +59,8 @@
                     <i class="fa fa-shopping-bag"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toOrderByPayStatus(0)" class="small-box-footer">详情 <i-->
-<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toOrderByPayStatus(0)" class="small-box-footer">详情 <i
+                        class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
@@ -73,8 +73,8 @@
                     <i class="fa fa-shopping-bag"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toOrderByRefundStatus(1)" class="small-box-footer">详情 <i-->
-<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toOrderByRefundStatus(1)" class="small-box-footer">详情 <i
+                        class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
@@ -87,8 +87,8 @@
                     <i class="fa fa-shopping-bag"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toOrderByOrderStatus(402)" class="small-box-footer">详情 <i-->
-<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toOrderByOrderStatus(402)" class="small-box-footer">详情 <i
+                        class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
@@ -101,7 +101,7 @@
                     <i class="fa fa-user-md"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toUser()" class="small-box-footer">详情 <i class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toUser()" class="small-box-footer">详情 <i class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
@@ -114,7 +114,7 @@
                     <i class="fa fa-ship"></i>
                 </div>
                 <a class="small-box-footer"></a>
-<!--                <a onclick="vm.toGoods()" class="small-box-footer">详情 <i class="fa fa-arrow-circle-right"></i></a>-->
+                <a onclick="vm.toGoods()" class="small-box-footer">详情 <i class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
     </div>

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1562,7 +1562,7 @@ function getPrintContent(ticket) {
     content += "打印日期:" + ticket.time;
     content += "</div>";
     content += "<div style=\"width: 100%;margin:5px 0px;font-size: 13px;\">";
-    content += "该取货单号只有当天有效!"
+    content += "该小票只有当天有效!"
     content += "</div>";
     content += "<div style=\"width: 100%;margin:5px 0px;font-size: 13px;\">";
     content += "请妥善保管好小票，以免造成个人信息泄露!"

kmall-manager/src/main/resources/conf/haikong.properties

@@ -31,7 +31,7 @@ haikong.test.vmcconnect.secretKey=GXfc6ZtDlnxHxmmAHvfRfqvrqgfwRiJX
 haikong.test.vmcconnect.requestRetry=2
 
 #### \u514D\u7A0Emall\u751F\u4EA7\u73AF\u5883
-haikong.prod.vmcconnect.url=https://testmall.greedc.com/openapi/vmcconnect/json
-haikong.prod.vmcconnect.appId=5
-haikong.prod.vmcconnect.secretKey=GXfc6ZtDlnxHxmmAHvfRfqvrqgfwRiJX
+haikong.prod.vmcconnect.url=https://testmall.booniu.com/openapi/vmcconnect/json
+haikong.prod.vmcconnect.appId=3
+haikong.prod.vmcconnect.secretKey=0AhZJYj7EAxMmXS1ntxnyWdGM98XdZnE
 haikong.prod.vmcconnect.requestRetry=2