xieruidong 2 年之前
父节点
当前提交
b6fc14de3d

+ 14 - 0
application/common/service/OrderContractSvc.php

@@ -36,4 +36,18 @@ class OrderContractSvc{
             ]);
         echo $content;
     }
+
+    public function taxName(){
+        $tax=$this->getOrder()->tax;
+        if(empty($tax)){
+            return '';
+        }
+        if(!$tax['u_type']==1){
+            return $tax['name'];
+        }
+        return $tax['open_name'];
+    }
+    public function getTaxNo(){
+        return $this->getOrder()->tax['tax_no']??'';
+    }
 }

+ 1 - 1
application/common/service/OrderService.php

@@ -223,7 +223,7 @@ class OrderService extends BaseService {
             $info['amount_coupon_level']=bcadd($info['amount_coupon_level'],$goods['amount_coupon_level']);
             $info['amount_install']=bcadd($info['amount_install'],$goods['amount_install']);
             $info['amount_discount']=bcadd($info['amount_discount'],$goods['amount_discount']);
-            $info['amount_cmn']=bcadd($info['amount_cmn'],$goods['amount_cmn']);
+            $info['amount_cmn']=bcadd($info['amount_cmn']??0,$goods['amount_cmn']);
         }
         if($this->coupon_use && !$injectCoupon){
             $this->error('优惠券不符合使用规则');

+ 4 - 4
application/contract/view/view/show.html

@@ -57,9 +57,9 @@
             1:甲方在屏酷(www.lcdled.cn)平台上下单支付全款,乙方收到全款之日起两个工作日内发货。若甲方要求乙方适当延后发货,甲方需提供盖章后的书面申请文件,在征得乙方同意后,在合理期限内,乙方予以配合。
         </div>
         <div class="flex-s" style="width: 1200px;text-align: left">
-            <div class="flex-1 ">2:收货人:</div>
-            <div class="flex-1 ">联系方式:</div>
-            <div class="flex-1 ">交货地点:</div>
+            <div class="flex-1 ">2:收货人:{$order.address.name}</div>
+            <div class="flex-1 ">联系方式:{$order.address.mobile}</div>
+            <div class="flex-1 ">交货地点:{$order.address.address}</div>
         </div>
         <div class="views">
             3:运费承担:乙方安排物流并承担运费。
@@ -112,7 +112,7 @@
             甲乙双方协商一致可以解除合同。合同有效期内,甲乙双方均不得单方面随意变更或者解除合同。合同如有未尽事宜,需经甲乙双方共同协商,做出补充规定,补充规定和本合同具有同等效力。本合同一式两份,双方各执一份,经双方授权代表签字加盖章之日起生效(传真、扫描件均有效,手改无效)。
         </div>
         <div class="flex-s">
-            <div class="flex-left">甲方(盖章):</div>
+            <div class="flex-left">甲方(盖章):{$order.tax.}</div>
             <div class="flex-left"  style="margin-right: 252px"> 乙方(盖章):苏州屏酷电子商务有限公司</div>
         </div>
         <div class="flex-s">