diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index 2f83ae7bf..3beea43fb 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -81,5 +81,21 @@ class UserController extends BaseAdminController return $this->success('ok', $res); } + + //用户领取列表 + public function userGiftList() + { + $uid = (new UserValidate())->goCheck('detail'); + $page_no = (int)$this->request->get('page_no', 1); + $page_size = (int)$this->request->get('page_size', 15); + $params = $this->request->get(); + $params['page_no'] = $page_no > 0 ? $page_no : 1; + $params['page_size'] = $page_size > 0 ? $page_size : 15; + $uid = $uid['id']; + $res = UserLogic::giftList($uid,$params); + $res['page_no'] = $params['page_no']; + $res['page_size'] = $params['page_size']; + return $this->success('ok', $res); + } } \ No newline at end of file diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 1220fab27..38ee89a68 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -210,7 +210,8 @@ class StoreProductLogic extends BaseLogic 'batch'=>$params['batch'],'store_name'=>$params['store_name'], 'manufacturer_information' => $params['manufacturer_information']??'', 'store_info' => $params['store_info']??'','cate_id'=>$params['cate_id'], - 'top_cate_id'=>$dealCate['top_cate_id'],'two_cate_id'=>$dealCate['two_cate_id'] + 'top_cate_id'=>$dealCate['top_cate_id'],'two_cate_id'=>$dealCate['two_cate_id'], + 'bar_code'=> $params['bar_code'] ]); Db::commit(); diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index ef37de50b..7f0a9be3f 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -20,6 +20,7 @@ use app\common\logic\BaseLogic; use app\common\model\finance\CapitalFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_order\StoreOrder; +use app\common\model\store_product_gift\StoreProductGift; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserRecharge; @@ -279,4 +280,18 @@ class UserLogic extends BaseLogic } + + public static function giftList($uid,$params) + { + $query = StoreProductGift::with(['store','user','goodsName'])->where('uid',$uid); + $count = $query->count(); + $list = $query->page($params['page_no'],$params['page_size']) + ->order('id','desc') + ->select()->toArray(); + return [ + 'lists' => $list, + 'count' => $count + ]; + + } } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 36d359a7e..c6c421af6 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -114,7 +114,9 @@ class PayNotifyLogic extends BaseLogic ]; OrderLogic::writeOff($params); } - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + if(in_array($order['shipping_type'],[1,2])){ + PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + } return true; // Redis::send('push-platform-print', ['id' => $order['id']], 60); @@ -242,7 +244,9 @@ class PayNotifyLogic extends BaseLogic // Redis::send('push-platform-print', ['id' => $order['id']], 60); - PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + if(in_array($order['shipping_type'],[1,2])){ + PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); + } } //采购款支付后如果有对应的冻结的话就去反对应的log diff --git a/app/common/model/store_product_gift/StoreProductGift.php b/app/common/model/store_product_gift/StoreProductGift.php new file mode 100644 index 000000000..a4e1c07a1 --- /dev/null +++ b/app/common/model/store_product_gift/StoreProductGift.php @@ -0,0 +1,34 @@ +hasOne(SystemStore::class, 'id', 'store_id') + ->bind(['store_name' => 'name', 'store_phone' => 'phone', 'store_detailed_address' => 'detailed_address', 'store_simple_address' => 'address']); + } + + public function user() + { + return $this->hasOne(User::class, 'id', 'uid')->bind(['nickname', 'avatar', 'mobile']); + } + + public function goodsName() + { + return $this->hasOne(StoreProduct::class,'id','product_id')->bind(['goods_name'=>'store_name','image','unit','price']); + } + +} \ No newline at end of file diff --git a/app/statistics/logic/OrderLogic.php b/app/statistics/logic/OrderLogic.php index 274653768..afdfe3bbf 100644 --- a/app/statistics/logic/OrderLogic.php +++ b/app/statistics/logic/OrderLogic.php @@ -69,10 +69,11 @@ class OrderLogic extends BaseLogic public static function dealFlexiblePrice($where,$start,$end) { - $todayAmount = UserRecharge::where($where) + //排除退款 + $todayAmount = UserRecharge::where($where)->where('status',1) ->whereBetweenTime('create_time', $start, $end) ->sum('price'); - $pay_price = StoreOrder::where($where) + $pay_price = StoreOrder::where($where)->where('refund_status',0) ->whereBetweenTime('create_time', $start, $end) ->sum('pay_price'); return bcadd($todayAmount, $pay_price, 2); diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php index 4f3ff7681..87d840c26 100644 --- a/app/store/logic/WorkbenchLogic.php +++ b/app/store/logic/WorkbenchLogic.php @@ -602,7 +602,7 @@ class WorkbenchLogic extends BaseLogic //当日营业额的统计 $today = StoreOrder::where(['paid' => YesNoEnum::YES, 'store_id' => $params['store_id']]); - $turnover_today = $today + $turnover_today = $today->where('refund_status',0) ->whereDay('create_time') ->sum('pay_price'); //当日利润的统计