From 1549adfed66b0f67a2775906fd7771593df43519 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 25 May 2024 16:37:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD/=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=87=BA=E4=BB=B7=E6=8E=92=E5=BA=8F/?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=86=E7=A0=81=E6=9B=B4=E6=96=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/merchat/MerchantController.php      | 13 +++++++++++++
 .../lists/operation/OpurchaseclassofferLists.php   |  2 +-
 app/admin/logic/merchant/MerchantLogic.php         | 12 ++++++------
 app/api/controller/IndexController.php             | 14 ++++++++++++++
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/admin/controller/merchat/MerchantController.php b/app/admin/controller/merchat/MerchantController.php
index 4995b4e..ccbcf85 100644
--- a/app/admin/controller/merchat/MerchantController.php
+++ b/app/admin/controller/merchat/MerchantController.php
@@ -211,4 +211,17 @@ class MerchantController extends BaseAdminController
         $count = Db::name('merchant_bind_goods')->where('mer_id', $mer_id)->count();
         return $this->success('请求成功', ['lists' => $data, 'count' => $count, 'page_no' => $page_no, 'page_size' => $page_size]);
     }
+
+    /**
+     * @notes 修改密码
+     */
+    function edit_password()
+    {
+        $params = $this->request->post();
+        $result = MerchantLogic::editPassword($params);
+        if (true === $result) {
+            return $this->success('修改成功', [], 1, 1);
+        }
+        return $this->fail(MerchantLogic::getError());
+    }
 }
diff --git a/app/admin/lists/operation/OpurchaseclassofferLists.php b/app/admin/lists/operation/OpurchaseclassofferLists.php
index a33f5d2..d0391f1 100644
--- a/app/admin/lists/operation/OpurchaseclassofferLists.php
+++ b/app/admin/lists/operation/OpurchaseclassofferLists.php
@@ -66,7 +66,7 @@ class OpurchaseclassofferLists extends BaseAdminDataLists implements ListsSearch
         return OpurchaseGoodsOffer::where($this->searchWhere)
             ->where($where)
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
+            ->orderRaw("goods_id, CASE WHEN price = 0 THEN 999999999 ELSE price END ASC")
             ->select()->each(function ($item) {
                 $find = Goods::where('id', $item['goods_id'])->with('unitName')->find();
                 if($find){
diff --git a/app/admin/logic/merchant/MerchantLogic.php b/app/admin/logic/merchant/MerchantLogic.php
index db69611..c0d0774 100644
--- a/app/admin/logic/merchant/MerchantLogic.php
+++ b/app/admin/logic/merchant/MerchantLogic.php
@@ -208,12 +208,12 @@ class MerchantLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            // $admin_id=Db::name('user_auth_shop')->where(['type'=>2,'pid'=>$params['id']])->value('admin_id');
-            // if($admin_id){
-            //     $passwordSalt = Config::get('project.unique_identification');
-            //     $password=create_password($params['password'], $passwordSalt);
-            //     Admin::where('id',$admin_id)->update(['password'=>$password]);
-            // }
+            $uid=Merchant::where(['mer_id'=>$params['mer_id']])->value('uid');
+            if($uid){
+                $passwordSalt = Config::get('project.unique_identification');
+                $password=create_password($params['password'], $passwordSalt);
+                User::where('id',$uid)->update(['password'=>$password]);
+            }
             Db::commit();
             return true;
         } catch (\Exception $e) {
diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 0531175..e51f477 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -7,6 +7,7 @@ use app\admin\validate\tools\GenerateTableValidate;
 use app\admin\logic\tools\GeneratorLogic;
 use app\common\model\goods\Goods;
 use app\common\model\goods\Goodsclass;
+use app\common\model\retail\Cashierclass;
 use app\common\service\pay\PayService;
 use app\common\service\PushService;
 use app\common\service\wechat\WeChatMnpService;
@@ -22,6 +23,7 @@ use Yansongda\Pay\Pay;
 use Webman\Push\Api;
 use JPush\Client as JPush;
 use support\Log;
+use support\Redis as SupportRedis;
 
 class IndexController extends BaseApiController
 {
@@ -29,6 +31,18 @@ class IndexController extends BaseApiController
 
     public function index()
     {
+        Redis::send('push-platform-print', ['order_id' => 39]);
+        // $auth_code=$this->request->get('auth_code');
+        // $config = Config::get('payment');
+        // Pay::config($config);
+
+        // $result = Pay::alipay()->pos([
+        //     'out_trade_no' => time(),
+        //     'auth_code' => $auth_code,
+        //     'total_amount' => '0.01',
+        //     'subject' => 'yansongda 测试 - 01',
+        //     'extend_params'=>['attach'=>'cashierclass']
+        // ]);
 
         // $arr = [];
         // foreach ($a as $k => $v) {