From 609f981c9fce34170efcef58fb38a2251e59c875 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 11:53:41 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=86=99=E5=85=A5=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PayNotifyLogic.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index 67bbe2a7b..4315fcce5 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -437,6 +437,11 @@ class PayNotifyLogic extends BaseLogic $order->save(); $uid = $order->uid; $user = User::where('id', $uid)->findOrEmpty(); + //check store_id + if(empty($user->store_id)){ + $user->store_id = $order['store_id']; + } + //用户的财务add $capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao->userIncome('user_balance_recharge', 'user_recharge', $order['id'], $price, [], 1); From e77be2e3c3239adbb90db6fb4a3149c4cf247aa0 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 14:36:54 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=8D=E5=85=BB?= =?UTF-8?q?=E6=AE=96=E4=B8=8B=E5=8D=95=E4=B8=8D=E5=8A=A0=E5=88=86=E6=B6=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/CommissionLogic.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/common/logic/CommissionLogic.php b/app/common/logic/CommissionLogic.php index 3cb73f88d..f47f2b079 100644 --- a/app/common/logic/CommissionLogic.php +++ b/app/common/logic/CommissionLogic.php @@ -170,8 +170,10 @@ class CommissionLogic extends BaseLogic //记录用户余额收入 if ($uid) { $GiveUser = User::where('id', $order['uid'])->find(); - $capitalFlowDao = new CapitalFlowLogic($GiveUser); - $capitalFlowDao->userIncome('system_balance_add', 'order', $order['id'], $fees); + if($GiveUser['user_ship'] != 5){//新限制 不为种养殖 + $capitalFlowDao = new CapitalFlowLogic($GiveUser); + $capitalFlowDao->userIncome('system_balance_add', 'order', $order['id'], $fees); + } } $financeLogic->user['uid'] = $order['uid']; $financeLogic->other_arr['vip_uid'] = $uid; From a19656bbca003aca4bb8459ea681cc138eb50e0a Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 15:43:42 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/UserSignLogic.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php index 75139fac5..9ab54da82 100644 --- a/app/common/logic/UserSignLogic.php +++ b/app/common/logic/UserSignLogic.php @@ -24,15 +24,19 @@ class UserSignLogic extends BaseLogic $price=(int)$order['price']; switch ($price) { case 1000: + case 1: $total_vip = 249; break; case 2000: + case 2: $total_vip = 560; break; case 5000: + case 3: $total_vip = 1550; break; case 10000: + case 4: $total_vip = 3500; break; default: From 65a7e2da84b7d5602481e04f72f71053d8d6749e Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 15:45:17 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=99=90=E5=88=B6=20=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/user/UserRechargeController.php | 9 +++++---- app/common/logic/UserSignLogic.php | 8 ++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/api/controller/user/UserRechargeController.php b/app/api/controller/user/UserRechargeController.php index 95ebf071c..2bed5cd04 100644 --- a/app/api/controller/user/UserRechargeController.php +++ b/app/api/controller/user/UserRechargeController.php @@ -27,25 +27,26 @@ use app\api\lists\user\UserRechargeLists; $send_bar = "品牌礼品券"; $arr = [ [ - 'money'=>1000,//采购包 +// 'money'=>1000,//采购包 + 'money'=>1,//采购包 'send'=>249,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, ], [ - 'money'=>2000,//采购包 + 'money'=>2,//采购包2000 'send'=>560,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, ], [ - 'money'=>5000,//采购包 + 'money'=>5,//采购包5000 'send'=>1550,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, ], [ - 'money'=>10000,//采购包 + 'money'=>10,//采购包10000 'send'=>3500,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php index 9ab54da82..7f77e4f40 100644 --- a/app/common/logic/UserSignLogic.php +++ b/app/common/logic/UserSignLogic.php @@ -23,20 +23,16 @@ class UserSignLogic extends BaseLogic { $price=(int)$order['price']; switch ($price) { - case 1000: case 1: $total_vip = 249; break; - case 2000: case 2: $total_vip = 560; break; - case 5000: - case 3: + case 5: $total_vip = 1550; break; - case 10000: - case 4: + case 10: $total_vip = 3500; break; default: From b72952ce228042406df3c1500d9fa3edf12ec358 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 15:49:50 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/order/CartList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php index e71bcf784..74793c39e 100644 --- a/app/api/lists/order/CartList.php +++ b/app/api/lists/order/CartList.php @@ -111,7 +111,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists 'msg' => '您已选购满500元，支付成功后即可获得'.bcmul($this->total_price,0.1,2).'元品牌礼品兑换券,可到线下门店兑换礼品。', 'pay_price' => $this->total_price ]; - if($this->off_activity==1){ + if($this->off_activity==0){//1 $this->activity_price = $this->total_price; $data['pay_price']=$this->activity_price; if($this->activity_price<500){ From a6460ecaf069444fe743982dda5492659417c9ed Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 16:01:39 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 7 ++++++- app/api/controller/store/StoreController.php | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 8b2f67290..e295d425e 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -76,7 +76,7 @@ class UserLogic extends BaseLogic } } - public static function StoreAdd(array $params) + public static function checkAddress(array $params) { $user_ship=$params['user_ship']??0; if($user_ship==2){ @@ -106,6 +106,11 @@ class UserLogic extends BaseLogic } } } + return true; + } + public static function StoreAdd(array $params) + { + self::checkAddress($params); $passwordSalt = Config::get('project.unique_identification'); $password = create_password(123456, $passwordSalt); $defaultAvatar = config('project.default_image.admin_avatar'); diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 5872c05fb..a543ebb9b 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -89,6 +89,10 @@ class StoreController extends BaseApiController return $this->fail(UserUserLogic::getError()); } }else{ + UserUserLogic::checkAddress($params); + if(UserUserLogic::hasError()){ + return $this->fail(UserUserLogic::getError()); + } $find['real_name']=$params['real_name']; $find['label_id']=$params['label_id']??0; $find->save(); From 562567cf0770fc7a43d78c7cd650c101fef1e213 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 16:14:01 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=BE=85=E8=BF=94=E5=9B=9E=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/order/OrderLogic.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 582db7890..2423d9242 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -54,6 +54,7 @@ class OrderLogic extends BaseLogic public static $store_price; //门店零售价 public static $activity_price; public static $deduction_price; + public static $frozen_money;//返还金额 /** * @notes 获取购物车商品信息 @@ -76,6 +77,7 @@ class OrderLogic extends BaseLogic self::$activity_price = 0; //活动减少 self::$store_price = 0; //商户价 self::$deduction_price =0; + self::$frozen_money =0;//返还金额 $deduction_price = 0; //抵扣金额 /** 计算价格 */ $off_activity = Config::where('name', 'off_activity')->value('value'); @@ -142,6 +144,7 @@ class OrderLogic extends BaseLogic self::$cost = bcadd(self::$cost, $cart_select[$k]['purchase'], 2); self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2); //商户价 self::$deduction_price=bcadd(self::$deduction_price,$deduction_price,2);//抵扣金额 + self::$frozen_money = bcadd(self::$frozen_money, $cart_select[$k]['vip_frozen_price'], 2);//返还金额 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2); } //加支付方式限制 @@ -169,6 +172,7 @@ class OrderLogic extends BaseLogic 'activity_price' => self::$activity_price, 'activities' => self::$activity_price > 0 ? 1 : 0, 'deduction_price' => self::$deduction_price, + 'frozen_money' => self::$frozen_money,//返还金额(活动关闭得时候有) 'source' => 0, 'is_storage' => $params['is_storage'] ?? 0, ]; From 9cf4e962bcaf7304a14f558829e4b06936650e3d Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 6 Jul 2024 16:43:12 +0800 Subject: [PATCH 08/18] =?UTF-8?q?feat(statistics):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=94=80=E5=94=AE=E6=8E=92=E5=90=8D=E6=8E=A5=E5=8F=A3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/statistics/controller/IndexController.php | 2 +- app/statistics/logic/OrderLogic.php | 24 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/statistics/controller/IndexController.php b/app/statistics/controller/IndexController.php index d89abbbaa..400d72439 100644 --- a/app/statistics/controller/IndexController.php +++ b/app/statistics/controller/IndexController.php @@ -105,7 +105,7 @@ class IndexController extends BaseLikeController */ public function sales_ranking() { - $time = $this->request->get('date', date('Y-m-d')); + $time = $this->request->get('date'); $store_id = $this->store_id; $where = []; if ($store_id) { diff --git a/app/statistics/logic/OrderLogic.php b/app/statistics/logic/OrderLogic.php index afdfe3bbf..226020c09 100644 --- a/app/statistics/logic/OrderLogic.php +++ b/app/statistics/logic/OrderLogic.php @@ -26,7 +26,7 @@ class OrderLogic extends BaseLogic ]; return $data; } - public static function Currday($where,$date) + public static function Currday($where, $date) { $startTime = strtotime($date . ' 00:00:00'); // 当天的开始时间戳 $endTime = strtotime($date . ' 23:59:59'); // 当天的结束时间戳 @@ -56,32 +56,36 @@ class OrderLogic extends BaseLogic } return $data; } - public static function dayPayPrice($where,$time) + public static function dayPayPrice($where, $time) { $todayAmount = UserRecharge::where($where) - ->whereDay('create_time',$time) + ->whereDay('create_time', $time) ->sum('price'); $pay_price = StoreOrder::where($where) - ->whereDay('create_time',$time) + ->whereDay('create_time', $time) ->sum('pay_price'); return bcadd($todayAmount, $pay_price, 2); } - public static function dealFlexiblePrice($where,$start,$end) + public static function dealFlexiblePrice($where, $start, $end) { //排除退款 - $todayAmount = UserRecharge::where($where)->where('status',1) + $todayAmount = UserRecharge::where($where)->where('status', 1) ->whereBetweenTime('create_time', $start, $end) ->sum('price'); - $pay_price = StoreOrder::where($where)->where('refund_status',0) + $pay_price = StoreOrder::where($where)->where('refund_status', 0) ->whereBetweenTime('create_time', $start, $end) ->sum('pay_price'); return bcadd($todayAmount, $pay_price, 2); - } - public static function sales($where,$time){ - $select=StoreOrder::where($where)->whereDay('create_time',$time)->limit(10)->order('id desc')->field('id,order_id,pay_price,create_time')->select(); + public static function sales($where, $time) + { + $select = StoreOrder::where($where); + if ($time) { + $select->whereDay('create_time', $time); + } + $select = $select->limit(20)->order('id desc')->field('id,order_id,pay_price,create_time')->select(); return $select?->toArray(); } } From 8312b5755af42a2592e7315cf75d3fdffaa63d81 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 16:53:59 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=A6=96=E6=AC=A1=E4=B8=8D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/UserSignLogic.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php index 7f77e4f40..0ee943a74 100644 --- a/app/common/logic/UserSignLogic.php +++ b/app/common/logic/UserSignLogic.php @@ -3,11 +3,13 @@ namespace app\common\logic; +use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; use app\common\model\user\User; use app\common\model\user_recharge\UserRecharge; use app\common\model\user_sign\UserSign; use app\common\model\user_sign_log\UserSignLog; +use function Symfony\Component\String\s; /** * 会员积分逻辑 @@ -42,7 +44,7 @@ class UserSignLogic extends BaseLogic if($total_vip==0){ return false; } - $count = UserRecharge::where('uid', $order->uid)->count(); + $count = UserRecharge::where(['uid'=>$order->uid,'paid'=>YesNoEnum::YES])->count(); if ($count ==1 && in_array($user_ship, [1, 2, 3, 5, 6, 7, 8])) { //首充 $write = self::write($order, $total_vip, 0, 1, 9); From b66e01c58548c97c05c88c2bd59eb66c8d4e2e7b Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 17:26:26 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index a543ebb9b..db168b072 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -137,6 +137,7 @@ class StoreController extends BaseApiController return $this->fail(PaymentLogic::getError()); } if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { + Redis::connection()->set('trade_state',json_encode($result)); PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); } else { Redis::send('send-code-pay', ['order_id' => $order['order_id'],'pay_type'=>'recharge']); From c49e91001ca54b1803f4bbffa242d052c917341d Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 17:28:58 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/PayController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/api/controller/PayController.php b/app/api/controller/PayController.php index 2a0ea7cf8..1aa380e9c 100644 --- a/app/api/controller/PayController.php +++ b/app/api/controller/PayController.php @@ -34,6 +34,7 @@ class PayController extends BaseApiController $attach = $ciphertext['attach']; switch ($attach) { case 'recharge': + Cache::set('6logR' . time(), json_encode($ciphertext)); PayNotifyLogic::handle('recharge', $ciphertext['out_trade_no'], $ciphertext); $app->wechat->success(); break; From 9cc0ce8971419b050a689fe87657e878000c0c98 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 17:31:43 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index db168b072..4401a5083 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -137,7 +137,7 @@ class StoreController extends BaseApiController return $this->fail(PaymentLogic::getError()); } if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { - Redis::connection()->set('trade_state',json_encode($result)); + Cache::set('trade_state' . time(), json_encode($result)); PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); } else { Redis::send('send-code-pay', ['order_id' => $order['order_id'],'pay_type'=>'recharge']); From 1bc854cdad5f9c592f39b687bd05241bd005cb08 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 6 Jul 2024 17:32:51 +0800 Subject: [PATCH 13/18] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9StoreController?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=9D=A1=E7=A0=81=E6=94=AF=E4=BB=98=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index a543ebb9b..2e26b80a5 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -131,7 +131,7 @@ class StoreController extends BaseApiController $order = UserRecharge::create($data); $order['pay_price']=$order['price']; - $order['attach']=$order['recharge']; + $order['attach']='recharge'; $result = PaymentLogic::codepay($auth_code, $order,'条码支付'); if (PaymentLogic::hasError()) { return $this->fail(PaymentLogic::getError()); @@ -160,7 +160,7 @@ class StoreController extends BaseApiController UserRecharge::where('id', $id)->update(['order_id'=>$order_id]); $order['order_id']=$order_id; $order['pay_price']=$order['price']; - $order['attach']=$order['recharge']; + $order['attach']='recharge'; $result = PaymentLogic::codepay($auth_code, $order,'条码支付'); if (PaymentLogic::hasError()) { return $this->fail(PaymentLogic::getError()); From f81989efc241d4a2b9ce0dc1f5ed53bf3aafdbe4 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 6 Jul 2024 17:48:42 +0800 Subject: [PATCH 14/18] =?UTF-8?q?feat(UserLists.php):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/lists/user/UserLists.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index 08e05e13b..dd9f9d404 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -11,6 +11,7 @@ use app\common\model\user\User; use app\common\model\user_ship\UserShip; use app\common\lists\ListsSearchInterface; use app\common\model\user\UserAddress; +use app\common\model\user_sign_log\UserSignLog; use app\common\model\vip_flow\VipFlow; class UserLists extends BaseAdminDataLists implements ListsSearchInterface @@ -62,8 +63,8 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface where(['user_id'=>$data['id'],'status'=>0]) ->sum('number')??0; $data['amount_frozen'] = UserSign::where('uid',$data['id'])->where('status',0)->sum('number'); - $number1 = UserSign::where('uid',$data['id'])->where('status',1)->where('type','<>',3)->sum('number'); - $number2 = UserSign::where('uid',$data['id'])->where('status',1)->where('type',3)->sum('number'); + $number1 = UserSign::where('uid',$data['id'])->where('status',1)->sum('number'); + $number2 = UserSignLog::where('uid',$data['id'])->where(['status'=>1,'order_type'=>0])->sum('number'); if($number1<$number2){ $data['get_frozen']=0; }else{ From f2cc9f7f9fdc8d7c4cdad105aeaf0a6c19cb437a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 6 Jul 2024 17:48:51 +0800 Subject: [PATCH 15/18] =?UTF-8?q?feat(UserLists.php):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/lists/user/UserLists.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php index dd9f9d404..43fcf955d 100644 --- a/app/store/lists/user/UserLists.php +++ b/app/store/lists/user/UserLists.php @@ -63,12 +63,12 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface where(['user_id'=>$data['id'],'status'=>0]) ->sum('number')??0; $data['amount_frozen'] = UserSign::where('uid',$data['id'])->where('status',0)->sum('number'); - $number1 = UserSign::where('uid',$data['id'])->where('status',1)->sum('number'); - $number2 = UserSignLog::where('uid',$data['id'])->where(['status'=>1,'order_type'=>0])->sum('number'); + $number1 = UserSignLog::where('uid',$data['id'])->where(['status'=>1,'order_type'=>0,'financial_pm'=>1])->sum('number'); + $number2 = UserSignLog::where('uid',$data['id'])->where(['status'=>1,'order_type'=>0,'financial_pm'=>0])->sum('number'); if($number1<$number2){ $data['get_frozen']=0; }else{ - $data['get_frozen']=bcsub($number1,$number2,2)??0; + $data['get_frozen']=bcsub($number2,$number1,2)??0; } })->toArray(); From 89426af81592c5e614d530387022ccdded3de1e4 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 18:01:38 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 3b5fde4c5..81c64b52a 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -89,9 +89,11 @@ class StoreController extends BaseApiController return $this->fail(UserUserLogic::getError()); } }else{ - UserUserLogic::checkAddress($params); - if(UserUserLogic::hasError()){ - return $this->fail(UserUserLogic::getError()); + if(isset($params['type']) && $params['type'] != 2){ + UserUserLogic::checkAddress($params); + if(UserUserLogic::hasError()){ + return $this->fail(UserUserLogic::getError()); + } } $find['real_name']=$params['real_name']; $find['label_id']=$params['label_id']??0; From 1d574533831365e3345c8fdb5e5707343ebeddf4 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 18:25:16 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/user/UserRechargeController.php | 10 +++++----- app/common/logic/UserSignLogic.php | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/api/controller/user/UserRechargeController.php b/app/api/controller/user/UserRechargeController.php index 2bed5cd04..3e3c9e46c 100644 --- a/app/api/controller/user/UserRechargeController.php +++ b/app/api/controller/user/UserRechargeController.php @@ -27,26 +27,26 @@ use app\api\lists\user\UserRechargeLists; $send_bar = "品牌礼品券"; $arr = [ [ -// 'money'=>1000,//采购包 - 'money'=>1,//采购包 + 'money'=>1000,//采购包 +// 'money'=>1,//采购包 'send'=>249,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, ], [ - 'money'=>2,//采购包2000 + 'money'=>2000,//采购包 'send'=>560,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, ], [ - 'money'=>5,//采购包5000 + 'money'=>5000,//采购包 'send'=>1550,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, ], [ - 'money'=>10,//采购包10000 + 'money'=>10000,//采购包 'send'=>3500,//礼品券 'money_string'=>$buy_bar, 'send_string'=>$send_bar, diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php index 0ee943a74..a2827222d 100644 --- a/app/common/logic/UserSignLogic.php +++ b/app/common/logic/UserSignLogic.php @@ -25,16 +25,16 @@ class UserSignLogic extends BaseLogic { $price=(int)$order['price']; switch ($price) { - case 1: + case 1000: $total_vip = 249; break; - case 2: + case 2000: $total_vip = 560; break; - case 5: + case 5000: $total_vip = 1550; break; - case 10: + case 10000: $total_vip = 3500; break; default: From 54f5653085de30dc9904b10a310c66ae951fa352 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 18:34:10 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/store_order/StoreOrderController.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index c3fdfe543..6f1de710e 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -8,6 +8,7 @@ use app\api\logic\order\OrderLogic; use app\api\validate\OrderValidate; use app\common\model\order\Cart; use app\common\model\user\User; +use app\common\model\user_sign\UserSign; use app\store\lists\store_order\StoreOrderLists; use app\common\controller\Definitions; use app\common\enum\PayEnum; @@ -399,10 +400,14 @@ class StoreOrderController extends BaseAdminController return $this->fail('支付条码不能为空'); } $params = $this->request->post(); - UserShipLogic::user_ship($params); - if(UserShipLogic::hasError()){ - return $this->fail(UserShipLogic::getError()); + $count = UserRecharge::where('uid',$params['uid'])->where('paid',1)->count(); + if($count < 1){ + UserShipLogic::user_ship($params); + if(UserShipLogic::hasError()){ + return $this->fail(UserShipLogic::getError()); + } } + $data = [ 'store_id' => $this->adminInfo['store_id'], 'uid' => $params['uid'],