- {!! Form::open( [ 'route' => ['admin.promotion.coupon.show'], 'method' => 'get', 'id' => 'recordSearch-form','class'=>'form-horizontal'] ) !!}
-
-
-
-
-
- {!! Html::script(env("APP_URL").'/assets/backend/libs/jquery.zclip/jquery.zclip.js') !!}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/EC.Open.Backend/Store/resources/views/promotion/discount/use_record.blade.php b/modules/EC.Open.Backend/Store/resources/views/promotion/discount/use_record.blade.php
index 4e0e2ca..5cb0aa1 100644
--- a/modules/EC.Open.Backend/Store/resources/views/promotion/discount/use_record.blade.php
+++ b/modules/EC.Open.Backend/Store/resources/views/promotion/discount/use_record.blade.php
@@ -1,22 +1,5 @@
-{{--@extends('store-backend::dashboard')
-
-@section ('title','促销活动使用记录')
-
-@section('breadcrumbs')
-
促销活动使用记录
-
- - 首页
- - 促销活动使用记录
-
-@endsection
-
-@section('after-styles-end')--}}
{!! Html::style(env("APP_URL").'/assets/backend/admin/css/plugins/ladda/ladda-themeless.min.css') !!}
{!! Html::style(env("APP_URL").'/assets/backend/libs/datepicker/bootstrap-datetimepicker.min.css') !!}
-{{--@stop
-
-
-@section('content')--}}
@if(Session::has('message'))
@@ -181,19 +132,9 @@ class="caret">
-{{--@endsection
-@section('before-scripts-end')--}}
{!! Html::script(env("APP_URL").'/assets/backend/libs/datepicker/bootstrap-datetimepicker.js') !!}
{!! Html::script(env("APP_URL").'/assets/backend/libs/datepicker/bootstrap-datetimepicker.zh-CN.js') !!}
{!! Html::script(env("APP_URL").'/assets/backend/libs/loader/jquery.loader.min.js') !!}
{!! Html::script(env("APP_URL").'/assets/backend/libs/jquery.el/el.common.js') !!}
- @include('store-backend::promotion.public.discount_used_script')
-{{--@endsection--}}
-
-
-
-
-
-
-
+ @include('store-backend::promotion.public.discount_used_script')
\ No newline at end of file
diff --git a/modules/EC.Open.Backend/Store/src/Http/Controllers/CommodityController.php b/modules/EC.Open.Backend/Store/src/Http/Controllers/CommodityController.php
index 9f0cb90..1d143a7 100644
--- a/modules/EC.Open.Backend/Store/src/Http/Controllers/CommodityController.php
+++ b/modules/EC.Open.Backend/Store/src/Http/Controllers/CommodityController.php
@@ -800,13 +800,8 @@ public function saveIsDel()
foreach ($goodsIds as $id) {
$goods = $this->goodsRepository->find($id);
if ($status == 2) { //如果是下架操作
- $status = $this->goodsService->checkPromotionStatusByGoodsID($id);
- if ($status) {
- $goods->is_del = 2;
- $goods->save();
- } else {
- $error_list[] = '货号为：' . $goods->goods_no . ' 的商品正在参与促销活动，下架失败';
- }
+ $goods->is_del = 2;
+ $goods->save();
} else {
$goods->is_del = 0;
$goods->save();
diff --git a/modules/EC.Open.Backend/Store/src/Http/Controllers/Promotion/DiscountController.php b/modules/EC.Open.Backend/Store/src/Http/Controllers/Promotion/DiscountController.php
index 022ac58..4ef2bd5 100644
--- a/modules/EC.Open.Backend/Store/src/Http/Controllers/Promotion/DiscountController.php
+++ b/modules/EC.Open.Backend/Store/src/Http/Controllers/Promotion/DiscountController.php
@@ -210,9 +210,9 @@ public function useRecord()
$time = $condition[0];
$id = request('id');
- $coupons = $this->orderAdjustmentRepository->getOrderAdjustmentHistory($where, 20, $time);
+ $discounts = $this->orderAdjustmentRepository->getOrderAdjustmentHistory($where, 20, $time);
- return LaravelAdmin::content(function (Content $content) use ($coupons, $id) {
+ return LaravelAdmin::content(function (Content $content) use ($discounts, $id) {
$content->header('促销活动使用记录');
@@ -222,9 +222,8 @@ public function useRecord()
);
- $content->body(view('store-backend::promotion.discount.use_record', compact('coupons', 'id')));
+ $content->body(view('store-backend::promotion.discount.use_record', compact('discounts', 'id')));
});
-// return view('store-backend::promotion.discount.use_record', compact('coupons', 'id'));
}
diff --git a/modules/EC.Open.Backend/Store/src/Http/routes.php b/modules/EC.Open.Backend/Store/src/Http/routes.php
index 1fed093..44d3d34 100644
--- a/modules/EC.Open.Backend/Store/src/Http/routes.php
+++ b/modules/EC.Open.Backend/Store/src/Http/routes.php
@@ -141,6 +141,15 @@
$router->get('getUsedExportData', 'CouponController@getUsedExportData')->name('admin.promotion.coupon.getUsedExportData');
$router->get('getCouponsExportData', 'CouponController@getCouponsExportData')->name('admin.promotion.coupon.getCouponsExportData');
});
+
+ $router->group(['prefix' => 'pubic', 'namespace' => 'Promotion'], function () use ($router) {
+ $router->get('getSpu', 'PublicController@getSpu')->name('admin.promotion.getSpu');
+ $router->get('getWechatGroup', 'PublicController@getWechatGroup')->name('admin.promotion.getWechatGroup');
+ $router->post('getSpuData', 'PublicController@getSpuData')->name('admin.promotion.getSpuData');
+ $router->post('getWechatGroupData', 'PublicController@getWechatGroupData')->name('admin.promotion.getWechatGroupData');
+ $router->post('export/excelExport', 'PublicController@excelExport')->name('admin.promotion.excelExport');
+ $router->get('export/download/{url}', 'PublicController@download')->name('admin.promotion.download');
+ });
});
diff --git a/modules/EC.Open.Backend/Store/src/Model/OrderAdjustment.php b/modules/EC.Open.Backend/Store/src/Model/OrderAdjustment.php
index cebf82e..ea7bc4b 100644
--- a/modules/EC.Open.Backend/Store/src/Model/OrderAdjustment.php
+++ b/modules/EC.Open.Backend/Store/src/Model/OrderAdjustment.php
@@ -8,12 +8,16 @@
class OrderAdjustment extends Model implements Transformable
{
- use TransformableTrait;
-
- protected $table = 'el_order_adjustment';
+ use TransformableTrait;
protected $guarded = ['id'];
+ public function __construct(array $attributes = [])
+ {
+ parent::__construct($attributes);
+ $this->setTable(config('ibrand.app.database.prefix', 'ibrand_') . 'order_adjustment');
+ }
+
public function discount()
{
return $this->hasOne('ElementVip\Component\Discount\Models\Discount', 'id', 'origin_id');
diff --git a/modules/EC.Open.Backend/Store/src/Repositories/DiscountCouponRepository.php b/modules/EC.Open.Backend/Store/src/Repositories/DiscountCouponRepository.php
index b25ebb9..b13f6a1 100644
--- a/modules/EC.Open.Backend/Store/src/Repositories/DiscountCouponRepository.php
+++ b/modules/EC.Open.Backend/Store/src/Repositories/DiscountCouponRepository.php
@@ -39,7 +39,7 @@ public function getCouponsHistoryPaginated($where, $limit = 50, $time = [])
if (count($where) > 0) {
foreach ($where as $key => $value) {
- if ($key != 'order_no' AND $key!='mobile') {
+ if ($key != 'order_no' AND $key != 'mobile') {
if (is_array($value)) {
list($operate, $va) = $value;
$query = $query->where($key, $operate, $va);
@@ -72,12 +72,12 @@ public function getCouponsHistoryPaginated($where, $limit = 50, $time = [])
});
$query->whereHas('user', function ($query) use ($where) {
- $query->where(function ($query) use ($where) {
- if (isset($where['mobile'])) {
- list($operate, $va) = $where['mobile'];
- $query->where('el_user.mobile', $operate, $va);
- }
- });
+ $query->where(function ($query) use ($where) {
+ if (isset($where['mobile'])) {
+ list($operate, $va) = $where['mobile'];
+ $query->where(config('ibrand.app.database.prefix', 'ibrand_') . 'user.mobile', $operate, $va);
+ }
+ });
});
$query = $query->with('order')->with('user');
@@ -90,43 +90,6 @@ public function getCouponsHistoryPaginated($where, $limit = 50, $time = [])
}
- /**
- * 用户获取优惠券
- * @param $user_id
- * @param $coupon_id
- * @return bool
- */
- public function userGetCoupons($user_id, $coupon_id, $type = 0)
- {
- $coupon = new ElDiscountCoupon();
- $input['user_id'] = $user_id;
- $input['discount_id'] = $coupon_id;
- if ($type == 1) {
- $coupon_code = createOfflineCouponCode();
- $coupon_list = ElDiscountCoupon::where(['code' => $coupon_code])->first();
- if (count($coupon_list)) {
- $coupon_code = createOfflineCouponCode();
- }
- $input['code'] = $coupon_code;
- $input['expires_at'] = Carbon::now()->addMonth(6);
-
- } else {
- $input['code'] = build_order_no('C');
- }
- $coupon = $coupon->create($input);
- if ($coupon) {
- $decrementDiscount = ElDiscount::where(['id' => $coupon_id])->decrement('usage_limit');
- $incrementDisount = ElDiscount::where(['id' => $coupon_id])->increment('used');
- if ($decrementDiscount && $incrementDisount) {
- return true;
- } else {
- return false;
- }
- } else {
- return false;
- }
- }
-
public function getExportDataPaginate($discount_id, $limit)
{
$coupons = ElDiscountCoupon::where('discount_id', $discount_id)->where('code', 'like', '%CT%')->paginate($limit);
@@ -154,7 +117,7 @@ public function getCouponsPaginated($where, $limit = 50, $time = [])
if (count($where) > 0) {
foreach ($where as $key => $value) {
- if ($key!='mobile') {
+ if ($key != 'mobile') {
if (is_array($value)) {
list($operate, $va) = $value;
$query = $query->where($key, $operate, $va);
@@ -174,13 +137,13 @@ public function getCouponsPaginated($where, $limit = 50, $time = [])
$query = $query->where($key, $value);
}
}
- }
+ }
$query->whereHas('user', function ($query) use ($where) {
$query->where(function ($query) use ($where) {
if (isset($where['mobile'])) {
list($operate, $va) = $where['mobile'];
- $query->where('el_user.mobile', $operate, $va);
+ $query->where(config('ibrand.app.database.prefix', 'ibrand_').'user.mobile', $operate, $va);
}
});
});
diff --git a/modules/EC.Open.Backend/Store/src/Repositories/OrderAdjustmentRepository.php b/modules/EC.Open.Backend/Store/src/Repositories/OrderAdjustmentRepository.php
index 401b98c..4abf886 100644
--- a/modules/EC.Open.Backend/Store/src/Repositories/OrderAdjustmentRepository.php
+++ b/modules/EC.Open.Backend/Store/src/Repositories/OrderAdjustmentRepository.php
@@ -34,8 +34,6 @@ public function boot()
public function getOrderAdjustmentHistory($where, $limit = 50, $time = [])
{
-
-
if(isset($where['order_no'])){
$order_no=$where['order_no'];
unset($where['order_no']);
@@ -64,39 +62,7 @@ public function getOrderAdjustmentHistory($where, $limit = 50, $time = [])
}
}
}
-
- /*$query = $this->whereHas('order', function ($query) use ($where,$time){
- $query = $query->whereNotIn('origin_type', ['coupon']);
-
- if (is_array($where)) {
- foreach ($where as $key => $value) {
- $query->where(function($query) use ($value,$key){
- $key = $key == 'created_at' ? $this->model->getTable().'.created_at' : $key;
- if (is_array($value)) {
- list($operate, $va) = $value;
- $query = $query->where($key, $operate, $va);
- } else {
- $query = $query->where($key, $value);
- }
- return $query;
- });
- }
- }
-
- if(is_array($time)){
- foreach ($time as $key => $value) {
- $key = $this->model->getTable().'.created_at';
- if (is_array($value)) {
- list($operate, $va) = $value;
- $query = $query->where($key, $operate, $va);
- } else {
- $query = $query->where($key, $value);
- }
- }
- }
-
- });*/
-
+
if(isset($order_no[1])){
$query = $query
->whereHas('order', function ($query) use ($order_no) {
@@ -114,6 +80,5 @@ public function getOrderAdjustmentHistory($where, $limit = 50, $time = [])
return $query->paginate($limit);
}
-
}
}
diff --git a/modules/EC.Open.Backend/Store/src/Service/DiscountService.php b/modules/EC.Open.Backend/Store/src/Service/DiscountService.php
index 043dda3..8bccf70 100644
--- a/modules/EC.Open.Backend/Store/src/Service/DiscountService.php
+++ b/modules/EC.Open.Backend/Store/src/Service/DiscountService.php
@@ -1,16 +1,12 @@
suitRepository->getSuitByGoodsId($goods_id);
- $seckill = $this->seckillItemRepositor->getSeckillItemByGoodsID($goods_id);
-
- if (count($suit) > 0 OR $seckill) {
- return false;
- }*/
-
- $relation = PromotionGoodsRelation::where('goods_id', $goods_id)->first();
- if ($relation) return false;
-
- return true;
- }
+
public function checkSellPrice($data)
{