mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-08 11:48:07 +08:00
parent edd4f5bef7
commit 61b8d1bd10
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/logic/retail/CashierclassLogic.php
View File

@ -122,7 +122,7 @@ class CashierclassLogic extends BaseLogic
$item['msg']='预计48小时发货';
$item['goods_unit']=Unit::where('id',$item['unit'])->value('name');
});
$find['merchant_info']=Merchant::where('mer_id',$find['merchant'])->field('mer_name,service_phone')->find();
$find['merchant_info']=Merchant::where('mer_id',$find['merchant'])->field('mer_id,mer_name,service_phone')->find();
}
return $find->toArray();

13
app/api/controller/order/RetailOrderController.php
View File

@ -14,6 +14,7 @@ use app\common\logic\PaymentLogic;
use app\common\model\order\Cart;
use app\common\model\retail\Cashierclass;
use app\common\model\user\User;
use app\common\model\user\UserAddress;
use app\common\service\wechat\WeChatConfigService;
use support\Log;
@ -111,7 +112,9 @@ class RetailOrderController extends BaseApiController
*/
public function Repayment(){
$order_id = (int)$this->request->post('order_id');
$addressId = (int)$this->request->post('address_id');
$pay_type = (int)$this->request->post('pay_type');
$params=$this->request->post();
$where=[
'id'=>$order_id,
'uid'=>$this->userId,
@ -132,6 +135,16 @@ class RetailOrderController extends BaseApiController
}
}elseif($pay_type==PayEnum::WECHAT_PAY){
$redirectUrl = $params['redirect'] ?? '/pages/payment/payment';
if($addressId>0){
$address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find();
if($address){
$_order['real_name'] = $address['real_name'];
$_order['user_phone'] = $address['phone'];
$_order['user_address'] = $address['detail'];
$_order['address_id'] = $addressId;
$order=Cashierclass::where(['id'=>$order_id,'uid'=>Request()->userId])->update($_order);
}
}
$result = PaymentLogic::pay($pay_type,'cashierclass', $order, $this->userInfo['terminal'], $redirectUrl);
if (false === $result) {
return $this->fail(PaymentLogic::getError());

1
app/api/logic/order/OrderLogic.php
View File

@ -88,6 +88,7 @@ class OrderLogic extends BaseLogic
$_order['real_name'] = $address['real_name'];
$_order['user_phone'] = $address['phone'];
$_order['user_address'] = $address['detail'];
$_order['address_id'] = $addressId;
}
}
Db::startTrans();