pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

sales_value

base
panliang 2022-07-21 10:23:11 +08:00
parent 4cc1ab4629
commit bdf67eda3a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/OrderService.php
View File

@ -739,7 +739,7 @@ class OrderService
$productsTotalAmount += $product['total_amount']; $productsTotalAmount += $product['total_amount'];
$vipDiscountAmount += $product['vip_discount_amount']; $vipDiscountAmount += $product['vip_discount_amount'];
$couponDiscountAmount += $product['coupon_discount_amount']; $couponDiscountAmount += $product['coupon_discount_amount'];
$salesValue = bcadd($salesValue, $product['total_sales_value']); $salesValue = bcadd($salesValue, $product['total_sales_value'], 2);
$bargainAmount += $product['bargain_amount']; $bargainAmount += $product['bargain_amount'];
} }

5
app/Services/Payment/WxpayService.php
View File

@ -57,9 +57,10 @@ class WxpayService
/** /**
* 微信企业付款到零钱 * 微信企业付款到零钱
* *
* @param array $params * @param array $params
* @return array * @return array
* @throws WeChatPayException
*/ */
public function transfer(array $params) public function transfer(array $params)
{ {
@ -87,7 +88,7 @@ class WxpayService
/** /**
* 查询 微信企业付款到零钱 的订单 * 查询 微信企业付款到零钱 的订单
* *
* @param string $no 商户订单号 * @param string $no 商户订单号
* @return array * @return array
*/ */

7
database/seeders/ShippingSeeder.php
View File

@ -4,6 +4,7 @@ namespace Database\Seeders;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;
use App\Models\{ShippingTemplate, ShippingRule, Zone}; use App\Models\{ShippingTemplate, ShippingRule, Zone};
use Illuminate\Support\Facades\DB;
class ShippingSeeder extends Seeder class ShippingSeeder extends Seeder
{ {
@ -18,11 +19,13 @@ class ShippingSeeder extends Seeder
'name' => '自提' 'name' => '自提'
]); ]);
\DB::table('shipping_rules')->insert([ $zons = Zone::where('type', Zone::TYPE_AREA)->pluck('id')->map(fn($v) => $v."");
DB::table('shipping_rules')->insert([
'template_id' => $template->id, 'template_id' => $template->id,
'type' => 1, 'type' => 1,
'info' => json_encode(["threshold" => "0"]), 'info' => json_encode(["threshold" => "0"]),
'zones' => json_encode(Zone::where('type', Zone::TYPE_AREA)->pluck('id')), 'zones' => json_encode($zons),
'created_at' => now(), 'created_at' => now(),
'updated_at' => now() 'updated_at' => now()
]); ]);