修复支付功能，添加商品列表，优化代码结构
This commit is contained in:
parent
6c1ff9a354
commit
885695d643
@ -21,6 +21,7 @@ use Webman\RedisQueue\Redis;
|
||||
use Yansongda\Pay\Pay;
|
||||
use Webman\Push\Api;
|
||||
use JPush\Client as JPush;
|
||||
use support\Log;
|
||||
|
||||
class IndexController extends BaseApiController
|
||||
{
|
||||
@ -28,19 +29,17 @@ class IndexController extends BaseApiController
|
||||
|
||||
public function index()
|
||||
{
|
||||
$auth_code=$this->request->get('auth_code');
|
||||
$config = Config::get('payment');
|
||||
Pay::config($config);
|
||||
|
||||
// $select=(new Goods())->column('class');
|
||||
// $a=array_unique($select);
|
||||
// $arr=[];
|
||||
// foreach($a as $k=>$v){
|
||||
// $pid=Goodsclass::where('id',$v)->value('pid');
|
||||
// $arr[$pid][]=$v;
|
||||
// }
|
||||
// foreach($arr as $k=>$v){
|
||||
// Goodsclass::where('id',$k)->update(['children'=>json_encode($v,true)]);
|
||||
// }
|
||||
$a=Goodsclass::where('pid',0)->where('children','<>',null)->column('id');
|
||||
d ($a);
|
||||
$result = Pay::alipay()->pos([
|
||||
'out_trade_no' => time(),
|
||||
'auth_code' => $auth_code,
|
||||
'total_amount' => '0.01',
|
||||
'subject' => 'yansongda 测试 - 01',
|
||||
]);
|
||||
d($result);
|
||||
// $arr = [];
|
||||
// foreach ($a as $k => $v) {
|
||||
// $pid = Goodsclass::where('id', $v)->value('pid');
|
||||
|
||||
@ -6,6 +6,7 @@ use app\common\enum\PayEnum;
|
||||
use app\common\logic\PayNotifyLogic;
|
||||
use app\common\model\retail\Cashierclass;
|
||||
use app\common\service\pay\PayService;
|
||||
use support\Log;
|
||||
|
||||
/**
|
||||
* 支付
|
||||
@ -15,7 +16,7 @@ use app\common\service\pay\PayService;
|
||||
class PayController extends BaseApiController
|
||||
{
|
||||
|
||||
public $notNeedLogin = ['notifyMnp'];
|
||||
public $notNeedLogin = ['notifyMnp','alipay_return','alipay_notify'];
|
||||
|
||||
/**
|
||||
* @notes 小程序支付回调
|
||||
@ -57,4 +58,34 @@ class PayController extends BaseApiController
|
||||
return $this->fail('订单支付中');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 支付宝同步回调地址
|
||||
*/
|
||||
public function alipay_return(){
|
||||
$app=new PayService();
|
||||
$result = $app->alipay->callback(Request()->post());
|
||||
Log::error('支付宝同步回调',$result->toArray());
|
||||
// if($result && $result->event_type=='TRANSACTION.SUCCESS'){
|
||||
// $ciphertext=$result->resource['ciphertext'];
|
||||
// if ($ciphertext['trade_state'] === 'SUCCESS') {
|
||||
// $extra['transaction_id'] = $ciphertext['transaction_id'];
|
||||
// $attach = $ciphertext['attach'];
|
||||
// switch ($attach) {
|
||||
// case 'cashierclass':
|
||||
// PayNotifyLogic::handle('cashierclass', $ciphertext['out_trade_no'], $ciphertext);
|
||||
// $app->wechat->success();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
/**
|
||||
* 支付宝异步回调地址
|
||||
*/
|
||||
public function alipay_notify(){
|
||||
$app=new PayService();
|
||||
$result = $app->alipay->callback(Request()->post());
|
||||
Log::error('支付宝异步回调',$result->toArray());
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,5 +13,12 @@ class GoodsController extends BaseApiController{
|
||||
return $this->dataLists(new GoodsLists());
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品列表
|
||||
*/
|
||||
public function mer_list(){
|
||||
$this->request->__set('mer_id',$this->request->userInfo['merchant']['mer_id']??0);
|
||||
return $this->dataLists(new GoodsLists());
|
||||
}
|
||||
|
||||
}
|
||||
@ -8,6 +8,7 @@ use app\common\model\goods\Goods;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
use app\common\model\goods\Goodsclass;
|
||||
use app\common\model\goods\GoodsLabel;
|
||||
use think\facade\Db;
|
||||
|
||||
/**
|
||||
* 商品列表列表
|
||||
@ -96,6 +97,20 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
|
||||
}else{
|
||||
$order['id'] = 'desc';
|
||||
}
|
||||
$mer_id=$this->request->__get('mer_id');
|
||||
if($mer_id){
|
||||
$goods_id=Db::name('merchant_bind_goods')->where('mer_id',$mer_id)->limit($this->limitOffset, $this->limitLength)->column('goods_id');
|
||||
if($goods_id){
|
||||
return Goods::where($this->searchWhere)->where('id','in',$goods_id)
|
||||
->field(['id', 'name','brand','class','unit', 'sell', 'code','imgs','sales','spec'])
|
||||
->with(['className','brandName','unitName'])
|
||||
->order($order)
|
||||
->select()
|
||||
->toArray();
|
||||
}else{
|
||||
return [];
|
||||
}
|
||||
}
|
||||
return Goods::where($this->searchWhere)->where($where)
|
||||
->field(['id', 'name','brand','class','unit', 'sell', 'code','imgs','sales','spec'])
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
@ -127,6 +142,10 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
|
||||
$where[]=['class','=',$class_all];
|
||||
}
|
||||
}
|
||||
$mer_id=$this->request->__get('mer_id');
|
||||
if($mer_id){
|
||||
return Db::name('merchant_bind_goods')->where('mer_id',$mer_id)->count();
|
||||
}
|
||||
return Goods::where($this->searchWhere)->where($where)->count();
|
||||
}
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ class PayService extends BasePayService
|
||||
* @var
|
||||
*/
|
||||
public $wechat;
|
||||
protected $alipay;
|
||||
public $alipay;
|
||||
|
||||
|
||||
/**
|
||||
@ -57,6 +57,7 @@ class PayService extends BasePayService
|
||||
$this->auth = UserAuth::where(['user_id' => $userId, 'terminal' => $terminal])->findOrEmpty();
|
||||
}
|
||||
$this->wechat=Pay::wechat();
|
||||
$this->alipay=Pay::alipay();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -13,15 +13,15 @@ return [
|
||||
// 必填-应用私钥 字符串或路径
|
||||
'app_secret_cert' => 'MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCktKWIoqSZ8BoSpALMsvTEsEQ1kF++wBeneams0Q17LvqGDBgiGuuICU0tnhBrjEkJFIw+5ApiHdkwbjFRqDqXyNj7B9fMBWp+QeHf6KvmRsPOHZegyvmQlqvMYf6hF4OwVKDrtVi6I1hVdrwf35h8KEGh4QM0WyXno2bJ7OVQDL49enrG7dXZQkwnwiluuxgjKphC2WYHCERGiYbrRKWXtQmzivjw7YTtfSXvypp8N3pSWXkWeLqpGGK3GG3pcUu4U+y4RFknnzSpiv20EJ6gw3pjUDkzexJoGh9byFOMoRVTJpIV8iTshdozd69ny5FjmIoXIouGCjdwp6M+XCXVAgMBAAECggEAJ1Dn4sHQQN7Lmn+EG5DsVLcu0QpxkHsSKmwkUJhme20vaCgi6qE6b/KodacxjDqkhIJfJ/QPdnRhj+n949wggHL1OJcasBzq2tCnNme4APQLcXwm4b8R663LvLH3skSGruTEtP9I+sXNJDl/lqwtHhYN9LJdrXXEipK6yqC97Gl7JznT/VXctOebXqFtdxm1M1zCoxwWwU20rYbNV74VIwIQhhNYaParU7ycVRgxw7wFhImGfy/y4SgHVTOS2Lhj12oDhHVSkhQjyEL4IKlI7Np/5jbZax+NWZjiTUJcDYEK6v6hpw0Skjf7fCBhbiHWTFm0LsBonLhX0b7hKaRYAQKBgQDu6fpxBmqpFy1Vzr/VWIWR9pXNtPqD3aVGWOUm3BuTyTtM8vEr6hcFIzjDae2JzSHTwAlNXQlifx43W630Iq2/AfYLsK1jtfqPRnuB1B4Bd+dixslG5a+mvpYTX0h9nZittWUh07tB8peoRidhnre0kKBZgdsO0XaaEpGkxoaEgQKBgQCwfBEq87wF5a9elUgJuDoqpglFWj8S52YqtolLdtpPpR7CtOLgAQb/ZAZ2Q0knAXcHgNoabqTJ1/psVc33+Lg3bQZyXiy9KUT72SoNhXa+kqWOAqjb4rEqL9x65l1A04Xxd4D0D3Drf0nv4TTaJfjjM/nRRWmqcOEKcvzgakKnVQKBgQCvI9EXCBgqqrXuQGj6kjEgpn581R4MivA82K/rw9Fnjk4tg67ufWWwu3hCMKYUrc8NdqqbDwfxL7TL6iZkYQOzkVF4kmUZQm9Slt21d/UjKG30SDuHAJu6hd5ohyISC/S/6skfeiK9HoS0s/DsrDiJYrhZxUr72uux2Mjx3SMBgQKBgQCX88qoS8Eo5rDO5ANpcviJ/flfgCtscFYUEqQ1mHixOH86r5njup62x/2UV6yla+p7SGMBfSBfNZlFK7+ycLDT8Agr8o/csqrVmQ5PJAmwXf0zP3D6Gb3mj9zq6GuERFtAI1+hQ6Y67ZbQdfwWk7kujnLaz0QCXzwzzfuSkYsgHQKBgFadCh1lJYQcpCjEDD50QAdbfzhVJRSYVEQhj2ekQ+w7hEndXiwptucPt8vs39qRfyXwoez2dWbK9ZUmU3/DTZBtL/1OmpDV2yPYi+xpipgzETB44mQnpcAcvaxU59j0oZQxXsWXHKNfOBzO2KgrReHnY7oUurPPq1A76yEcGmtn',
|
||||
// 必填-应用公钥证书 路径
|
||||
'app_public_cert_path' => runtime_path() . '/cert/ali/RSA2048.txt',
|
||||
'app_public_cert_path' => runtime_path() . '/cert/ali/appCertPublicKey_2021004146699603.crt',
|
||||
// 必填-支付宝公钥证书 路径
|
||||
'alipay_public_cert_path' => runtime_path() . '/cert/ali/alipayPublicKey_RSA2.txt',
|
||||
'alipay_public_cert_path' => runtime_path() . '/cert/ali/alipayCertPublicKey_RSA2.crt',
|
||||
// 必填-支付宝根证书 路径
|
||||
'alipay_root_cert_path' => runtime_path() . '/cert/ali/CSR.csr',
|
||||
'alipay_root_cert_path' => runtime_path() . '/cert/ali/alipayRootCert.crt',
|
||||
// 选填-同步回调地址
|
||||
'return_url' => 'https://erp.lihaink.cn/api/pay/alipay-return',
|
||||
'return_url' => 'https://erp.lihaink.cn/api/pay/alipay_return',
|
||||
// 选填-异步回调地址
|
||||
'notify_url' => 'https://erp.lihaink.cn/api/pay/alipay-notify',
|
||||
'notify_url' => 'https://erp.lihaink.cn/api/pay/alipay_notify',
|
||||
// 选填-服务商模式下的服务商 id，当 mode 为 Pay::MODE_SERVICE 时使用该参数
|
||||
'service_provider_id' => '',
|
||||
// 选填-默认为正常模式。可选为： MODE_NORMAL, MODE_SANDBOX, MODE_SERVICE
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user