fix:处理

application/admin/view/shop/order/detail.html

@@ -251,7 +251,7 @@
                 <div class="col-xs-6">
                     <ul class="list-group">
                         <li class="list-group-item">档案名称：{$row.order_profile.profile_name|default='未填写'}</li>
-                        <li class="list-group-item">关系：{$row.order_profile.relation_text|default='未知'}</li>
+                        <!-- <li class="list-group-item">关系：{$row.order_profile.relation_text|default='未知'}</li> -->
                         <li class="list-group-item">性别：{$row.order_profile.gender_text|default='未知'}</li>
                         <li class="list-group-item">年龄：{$row.order_profile.age|default='0'}岁</li>
                         <li class="list-group-item">身高：{$row.order_profile.height|default='0'}cm</li>
@@ -296,25 +296,30 @@
                                 <li class="list-group-item">腰围：{$row.order_profile.waist|default='0'}cm</li>
                                 <li class="list-group-item">臀围：{$row.order_profile.hip|default='0'}cm</li>
                                 <li class="list-group-item">大腿围：{$row.order_profile.thigh|default='0'}cm</li>
+                                 <li class="list-group-item">膝围：{$row.order_profile.knee|default='0'}cm</li>
                                 <li class="list-group-item">小腿围：{$row.order_profile.calf|default='0'}cm</li>
                             </ul>
                         </div>
                         <div class="col-xs-4">
                             <ul class="list-group">
-                                <li class="list-group-item">上臂围：{$row.order_profile.upper_arm|default='0'}cm</li>
-                                <li class="list-group-item">前臂围：{$row.order_profile.forearm|default='0'}cm</li>
-                                <li class="list-group-item">颈围：{$row.order_profile.neck|default='0'}cm</li>
-                                <li class="list-group-item">肩宽：{$row.order_profile.shoulder_width|default='0'}cm</li>
-                                <li class="list-group-item">胸围（女）：{$row.order_profile.bust|default='0'}cm</li>
+                                <li class="list-group-item">臂长：{$row.order_profile.arm_length|default='0'}cm</li>
+                                <li class="list-group-item">腕围：{$row.order_profile.wrist|default='0'}cm</li>
+                                 <li class="list-group-item">裤长：{$row.order_profile.pants_length|default='0'}cm</li>
+                                <li class="list-group-item">鞋码：{$row.order_profile.shoe_size|default='0'}cm</li>
+                                <li class="list-group-item">腿根：{$row.order_profile.leg_root|default='0'}cm</li>
+                                <li class="list-group-item">颈围：{$row.order_profile.neck|default='0'}cm</li>                              
                             </ul>
                         </div>
                         <div class="col-xs-4">
                             <ul class="list-group">
-                                <li class="list-group-item">下胸围：{$row.order_profile.underbust|default='0'}cm</li>
-                                <li class="list-group-item">内缝长：{$row.order_profile.inseam|default='0'}cm</li>
-                                <li class="list-group-item">外缝长：{$row.order_profile.outseam|default='0'}cm</li>
-                                <li class="list-group-item">膝围：{$row.order_profile.knee|default='0'}cm</li>
-                                <li class="list-group-item">手腕围：{$row.order_profile.wrist|default='0'}cm</li>
+                                <li class="list-group-item">肚围：{$row.order_profile.belly_belt|default='0'}cm</li>
+                                <li class="list-group-item">肩宽：{$row.order_profile.shoulder_width|default='0'}cm</li>
+                                <li class="list-group-item">内腿长：{$row.order_profile.inseam|default='0'}cm</li>
+                                <li class="list-group-item">上臂围：{$row.order_profile.upper_arm|default='0'}cm</li>
+                                <li class="list-group-item">脚踝围：{$row.order_profile.ankle|default='0'}cm</li>
+                                <li class="list-group-item">下腰围：{$row.order_profile.waist_lower|default='0'}cm</li>                                
+                                <li class="list-group-item">中腰围：{$row.order_profile.mid_waist|default='0'}cm</li>                               
+                              
                             </ul>
                         </div>
                     </div>
@@ -374,7 +379,7 @@
     
     <!--  -->
     <div class="panel panel-default">
-        <div class="panel-heading print-flex">
+        <!-- <div class="panel-heading print-flex">
             <span>收货(快递)信息</span>
             <div class="electronics print-flex">
                 <input class="form-control selectpage" data-field="title" data-source="shop/electronics_order/index" id="electronics_id" placeholder="请选择电子面单模板">
@@ -387,7 +392,7 @@
                     打印发货单
                 </a>
             </div>
-        </div>
+        </div> -->
         <div class="panel-body">
             <div class="row">
                 <div class="col-xs-6">
@@ -406,14 +411,14 @@
                     <p>地址创建时间：{if !empty($row.order_address)}{$row.order_address.createtime|date="Y-m-d H:i:s",###}{else/}未知{/if}</p>
                     <p>发货方式：{$row.delivery_type_text|default=$row.delivery_type|default='未知'}</p>
                 </div>
-                <div class="col-xs-6">
+                <!-- <div class="col-xs-6">
                     <p>快递公司：{$row.express_name|htmlentities}</p>
                     <p>快递单号：{$row.express_no|htmlentities}</p>
                     <p>快递费用：￥{$row.express_fee|default='0.00'}</p>
                     {if !empty($row.invoice_status)}
                     <p>发票状态：{$row.invoice_status_text|default=$row.invoice_status|default='未开发票'}</p>
                     {/if}
-                </div>
+                </div> -->
             </div>
         </div>
     </div>

application/common/Service/Pay/Provider/Alipay.php

@@ -4,7 +4,8 @@ namespace addons\shopro\library\pay\provider;
 
 use think\Log;
 use think\exception\HttpResponseException;
-use addons\shopro\service\pay\PayRefund;
+use app\common\Service\Pay\PayRefund;
+
 use Yansongda\Pay\Pay;
 use app\common\Service\Pay\Provider\Base;
 
@@ -30,8 +31,7 @@ class Alipay extends Base
         if (in_array($this->platform, ['WechatOfficialAccount', 'WechatMiniProgram', 'H5'])) {
             // 返回支付宝支付链接
             if (!$from == 'url') {
-                // return request()->domain() . '/shop/api/pay/alipay?pay_sn=' . $order['out_trade_no'] . '&platform=' . $this->platform . '&return_url=' . urlencode($this->config['alipay']['default']['return_url']);
-                return request()->domain() . '/addons/shopro/pay/alipay?pay_sn=' . $order['out_trade_no'] . '&platform=' . $this->platform . '&return_url=' . urlencode($this->config['alipay']['default']['return_url']);
+                 return request()->domain() . 'api/pay/alipay?pay_sn=' . $order['out_trade_no'] . '&platform=' . $this->platform . '&return_url=' . urlencode($this->config['alipay']['default']['return_url']);
             }
         } 
 
@@ -119,21 +119,21 @@ class Alipay extends Base
             
             $out_trade_no = $data['out_trade_no'];          // 商户单号
             $out_refund_no = $data['out_biz_no'] ?? '';     // 退款单号
-            if (
-                $data['notify_type'] == 'trade_status_sync'      // 同步交易状态
-                && $data['trade_status'] == 'TRADE_CLOSED'          // 交易关闭
-                && $out_refund_no                                   // 退款单号
-            ) {
-                // 交给退款实例处理
-                $refund = new PayRefund();
-                $refund->notify([
-                    'out_trade_no' => $out_trade_no,
-                    'out_refund_no' => $out_refund_no,
-                    'payment_json' => json_encode($data)
-                ]);
-
-                return Pay::alipay()->success();
-            }
+            // if (
+            //     $data['notify_type'] == 'trade_status_sync'      // 同步交易状态
+            //     && $data['trade_status'] == 'TRADE_CLOSED'          // 交易关闭
+            //     && $out_refund_no                                   // 退款单号
+            // ) {
+            //     // 交给退款实例处理
+            //     $refund = new PayRefund();
+            //     $refund->notify([
+            //         'out_trade_no' => $out_trade_no,
+            //         'out_refund_no' => $out_refund_no,
+            //         'payment_json' => json_encode($data)
+            //     ]);
+
+            //     return Pay::alipay()->success();
+            // }
 
             // 判断支付宝是否是支付成功状态，如果不是，直接返回响应
             if ($data['trade_status'] != 'TRADE_SUCCESS') {
@@ -197,7 +197,7 @@ class Alipay extends Base
      */
     protected function formatConfig($config, $data = [])
     {
-        $config['notify_url'] = request()->domain() . '/addons/shopro/pay/notify/payment/alipay/platform/' . $this->platform;
+        $config['notify_url'] = request()->domain() . '/api/pay/notify/payment/alipay/platform/' . $this->platform;
 
         if (in_array($this->platform, ['WechatOfficialAccount', 'WechatMiniProgram', 'H5'])) {
             // app 支付不能带着个参数