用户无需同步到chef库

app/api/controller/Checkout.php

@@ -135,7 +135,7 @@ class Checkout extends Controller
             return $this->renderError($Checkout->getError(), ['is_created' => false]);
         }
 
-        //金钱和积分的兑换比例 todo
+        //金钱和积分的兑换比例
         $rate = SettingModel::getItem('points_rate')['points_2_money'];
         if ($this->user['accumulate_points'] < bcmul($orderInfo['orderTotalPrice'] , $rate,0)) {
             return $this->renderError('积分不足哦', ['is_created' => false]);

app/api/model/Order.php

@@ -747,8 +747,10 @@ class Order extends OrderModel
         }*/
 
         $filter = $this->getFilter($type);
+        $rate = 0;
         if ($isExchange){
             $filter['pay_type'] = PayType::EXCHANGE;
+            $rate = SettingModel::getItem('points_rate')['points_2_money'];
         }
         // 当前用户ID
         $userId = UserService::getCurrentLoginUserId();
@@ -758,8 +760,12 @@ class Order extends OrderModel
             ->where('user_id', '=', $userId)
             ->where('is_delete', '=', 0)
             ->order(['create_time' => 'desc'])
-            ->paginate(15)->each(function($e){
+            ->paginate(15)->each(function($e) use ($isExchange,$rate){
                 $e['goods_total_num'] = 0;
+                $e['exchanged_points'] = 0;
+                if ($isExchange){
+                    $e['exchanged_points'] = bcmul($e['total_price'], $rate,0);
+                }
                 foreach ($e['goods'] as $good){
                     $e['goods_total_num'] += $good['total_num'];
                 }

app/common/model/User.php

@@ -319,7 +319,7 @@ class User extends BaseModel
      */
     public static function setDecAccumulatePoints(int $userId, string $payMoney, int $scene = AccumulatePointsScene::RECHARGE, string $describe = '')
     {
-        $rate = SettingModel::getItem('points_rate')['points_rate'];
+        $rate = SettingModel::getItem('points_rate')['points_2_money'];
         $points = bcmul(strval($payMoney),$rate,0);
         // 新增积分变动明细
         AccumulatePointsLog::add([