Merge branch 'master' of http://git.ds-bay.com/project/kmall-haikong

kmall-admin/src/main/java/com/kmall/admin/cuspay/biz/ali/AliCusDeclareBiz.java

@@ -122,11 +122,11 @@ public class AliCusDeclareBiz extends AbstractCusDeclareBiz implements CuspayBiz
             aliCbPayDoc.setTradeNo(params.get("tradeNo").toString());
             // 订购人姓名，可空
             if (params.get("buyerIdNo") != null) {
-                aliCbPayDoc.setBuyerName(params.get("buyerIdNo").toString());
+                aliCbPayDoc.setBuyerIdNo(params.get("buyerIdNo").toString());
             }
             // 订购人身份证号，可空
             if (params.get("buyerName") != null) {
-                aliCbPayDoc.setBuyerIdNo(params.get("buyerName").toString());
+                aliCbPayDoc.setBuyerName(params.get("buyerName").toString());
             }
 
             // *********设置支付单报关参数*********

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>