修复bug

parent 438f9be6
......@@ -216,12 +216,13 @@ class AccountService {
public function withdrawApply($request){
$request->validate([
'amount' => 'required|numeric|min:1',
'amount' => 'required|numeric|min:1|max:500',
'pay_type' => ['required', Rule::in(['wechat', 'alipay', 'bank'])],
'bank_id' => Rule::requiredIf($request->input('pay_type') == 'bank'),
], [
'amount.required' => '请输入提现金额',
'amount.min' => '提现金额不能小于1元',
'amount.max' => '微信提现单笔不能超过500元',
'pay_type.required' => '请选择提现方式',
'pay_type.in' => '选择的提现方式有误',
'bank_id.required' => '请选择提现银行',
......
......@@ -549,16 +549,17 @@ class OrderService {
$itemCount = $order->detail()->count();
//扣除聚物通资金
if($order->polymer_money > 0){
app(\Modules\Member\Services\PolymerService::class)->createPolymer(store_id: 0, order_id: $order->id, member_id: $order->member['uid'], type: 'pay', account_type: 'order', amount: $order->polymer_money, remark: '订单支付');
}
// 订单详情商品处理
$order->detail()->with(['goods', 'sku'])->get()->each(function($item,$key) use ($order, $itemCount) {
// 积分商品积分扣除
if($item->total_integral > 0){
app(\Modules\Member\Services\ScoreService::class)->createScore(store_id: $item->store_id, order_id: $item->id, member_id: $order->member['uid'], type: 'pay', account_type: 'order', amount: $item->total_integral, remark: '订单支付');
}
// 聚物通扣除
if( $key== 0 && $order->polymer_money > 0){
app(\Modules\Member\Services\PolymerService::class)->createPolymer(store_id: $item->store_id, order_id: $item->id, member_id: $order->member['uid'], type: 'pay', account_type: 'order', amount: $order->polymer_money, remark: '订单支付');
}
if($item->goods->goods_type == 0){
$item->status = 3;
$item->save();
......
......@@ -110,7 +110,7 @@ class PaymentService {
if($payment && $payment->status == 0){
if($payment->integral > 0){//扣除积分
app(\Modules\Member\Services\ScoreService::class)->createScore(store_id: $item->store_id, order_id: $item->id, member_id: $order->member['uid'], type: 'pay', account_type: 'payment', amount: $item->total_integral, remark: '订单支付');
app(\Modules\Member\Services\ScoreService::class)->createScore(store_id: $payment->store_id, order_id: $payment->id, member_id: $order->member['uid'], type: 'pay', account_type: 'payment', amount: $payment->integral, remark: '店铺支付');
}
if($payment->polymer_money > 0){//扣除聚物通资金
......
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