Просмотр исходного кода

【程序目录】拆单和退款问题修复

吴昊天 3 лет назад
Родитель
Сommit
8a3c5f0cce

+ 2 - 1
crmeb/app/model/order/StoreOrder.php

@@ -63,8 +63,9 @@ class StoreOrder extends BaseModel
      * 创建时间修改器
      * @return int
      */
-    protected function setAddTimeAttr()
+    protected function setAddTimeAttr($time = 0)
     {
+        if ($time) return $time;
         return time();
     }
 

+ 0 - 3
crmeb/app/services/order/StoreOrderRefundServices.php

@@ -200,9 +200,6 @@ class StoreOrderRefundServices extends BaseServices
                         if ($refundOrder['is_channel'] == 1) {
                             $refundData['trade_no'] = $refundOrder['trade_no'];
                             $refundData['pay_new_weixin_open'] = sys_config('pay_new_weixin_open');
-                            /** @var StoreOrderCreateServices $storeOrderCreateServices */
-                            $storeOrderCreateServices = app()->make(StoreOrderCreateServices::class);
-                            $refundData['refund_no'] = $refundData['refund_no'];
                             //小程序退款
                             $pay->refund($no, $refundData);//小程序
                         } else {

+ 0 - 1
crmeb/app/services/order/StoreOrderSplitServices.php

@@ -98,7 +98,6 @@ class StoreOrderSplitServices extends BaseServices
                     $order_data['order_id'] = $storeOrderCreateServices->getNewOrderId('cp');
                     $order_data['cart_id'] = [];
                     $order_data['unique'] = $storeOrderCreateServices->getNewOrderId('');
-                    $order_data['add_time'] = time();
                     $new_order = $this->dao->save($order_data);
                     if (!$new_order) {
                         throw new AdminException(400544);