Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/common.php

@@ -1456,7 +1456,7 @@ if (!function_exists('check_activity')) {
             if ($act['activity_stock'] < $good_num) return [];//throw new \think\Exception('商品活动库存剩余' . $act['activity_stock']);
             if ($price < $act['activity_price']) throw new \think\Exception('售价低于活动价' . $act['activity_price']);
 
-            $merge= $act['is_activity'] == 1 ? ['final_price' => $act['activity_price']] : ['final_price' => $act['settle_price']];
+            $merge= $act['is_activity'] == 0 ? ['final_price' => $act['activity_price']] : ['final_price' => $act['settle_price']];
             return array_merge($act,$merge);
         }
     }