From 47d0ab5582062e9520a5cd39863a8614ef190243 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 09:50:19 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/product/ProductLists.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index 81be9bb87..a1e9531fd 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -116,7 +116,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L } public function extend() { - $off_activity = Config::where('name', 'off_activity')->value('value'); +// $off_activity = Config::where('name', 'off_activity')->value('value'); // if($off_activity==1){ // $data=[ // 'off_activity' => $off_activity, @@ -125,7 +125,7 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L // ]; // }else{ $data=[ - 'off_activity' => $off_activity, + 'off_activity' => 0, 'price' => 'price', 'op_price' => 'price', ]; From 5f268a60f5cc3fc0336a2cd74afbce041822a34c Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 10:00:40 +0800 Subject: [PATCH 02/10] =?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/store/lists/cart/CartList.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/store/lists/cart/CartList.php b/app/store/lists/cart/CartList.php index 47ab41107..7c06f7e76 100644 --- a/app/store/lists/cart/CartList.php +++ b/app/store/lists/cart/CartList.php @@ -107,6 +107,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists 'pay_price' => $this->total_price ]; if ($this->off_activity == 1) { + $this->activity_price = $this->total_price; $data['pay_price'] = $this->activity_price; if ($this->activity_price < 500) { $data['msg'] = '还差' . bcsub(500, $this->activity_price, 2) . '元可获得10%品牌礼品券'; From 9f36a0e9688e66cbb1a6ee331c03e419b068bb7c Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 6 Jul 2024 10:03:18 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=89=8D=E7=AB=AF=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/lists/cart/CartList.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/store/lists/cart/CartList.php b/app/store/lists/cart/CartList.php index 7c06f7e76..e84943654 100644 --- a/app/store/lists/cart/CartList.php +++ b/app/store/lists/cart/CartList.php @@ -55,7 +55,8 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists return $item; }) ->toArray(); - $off_activity = Config::where('name', 'off_activity')->value('value'); +// $off_activity = Config::where('name', 'off_activity')->value('value'); + $off_activity = 0; $this->off_activity = $off_activity; foreach ($list as $key => &$item) { $find = StoreBranchProduct::where(['product_id' => $item['product_id'], 'store_id' => $item['store_id']]) @@ -107,7 +108,6 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists 'pay_price' => $this->total_price ]; if ($this->off_activity == 1) { - $this->activity_price = $this->total_price; $data['pay_price'] = $this->activity_price; if ($this->activity_price < 500) { $data['msg'] = '还差' . bcsub(500, $this->activity_price, 2) . '元可获得10%品牌礼品券'; 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 04/10] =?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 05/10] =?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 06/10] =?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 07/10] =?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 08/10] =?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 09/10] =?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 10/10] =?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, ];