github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-15 13:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改数据统计表前缀问题错误

Browse Source
This commit is contained in:
sugar1569 2018-11-22 15:00:08 +08:00
parent d37077cb36
commit 6e16ba134e
9 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/order/StoreOrder.php
View File

File diff suppressed because one or more lines are too long

4
application/admin/model/finance/FinanceModel.php
View File

@ -227,8 +227,8 @@ class FinanceModel extends ModelBasic
{
$trans = self::alias('a')
->join('user b', 'a.uid=b.uid')
->join('store_order_cart_info c', 'a.id=c.oid')
->join('store_product d', 'c.product_id=d.id')
->join('__STORE_ORDER_CART_INFO__ c', 'a.id=c.oid')
->join('__STORE_PRODUCT__ d', 'c.product_id=d.id')
->field('b.nickname,a.pay_price,d.store_name')
->order('a.add_time DESC')
->limit('6')

12
application/admin/model/order/StoreOrder.php
View File

@ -49,7 +49,7 @@ class StoreOrder extends ModelBasic
}
$data=($data=$model->page((int)$where['page'],(int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
foreach ($data as &$item){
$_info = db('store_order_cart_info')->where('oid',$item['id'])->field('cart_info')->select();
$_info = Db::name('store_order_cart_info')->where('oid',$item['id'])->field('cart_info')->select();
foreach ($_info as $k=>$v){
$_info[$k]['cart_info'] = json_decode($v['cart_info'],true);
}
@ -157,7 +157,7 @@ HTML;
public static function SaveExcel($list){
$export = [];
foreach ($list as $index=>$item){
$_info = db('store_order_cart_info')->where('oid',$item['id'])->column('cart_info');
$_info = Db::name('store_order_cart_info')->where('oid',$item['id'])->column('cart_info');
$goodsName = [];
foreach ($_info as $k=>$v){
$v = json_decode($v,true);
@ -209,7 +209,7 @@ HTML;
$payType = '其他支付';
}
$_info = db('store_order_cart_info')->where('oid',$item['id'])->column('cart_info');
$_info = Db::name('store_order_cart_info')->where('oid',$item['id'])->column('cart_info');
$goodsName = [];
foreach ($_info as $k=>$v){
$v = json_decode($v,true);
@ -237,7 +237,7 @@ HTML;
->ExcelSave();
}
return self::page($model,function ($item){
$_info = db('store_order_cart_info')->where('oid',$item['id'])->field('cart_info')->select();
$_info = Db::name('store_order_cart_info')->where('oid',$item['id'])->field('cart_info')->select();
foreach ($_info as $k=>$v){
$_info[$k]['cart_info'] = json_decode($v['cart_info'],true);
}
@ -513,7 +513,7 @@ HTML;
$payType = '其他支付';
}
$_info = db('store_order_cart_info')->where('oid',$item['id'])->column('cart_info');
$_info = Db::name('store_order_cart_info')->where('oid',$item['id'])->column('cart_info');
$goodsName = [];
foreach ($_info as $k=>$v){
$v = json_decode($v,true);
@ -540,7 +540,7 @@ HTML;
return self::page($model,function ($item){
$item['nickname'] = WechatUser::where('uid',$item['uid'])->value('nickname');
$_info = db('store_order_cart_info')->where('oid',$item['id'])->field('cart_info')->select();
$_info = Db::name('store_order_cart_info')->where('oid',$item['id'])->field('cart_info')->select();
foreach ($_info as $k=>$v){
$_info[$k]['cart_info'] = json_decode($v['cart_info'],true);
}

6
application/admin/model/record/StoreStatistics.php
View File

@ -173,8 +173,8 @@ class StoreStatistics extends ModelBasic
{
$trans = self::alias('a')
->join('user b', 'a.uid=b.uid')
->join('store_order_cart_info c', 'a.id=c.oid')
->join('store_product d', 'c.product_id=d.id')
->join('__STORE_ORDER_CART_INFO__ c', 'a.id=c.oid')
->join('__STORE_PRODUCT__ d', 'c.product_id=d.id')
->field('b.nickname,a.pay_price,d.store_name')
->order('a.add_time DESC')
->limit('6')
@ -200,6 +200,8 @@ class StoreStatistics extends ModelBasic
$cost=$info['cost'];//成本
$export[] = [$time,$price,$zhichu,$cost,$coupon,$deduction,$profit];
}
// ExportService::exportCsv($export,'统计'.time(),['时间','营业额(元)','支出(元)','成本','优惠','积分抵扣','盈利(元)']);
dump($export);
PHPExcelService::setExcelHeader(['时间','营业额(元)','支出(元)','成本','优惠','积分抵扣','盈利(元)'])->setExcelTile('财务统计', '财务统计',date('Y-m-d H:i:s',time()))->setExcelContent($export)->ExcelSave();
}
}

7
application/admin/model/store/StoreCouponUser.php
View File

@ -4,6 +4,7 @@ namespace app\admin\model\store;
use basic\ModelBasic;
use traits\ModelTrait;
use think\Db;
class StoreCouponUser extends ModelBasic
{
@ -38,7 +39,7 @@ class StoreCouponUser extends ModelBasic
$coupon['_msg'] = '可使用';
}
}
$coupon['integral']=db('store_coupon')->where(['id'=>$coupon['cid']])->value('integral');
$coupon['integral']= Db::name('store_coupon')->where(['id'=>$coupon['cid']])->value('integral');
}
return $couponList;
}
@ -53,7 +54,7 @@ class StoreCouponUser extends ModelBasic
[
'name'=>'总发放优惠券',
'field'=>'张',
'count'=>self::getModelTime($where,db('store_coupon_issue'))->where('status',1)->sum('total_count'),
'count'=>self::getModelTime($where, Db::name('store_coupon_issue'))->where('status',1)->sum('total_count'),
'background_color'=>'layui-bg-blue',
'col'=>6,
],
@ -69,7 +70,7 @@ class StoreCouponUser extends ModelBasic
//获取优惠劵图表
public static function getConponCurve($where,$limit=20){
//优惠劵发放记录
$list=self::getModelTime($where,db('store_coupon_issue')
$list=self::getModelTime($where, Db::name('store_coupon_issue')
->where('status',1)
->field(['FROM_UNIXTIME(add_time,"%Y-%m-%d") as _add_time','sum(total_count) as total_count'])->group('_add_time')->order('_add_time asc'))->select();
$date=[];

2
application/admin/model/store/StoreProduct.php
View File

@ -384,7 +384,7 @@ class StoreProduct extends ModelBasic
}else{
$time['data']=isset($where['data'])? $where['data']:'';
}
$model=self::getModelTime($time,db('store_cart')->alias('a')->join('__STORE_PRODUCT__ b','a.product_id=b.id'),'a.add_time');
$model=self::getModelTime($time, Db::name('store_cart')->alias('a')->join('__STORE_PRODUCT__ b','a.product_id=b.id'),'a.add_time');
if(isset($where['title']) && $where['title']!=''){
$model=$model->where('b.store_name|b.id','like',"%$where[title]%");
}

6
application/admin/model/ump/StoreSeckill.php
View File

@ -161,7 +161,7 @@ class StoreSeckill extends ModelBasic
*/
public static function getMaxList($where){
$classs=['layui-bg-red','layui-bg-orange','layui-bg-green','layui-bg-blue','layui-bg-cyan'];
$model=StoreOrder::alias('a')->join('store_seckill b','b.id=a.seckill_id')->where('a.paid',1);
$model=StoreOrder::alias('a')->join('__STORE_SECKILL__ b','b.id=a.seckill_id')->where('a.paid',1);
$list=self::getModelTime($where,$model,'a.add_time')->group('a.seckill_id')->order('p_count desc')->limit(10)
->field(['count(a.seckill_id) as p_count','b.title as store_name','sum(b.price) as sum_price'])->select();
if(count($list)) $list=$list->toArray();
@ -191,7 +191,7 @@ class StoreSeckill extends ModelBasic
*/
public static function ProfityTop10($where){
$classs=['layui-bg-red','layui-bg-orange','layui-bg-green','layui-bg-blue','layui-bg-cyan'];
$model = StoreOrder::alias('a')->join('store_seckill b','b.id = a.seckill_id')->where('a.paid',1);
$model = StoreOrder::alias('a')->join('__STORE_SECKILL__ b','b.id = a.seckill_id')->where('a.paid',1);
$list=self::getModelTime($where,$model,'a.add_time')->group('a.seckill_id')->order('profity desc')->limit(10)
->field(['count(a.seckill_id) as p_count','b.title as store_name','sum(b.price) as sum_price','(b.price-b.cost) as profity'])
->select();
@ -244,7 +244,7 @@ class StoreSeckill extends ModelBasic
* @return mixed
*/
public static function getBargainRefundList($where = array()){
$model = StoreOrder::alias('a')->join('store_seckill b','b.id=a.seckill_id');
$model = StoreOrder::alias('a')->join('__STORE_SECKILL__ b','b.id=a.seckill_id');
$list = self::getModelTime($where,$model,'a.add_time')->where('a.refund_status','NEQ',0)->group('a.seckill_id')->order('count desc')->page((int)$where['page'],(int)$where['limit'])
->field(['count(a.seckill_id) as count','b.title as store_name','sum(b.price) as sum_price'])->select();
if(count($list)) $list=$list->toArray();

2
application/admin/model/user/User.php
View File

File diff suppressed because one or more lines are too long

6
application/routine/model/routine/RoutineServer.php
View File

@ -2,7 +2,7 @@
namespace app\routine\model\routine;
use app\admin\model\system\SystemConfig;
use think\Db;
class RoutineServer{
/**
* curl get方式
@ -73,14 +73,14 @@ class RoutineServer{
* @return mixed
*/
public static function get_access_token(){
$accessToken = db('routine_access_token')->where('id',1)->find();
$accessToken = Db::name('routine_access_token')->where('id',1)->find();
if($accessToken['stop_time'] > time()) return $accessToken['access_token'];
else{
$accessToken = self::getAccessToken();
if(isset($accessToken['access_token'])){
$data['access_token'] = $accessToken['access_token'];
$data['stop_time'] = bcadd($accessToken['expires_in'],time(),0);
db('routine_access_token')->where('id',1)->update($data);
Db::name('routine_access_token')->where('id',1)->update($data);
}
return $accessToken['access_token'];
}