【程序目录】优化下单

crmeb/app/listener/order/OrderPaySuccessListener.php

@@ -67,7 +67,7 @@ class OrderPaySuccessListener implements ListenerInterface
         }
 
         //虚拟商品自动发货
-        if ($orderInfo['virtual_type'] > 0 && $orderInfo['combination_id'] == 0) {
+        if (in_array($orderInfo['virtual_type'], [1, 2]) && $orderInfo['combination_id'] == 0) {
             /** @var StoreOrderDeliveryServices $orderDeliveryServices */
             $orderDeliveryServices = app()->make(StoreOrderDeliveryServices::class);
             $orderDeliveryServices->virtualSend($orderInfo);

crmeb/app/listener/order/OrderShippingListener.php

@@ -16,7 +16,7 @@ class OrderShippingListener implements ListenerInterface
     public function handle($event): void
     {
         /** @var StoreOrder $order */
-        [$order_type, $order, $delivery_type, $delivery_id, $delivery_name] = $event;
+        [$order_type, $order, $delivery_type, $delivery_id, $delivery_code] = $event;
         $order_shipping_open = sys_config('order_shipping_open', 0);  // 小程序发货信息管理服务开关
         $secs = 0;
         if ($order && $order_shipping_open) {
@@ -87,8 +87,7 @@ class OrderShippingListener implements ListenerInterface
                     $shipping_list = [
                         [
                             'tracking_no' => $delivery_id ?? '',
-//                            'express_company' => $delivery_name ? $expressData[$delivery_name] : '',
-                            'express_company' => $delivery_name,
+                            'express_company' => $delivery_code,
                             'item_desc' => $item_desc,
                             'contact' => [
                                 'receiver_contact' => $order['user_phone']

crmeb/app/listener/user/RegisterListener.php

@@ -50,7 +50,7 @@ class RegisterListener implements ListenerInterface
 
             //自定义消息-下级用户绑定成功
             if ($res) {
-                $phone = app()->make(UserServices::class)->value($uid, 'phone');
+                $phone = app()->make(UserServices::class)->value($spreadUid, 'phone');
                 event('CustomNoticeListener', [$spreadUid, ['nickname' => $name, 'time' => date('Y-m-d H:i:s'), 'phone' => $phone], 'spread_success']);
             }
         }

crmeb/app/services/activity/combination/StorePinkServices.php

@@ -413,7 +413,7 @@ class StorePinkServices extends BaseServices
         //拼团卡密和优惠券商品，成团后发放
         $orderInfos = $orderService->getColumn([['order_id', 'in', $order_ids]], '*', 'order_id');
         foreach ($orderInfos as $orderInfo) {
-            if ($orderInfo['virtual_type'] > 0) {
+            if (in_array($orderInfo['virtual_type'], [1, 2])) {
                 $orderInfo['cart_id'] = json_decode($orderInfo['cart_id'], true);
                 /** @var StoreOrderDeliveryServices $orderDeliveryServices */
                 $orderDeliveryServices = app()->make(StoreOrderDeliveryServices::class);

crmeb/app/services/activity/seckill/StoreSeckillServices.php

@@ -117,11 +117,11 @@ class StoreSeckillServices extends BaseServices
             }
         }
         //限制编辑
-        if ($data['copy'] == 0 && $seckill) {
-            if ($seckill['stop_time'] + 86400 < time()) {
-                throw new AdminException(400508);
-            }
-        }
+//        if ($data['copy'] == 0 && $seckill) {
+//            if ($seckill['stop_time'] + 86400 < time()) {
+//                throw new AdminException(400508);
+//            }
+//        }
         if ($data['num'] < $data['once_num']) {
             throw new AdminException(400500);
         }
@@ -888,6 +888,7 @@ class StoreSeckillServices extends BaseServices
                     }
                 }
                 $seckillId = $this->dao->value(['activity_id' => $id, 'product_id' => $seckillData['product_id']], 'id') ?? 0;
+                $seckillData['description'] = app()->make(StoreDescriptionServices::class)->getDescription(['product_id' => $seckillData['product_id'], 'type' => 1]);
                 $this->saveData($seckillId, $seckillData);
             }
             return true;

crmeb/app/services/order/StoreOrderCreateServices.php

@@ -548,6 +548,7 @@ class StoreOrderCreateServices extends BaseServices
                 $uni_integral_price = (string)bcdiv((string)$integral_price, (string)$cart['cart_num'], 4);
                 $cart['truePrice'] = $cart['truePrice'] > $uni_integral_price ? bcsub((string)$cart['truePrice'], $uni_integral_price, 2) : 0;
             }
+            if ($cart['sum_true_price'] < 0) $cart['sum_true_price'] = '0.00';
         }
         try {
             [$cartInfo, $spread_ids] = $this->computeOrderProductBrokerage($uid, $cartInfo);

crmeb/app/services/pay/OrderOfflineServices.php

@@ -78,7 +78,7 @@ class OrderOfflineServices extends BaseServices
         }
 
         //虚拟商品自动发货
-        if ($orderInfo['virtual_type'] > 0) {
+        if (in_array($orderInfo['virtual_type'], [1, 2])) {
             /** @var StoreOrderDeliveryServices $orderDeliveryServices */
             $orderDeliveryServices = app()->make(StoreOrderDeliveryServices::class);
             $orderDeliveryServices->virtualSend($orderInfo);

crmeb/app/services/wechat/WechatQrcodeServices.php

@@ -155,7 +155,7 @@ class WechatQrcodeServices extends BaseServices
             }
             if (!$res) throw new AdminException(400237);
             $imageInfo = $this->downloadImage($resCode['url'], $name);
-            $systemAttachment->attachmentAdd($name, $imageInfo['size'], $imageInfo['type'], $imageInfo['att_dir'], $imageInfo['att_dir'], 1, $imageInfo['image_type'], time(), 2);
+            $systemAttachment->attachmentAdd($name, $imageInfo['size'], $imageInfo['type'], $imageInfo['att_dir'], $imageInfo['att_dir'], 1, $imageInfo['image_type'], time(), 1);
         }
         return strpos($imageInfo['att_dir'], 'http') === false ? $siteUrl . $imageInfo['att_dir'] : $imageInfo['att_dir'];
     }