Skip to content

J
jwhx
Commit 6fc57b2f authored by wuxiaoli's avatar wuxiaoli
Browse files
Options

Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/jwhx into dev

parents 344f1f17 928f0c6a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/Order/app/Services/RefundService.php
View file @ 6fc57b2f
...@@ -88,7 +88,8 @@ class RefundService { ...@@ -88,7 +88,8 @@ class RefundService {
$refund->member_id = auth('api')->user()['uid']; $refund->member_id = auth('api')->user()['uid'];
$refund->status = 0; $refund->status = 0;
$refund->refund_no = str_replace('-', '', Str::orderedUuid()); $refund->refund_no = str_replace('-', '', Str::orderedUuid());
$refund->amount = $item->total_price; $refund->amount = $item->total_price-$item->total_integral;
// $refund->amount = $item->total_price;
if($refund->save()){ if($refund->save()){
$item->status = 4; $item->status = 4;
......
modules/Wechat/app/Services/PayService.php
View file @ 6fc57b2f
...@@ -40,7 +40,7 @@ class PayService { ...@@ -40,7 +40,7 @@ class PayService {
$description = "订单支付"; $description = "订单支付";
break; break;
} }
$data->amount = $data->amount-$data->integral;
$payData = [ $payData = [
'mchid' => $config['mch_id'], 'mchid' => $config['mch_id'],
'appid' => $config['app_id'], 'appid' => $config['app_id'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment