1

app/admin/model/order/StoreOrder.php

@@ -1260,7 +1260,7 @@ HTML;
             $open && BaseModel::beginTrans();
             $integral = bcadd($userInfo['integral'], $order['gain_integral'], 2);
             $res1 = false != User::where('uid', $userInfo['uid'])->update(['integral' => $integral]);
-            $res2 = false != UserBill::income('购买商品赠送积分', $order['uid'], 'integral', 'gain', $order['gain_integral'], $order['id'], bcadd($userInfo['integral'], $order['gain_integral'], 2), '购买商品赠送' . floatval($order['gain_integral']) . '积分');
+            $res2 = false != UserBill::income('购买商品赠送健康豆', $order['uid'], 'integral', 'gain', $order['gain_integral'], $order['id'], bcadd($userInfo['integral'], $order['gain_integral'], 2), '购买商品赠送' . floatval($order['gain_integral']) . '健康豆');
             $res = $res1 && $res2;
             $open && BaseModel::checkTrans($res);
             RoutineTemplate::sendUserIntegral($order['uid'], $order, $order['gain_integral'], $integral);

app/models/store/StoreOrder.php

@@ -898,13 +898,26 @@ class StoreOrder extends BaseModel
         //支付成功后
         event('OrderPaySuccess', [$order, $formId]);
         $type = User::where('uid', $order['uid'])->value('is_first');
+//        是否是报单商品
+        $string = trim($order['cart_id'], "[]");
+        $array = explode(",", $string);
+        foreach ($array as $v){
+            $product_id = StoreCart::where('id',$v)->value('product_id');
+            $is_explosive = StoreProduct::where('id',$product_id)->value('is_explosive');
+            if ($is_explosive == 1){
+                $type = 0;
+                break;
+            }
+        }
         if ($type == 1) {
             self::team_rewards($order, 2); //分发团队奖励 2复购
         } else {
             self::team_rewards($order, 1); //分发团队奖励 1首单
             User::where('uid', $order['uid'])->update(['is_first' => 1]); //修改用户是否首单
         }
+        $res1 = StoreOrder::gainUserIntegral($order);  //直接发积分
         $res = $res1 && $resPink && UserSpread::setSpreadSure($order['uid']) && User::backOrderBrokerage($order);
+
         return false !== $res;
     }
 
@@ -1462,7 +1475,7 @@ class StoreOrder extends BaseModel
             $userInfo = User::getUserInfo($order['uid']);
             BaseModel::beginTrans();
             $res1 = false != User::where('uid', $userInfo['uid'])->update(['integral' => bcadd($userInfo['integral'], $order['gain_integral'], 2)]);
-            $res2 = false != UserBill::income('购买商品赠送积分', $order['uid'], 'integral', 'gain', $order['gain_integral'], $order['id'], $userInfo['integral'], '购买商品赠送' . floatval($order['gain_integral']) . '积分');
+            $res2 = false != UserBill::income('购买商品赠送健康豆', $order['uid'], 'integral', 'gain', $order['gain_integral'], $order['id'], $userInfo['integral'], '购买商品赠送' . floatval($order['gain_integral']) . '健康豆');
             $res = $res1 && $res2;
             BaseModel::checkTrans($res);
             return $res;

crmeb/repositories/OrderRepository.php

@@ -103,13 +103,14 @@ class OrderRepository
      */
     public static function storeProductOrderUserTakeDelivery($order, $uid)
     {
-        $res1 = StoreOrder::gainUserIntegral($order);
+//        $res1 = StoreOrder::gainUserIntegral($order);
 //        $res2 = User::backOrderBrokerage($order);
         $res2 = User::sendBackOrderBrokerage($order);
         StoreOrder::orderTakeAfter($order);
         //满赠优惠券
         WechatUser::userTakeOrderGiveCoupon($uid, $order['total_price']);
-        if (!($res1 && $res2)) exception('收货失败!');
+//        if (!($res1 && $res2)) exception('收货失败!');
+        if (!$res2) exception('收货失败!');
     }
 
     /**