mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#114) from dev into master

Browse Source 
Reviewed-on: #114
This commit is contained in:
mkm 2024-01-06 18:37:20 +08:00
commit 2026874d0c
7 changed files with 66 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -220,7 +220,7 @@ class StoreOrderRepository extends BaseRepository
$storeOrderProfitsharingRepository = app()->make(StoreOrderProfitsharingRepository::class);
$uid = $groupOrder->uid;
$i = 1;
$isVipCoupon = app()->make(StoreGroupOrderRepository::class)->isVipCoupon($groupOrder);
// $isVipCoupon = app()->make(StoreGroupOrderRepository::class)->isVipCoupon($groupOrder);
//订单记录
$storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
$svipDiscount = 0;
@ -345,7 +345,7 @@ class StoreOrderRepository extends BaseRepository
if (!$presell) {
if ($order['commission_rate'] > 0) {
if ($order['commission_rate'] > 0 ||$order->source==103) {
$finance[] = [
'order_id' => $order->order_id,
'order_sn' => $order->order_sn,
@ -550,28 +550,16 @@ class StoreOrderRepository extends BaseRepository
return $cart['activeSku']['active_price'];
// 更新调货价格
} else if ($cart['product_type'] == '98') {
// if ($cart['source_id'] > 0) {
// $resale_find = Db::name('resale')->where('community_id', $cart['source_id'])->where('product_attr_unique', $cart['product_attr_unique'])->find();
// if ($resale_find &&$resale_find['status']==0) {
// return $resale_find['price'];
// }else if($resale_find['status']==1){
// throw new ValidateException('商品已转售');
// }
// else {
// throw new ValidateException('转售商品数据异常');
// }
// } else {
// return $cart['productAttr']['price'];
// }
if (in_array($cart['source'],[9,10,11,12,13,103])) {
// if($type==0){
// return $cart['productAttr']['price'];
// }else{
if($type==1){
return $cart['productAttr']['procure_price'];
}else{
if (in_array($cart['source'],[9,10,11,12,13])) {
return $cart['productAttr']['procure_price'];
// }
} else {
return $cart['productAttr']['price'];
} else {
return $cart['productAttr']['price'];
}
}
// 更新委托价格
} else if ($cart['product_type'] == '99') {
if ($cart['source_id'] > 0) {

105
app/common/repositories/system/financial/FinancialRepository.php
View File

@ -35,7 +35,6 @@ class FinancialRepository extends BaseRepository
public function financialAccountForm($id)
{
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $id])->find();
$form = Elm::createForm(Route::buildUrl('merchantFinancialAccountSave',['id' => $id])->build());
$form->setRule([
Elm::radio('financial_type', '转账类型', $merchant->financial_type)
@ -47,9 +46,9 @@ class FinancialRepository extends BaseRepository
[
'value' => 1,
'rule'=> [
Elm::input('name', '公司名称')->value($merchant->financial_bank->name??'')->required(),
Elm::input('name', $merchant->is_company==1?'公司名称':'持卡人')->value($merchant->financial_bank->name??'')->required(),
Elm::input('bank', '开户银行')->value($merchant->financial_bank->bank??'')->required(),
Elm::input('bank_code', '对公账号')->value($merchant->financial_bank->bank_code??'')->required(),
Elm::input('bank_code', $merchant->is_company==1?'对公账号':'银行卡号')->value($merchant->financial_bank->bank_code??'')->required(),
Elm::input('bank_branch', '开户网点')->value($merchant->financial_bank->bank_branch??'')->required(),
]
],
@ -164,8 +163,8 @@ class FinancialRepository extends BaseRepository
Elm::radio('financial_type', '转账类型:', $merchant->financial_type)
->setOptions([
['value' => 1, 'label' => '银行卡'],
['value' => 2, 'label' => '微信'],
['value' => 3, 'label' => '支付宝'],
// ['value' => 2, 'label' => '微信'],
// ['value' => 3, 'label' => '支付宝'],
])->control([
[
'value' => 1,
@ -190,54 +189,54 @@ class FinancialRepository extends BaseRepository
],
]
],
[
'value' => 2,
'rule'=> [
[
'type' => 'span',
'title' => '姓名',
'native' => false,
'children' => [$merchant->financial_wechat->name??'未填写']
],
[
'type' => 'span',
'title' => '微信号',
'native' => false,
'children' => [$merchant->financial_wechat->wechat??'未填写']
],
[
'type' => 'img',
'title' => '收款二维码',
'native' => false,
'attrs' => ['src' => $merchant->financial_wechat->wechat_code ?? ''],
'style' => ['width' => '86px','height' => '48px']
],
]
],
[
'value' => 3,
'rule'=> [
[
'type' => 'span',
'title' => '姓名',
'native' => false,
'children' => [$merchant->financial_alipay->name??'未填写']
],
[
'type' => 'span',
'title' => '支付宝账号',
'native' => false,
'children' => [$merchant->financial_alipay->alipay??'未填写']
],
[
'type' => 'img',
'title' => '收款二维码',
'native' => false,
'attrs' => ['src' => $merchant->financial_alipay->alipay_code ?? ''],
'style' => ['width' => '86px','height' => '48px']
],
]
],
// [
// 'value' => 2,
// 'rule'=> [
// [
// 'type' => 'span',
// 'title' => '姓名',
// 'native' => false,
// 'children' => [$merchant->financial_wechat->name??'未填写']
// ],
// [
// 'type' => 'span',
// 'title' => '微信号',
// 'native' => false,
// 'children' => [$merchant->financial_wechat->wechat??'未填写']
// ],
// [
// 'type' => 'img',
// 'title' => '收款二维码',
// 'native' => false,
// 'attrs' => ['src' => $merchant->financial_wechat->wechat_code ?? ''],
// 'style' => ['width' => '86px','height' => '48px']
// ],
// ]
// ],
// [
// 'value' => 3,
// 'rule'=> [
// [
// 'type' => 'span',
// 'title' => '姓名',
// 'native' => false,
// 'children' => [$merchant->financial_alipay->name??'未填写']
// ],
// [
// 'type' => 'span',
// 'title' => '支付宝账号',
// 'native' => false,
// 'children' => [$merchant->financial_alipay->alipay??'未填写']
// ],
// [
// 'type' => 'img',
// 'title' => '收款二维码',
// 'native' => false,
// 'attrs' => ['src' => $merchant->financial_alipay->alipay_code ?? ''],
// 'style' => ['width' => '86px','height' => '48px']
// ],
// ]
// ],
]),
Elm::number('extract_money', '申请金额:')->value($extract_minimum_num)->required(),

2
public/system.html
View File

File diff suppressed because one or more lines are too long

2
public/system/css/chunk-715975c7.d81ac472.css → public/system/css/chunk-558c8390.16d070e1.css
View File

@ -1 +1 @@
.projectInfo[data-v-6321a5b0] .el-dialog__body{padding-top:0!important}.projectInfo[data-v-6321a5b0] .el-tabs__content{padding-left:10px!important}.tabPic[data-v-6321a5b0]{width:40px!important;height:40px!important}.tabPic img[data-v-6321a5b0]{width:100%;height:100%}.sp[data-v-6321a5b0]{display:block;width:33%;font-size:12px;margin-bottom:20px}.sp100[data-v-6321a5b0]{width:100%;margin-bottom:15px;display:inline-block}.third[data-v-6321a5b0]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.pictrue[data-v-6321a5b0]{display:inline-block}.pictrue img[data-v-6321a5b0]{width:100%;height:100%}.demo-image__preview[data-v-6321a5b0]{display:inline-block}.pictrue[data-v-6321a5b0]{width:60px;height:60px;border:1px dotted rgba(0,0,0,.1);margin-right:10px;position:relative;cursor:pointer}.pictrue .img[data-v-6321a5b0]{width:100%;height:100%}.details_pictrue[data-v-6321a5b0]{width:400px;height:400px}[data-v-1be5c7e2] .el-select-dropdown__item{max-width:350px!important}.template[data-v-1be5c7e2]{overflow:hidden}.label-list[data-v-1be5c7e2]{height:100%}.bg[data-v-1be5c7e2]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.rate_star[data-v-1be5c7e2]{position:relative;top:5px}table .el-image[data-v-1be5c7e2]{display:inline-block}.demo-table-expand[data-v-1be5c7e2]{font-size:0}.demo-table-expand[data-v-1be5c7e2] label{width:105px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-1be5c7e2]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-1be5c7e2]{width:350px!important}.seachTiele[data-v-1be5c7e2]{line-height:35px}
.projectInfo[data-v-6321a5b0] .el-dialog__body{padding-top:0!important}.projectInfo[data-v-6321a5b0] .el-tabs__content{padding-left:10px!important}.tabPic[data-v-6321a5b0]{width:40px!important;height:40px!important}.tabPic img[data-v-6321a5b0]{width:100%;height:100%}.sp[data-v-6321a5b0]{display:block;width:33%;font-size:12px;margin-bottom:20px}.sp100[data-v-6321a5b0]{width:100%;margin-bottom:15px;display:inline-block}.third[data-v-6321a5b0]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.pictrue[data-v-6321a5b0]{display:inline-block}.pictrue img[data-v-6321a5b0]{width:100%;height:100%}.demo-image__preview[data-v-6321a5b0]{display:inline-block}.pictrue[data-v-6321a5b0]{width:60px;height:60px;border:1px dotted rgba(0,0,0,.1);margin-right:10px;position:relative;cursor:pointer}.pictrue .img[data-v-6321a5b0]{width:100%;height:100%}.details_pictrue[data-v-6321a5b0]{width:400px;height:400px}[data-v-3097779d] .el-select-dropdown__item{max-width:350px!important}.template[data-v-3097779d]{overflow:hidden}.label-list[data-v-3097779d]{height:100%}.bg[data-v-3097779d]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.rate_star[data-v-3097779d]{position:relative;top:5px}table .el-image[data-v-3097779d]{display:inline-block}.demo-table-expand[data-v-3097779d]{font-size:0}.demo-table-expand[data-v-3097779d] label{width:105px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-3097779d]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-3097779d]{width:350px!important}.seachTiele[data-v-3097779d]{line-height:35px}

2
public/system/js/app.c52c75ff.js → public/system/js/app.9c5c556e.js
View File

File diff suppressed because one or more lines are too long

1
public/system/js/chunk-558c8390.a0a109e2.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/system/js/chunk-715975c7.474b146b.js
View File

File diff suppressed because one or more lines are too long