sales_value
parent
4cc1ab4629
commit
bdf67eda3a
|
|
@ -739,7 +739,7 @@ class OrderService
|
|||
$productsTotalAmount += $product['total_amount'];
|
||||
$vipDiscountAmount += $product['vip_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'];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,9 +57,10 @@ class WxpayService
|
|||
|
||||
/**
|
||||
* 微信企业付款到零钱
|
||||
*
|
||||
*
|
||||
* @param array $params
|
||||
* @return array
|
||||
* @throws WeChatPayException
|
||||
*/
|
||||
public function transfer(array $params)
|
||||
{
|
||||
|
|
@ -87,7 +88,7 @@ class WxpayService
|
|||
|
||||
/**
|
||||
* 查询 微信企业付款到零钱 的订单
|
||||
*
|
||||
*
|
||||
* @param string $no 商户订单号
|
||||
* @return array
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ namespace Database\Seeders;
|
|||
|
||||
use Illuminate\Database\Seeder;
|
||||
use App\Models\{ShippingTemplate, ShippingRule, Zone};
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class ShippingSeeder extends Seeder
|
||||
{
|
||||
|
|
@ -18,11 +19,13 @@ class ShippingSeeder extends Seeder
|
|||
'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,
|
||||
'type' => 1,
|
||||
'info' => json_encode(["threshold" => "0"]),
|
||||
'zones' => json_encode(Zone::where('type', Zone::TYPE_AREA)->pluck('id')),
|
||||
'zones' => json_encode($zons),
|
||||
'created_at' => now(),
|
||||
'updated_at' => now()
|
||||
]);
|
||||
|
|
|
|||
Loading…
Reference in New Issue