mac 1 week ago
parent
commit
e9736491e6
2 changed files with 14 additions and 0 deletions
  1. 10 0
      .idea/phpunit.xml
  2. 4 0
      app/controller/GoodsController.php

+ 10 - 0
.idea/phpunit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPUnit">
+    <option name="directories">
+      <list>
+        <option value="$PROJECT_DIR$/tests" />
+      </list>
+    </option>
+  </component>
+</project>

+ 4 - 0
app/controller/GoodsController.php

@@ -351,6 +351,9 @@ class GoodsController
                 $shuzizhengshu_price = Db::table('wa_goods')
                 $shuzizhengshu_price = Db::table('wa_goods')
                     ->where('id', $wa_goods->rebate_five)
                     ->where('id', $wa_goods->rebate_five)
                     ->value('pay_price');
                     ->value('pay_price');
+                $upgrade_price       = Db::table('wa_goods')
+                    ->where('id', $wa_goods->rebate_six)
+                    ->value('pay_price');
 
 
                 $arr[] = [
                 $arr[] = [
                     'good_name'          => $wa_goods->name,
                     'good_name'          => $wa_goods->name,
@@ -361,6 +364,7 @@ class GoodsController
                     'prestore_price'     => $wa_goods->prestore_price,
                     'prestore_price'     => $wa_goods->prestore_price,
                     'jiaona_price'       => $pay_goods->pay_price,
                     'jiaona_price'       => $pay_goods->pay_price,
                     'zichanxian_price'   => $shuzizhengshu_price,
                     'zichanxian_price'   => $shuzizhengshu_price,
+                    'upgrade_price'      => $upgrade_price,
                     'bonus'              => $wa_goods->bonus,
                     'bonus'              => $wa_goods->bonus,
                     'balance'            => $wa_goods->balance,
                     'balance'            => $wa_goods->balance,
                     'gift_money'         => $wa_goods->gift_money,
                     'gift_money'         => $wa_goods->gift_money,