no message

modules/Member/app/Models/MemberPolymer.php

@@ -13,7 +13,7 @@ use App\Models\BaseModel;
 class MemberPolymer extends BaseModel {
 
 	protected $table = 'member_polymer';
-	protected $fillable = ['store_id', 'order_id', 'member_id', 'type', 'amount', 'bf_amount', 'af_amount', 'status', 'remark'];
+	protected $fillable = ['store_id', 'order_id', 'member_id', 'type','account_type', 'amount', 'bf_amount', 'af_amount', 'status', 'remark'];
 	// protected $hidden = ['deleted_at'];
 
 	public function member() {

modules/Member/app/Models/MemberScore.php

@@ -13,7 +13,7 @@ use App\Models\BaseModel;
 class MemberScore extends BaseModel {
 
 	protected $table = 'member_score';
-	protected $fillable = ['store_id', 'order_id', 'member_id', 'type', 'amount', 'bf_amount', 'af_amount', 'status', 'remark'];
+	protected $fillable = ['store_id', 'order_id', 'member_id', 'type', 'amount','account_type', 'bf_amount', 'af_amount', 'status', 'remark'];
 	// protected $hidden = ['deleted_at'];
 
 	public function member() {

modules/Member/app/Services/PolymerService.php

@@ -106,7 +106,7 @@ class PolymerService {
 		if(!$member){
 			return false;
 		}
-		$af_amount = $member['polymer_money'] ? (in_array($type, ['pay', 'transfer']) ? bcsub($member['polymer_money'], $amount) : bcadd($member['polymer_money'], $amount)) : $amount;
+		$af_amount = $member['polymer_money'] ? (in_array($type, ['pay', 'transfer']) ? bcsub($member['polymer_money'], $amount,2) : bcadd($member['polymer_money'], $amount,2)) : $amount;
 		$bf_amount = $member['polymer_money'] ? $member['polymer_money'] : 0;
 
 		$data = [

modules/Member/app/Services/ScoreService.php

@@ -106,7 +106,7 @@ class ScoreService {
 		if(!$member){
 			return false;
 		}
-		$af_amount = $member['score'] ? (in_array($type, ['pay', 'transfer']) ? bcsub($member['score'], $amount) : bcadd($member['score'], $amount)) : $amount;
+		$af_amount = $member['score'] ? (in_array($type, ['pay', 'transfer']) ? bcsub($member['score'], $amount,2) : bcadd($member['score'], $amount,2)) : $amount;
 		$bf_amount = $member['score'] ? $member['score'] : 0;
 
 		$data = [

modules/Store/app/Controllers/Api/Payment.php

@@ -42,7 +42,8 @@ class Payment extends BaseController {
 				'amount.required' => '请输入金额',
 				'integral.required' => '请输入积分',
 			]);
-			$this->data['data'] = $payment =$service->create(store_id: $request->input('store_id'), amount: $request->input('amount'), integral: $request->input('integral'), polymer_money: $request->input('polymer_money'),pay_way: $request->input('pay_way'),remark: $request->input('remark'));
+			$polymer_money=$request->input('polymer_money',0);
+			$this->data['data'] = $payment = $service->create(store_id: $request->input('store_id'), amount: $request->input('amount'), integral: $request->input('integral'), polymer_money: $polymer_money,pay_way: $request->input('pay_way'),remark: $request->input('remark'));
 
 			if($payment->amount == 0){//聚物通支付完成
 				app(PaymentService::class)->paySuccess($payment->order_no, null);