diff --git a/app/admin/controller/supplier/SupplierController.php b/app/admin/controller/supplier/SupplierController.php
index b54dd4f..9125856 100644
--- a/app/admin/controller/supplier/SupplierController.php
+++ b/app/admin/controller/supplier/SupplierController.php
@@ -99,11 +99,12 @@ class SupplierController extends BaseAdminController
     /**
      * @notes 设置余额
      */
-    public function set_money(){
-        $set_money = $this->request->post('set_money',0);
-        $id=$this->request->post('id',0);
-        $type=$this->request->post('type',1);
-        $result = SupplierLogic::set_money($id,$set_money,$type);
+    public function set_money()
+    {
+        $set_money = $this->request->post('set_money', 0);
+        $id = $this->request->post('id', 0);
+        $type = $this->request->post('type', 1);
+        $result = SupplierLogic::set_money($id, $set_money, $type);
         if (true === $result) {
             return $this->success('设置成功', [], 1, 1);
         }
@@ -163,4 +164,17 @@ class SupplierController extends BaseAdminController
         }
         return $this->fail(SupplierLogic::getError());
     }
+
+    /**
+     * @notes 修改密码
+     */
+     function edit_password()
+    {
+        $params = $this->request->post();
+        $result = SupplierLogic::editPassword($params);
+        if (true === $result) {
+            return $this->success('修改成功', [], 1, 1);
+        }
+        return $this->fail(SupplierLogic::getError());
+    }
 }
diff --git a/app/admin/logic/merchant/MerchantLogic.php b/app/admin/logic/merchant/MerchantLogic.php
index 27ffeb7..db69611 100644
--- a/app/admin/logic/merchant/MerchantLogic.php
+++ b/app/admin/logic/merchant/MerchantLogic.php
@@ -13,7 +13,7 @@ use app\common\model\user\User;
 use app\common\service\ThinkApi;
 use think\facade\Db;
 use support\exception\BusinessException;
-
+use Webman\Config;
 
 /**
  * 商户列表逻辑
@@ -200,6 +200,27 @@ class MerchantLogic extends BaseLogic
             self::setError($e->getMessage());
             return false;
         }
+    }
+       /**
+     * @notes 修改密码
+     */
+    public static function editPassword($params)
+    {
+        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]);
+            // }
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
     }
     /**
      * @notes 设置余额
diff --git a/app/admin/logic/supplier/SupplierLogic.php b/app/admin/logic/supplier/SupplierLogic.php
index f21861d..01f8632 100644
--- a/app/admin/logic/supplier/SupplierLogic.php
+++ b/app/admin/logic/supplier/SupplierLogic.php
@@ -10,10 +10,11 @@ use app\common\model\goods\GoodsLabel;
 use app\common\model\merchant\MerchantBank;
 use app\common\model\supplier\Supplier;
 use app\common\logic\BaseLogic;
+use app\common\model\auth\Admin;
 use app\common\model\financial\FinancialRecord;
 use think\facade\Db;
 use support\exception\BusinessException;
-
+use Webman\Config;
 
 /**
  * 供应商管理逻辑
@@ -275,7 +276,27 @@ class SupplierLogic extends BaseLogic
             return false;
         }
     }
-
+   /**
+     * @notes 修改密码
+     */
+    public static function editPassword($params)
+    {
+        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]);
+            }
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
     /**
      * @notes 删除供应商管理
      * @param array $params
diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 687f861..0531175 100644
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -29,20 +29,7 @@ class IndexController extends BaseApiController
 
     public function index()
     {
-        Redis::send('push-platform-print', ['order_id' => 39],5);
 
-        // $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']
-        // ]);
-       d(1);
         // $arr = [];
         // foreach ($a as $k => $v) {
         //     $pid = Goodsclass::where('id', $v)->value('pid');
diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php
index d89bf80..42af812 100644
--- a/app/api/controller/order/RetailOrderController.php
+++ b/app/api/controller/order/RetailOrderController.php
@@ -131,7 +131,7 @@ class RetailOrderController extends BaseApiController
             return $this->fail('购物车商品不能超过100个');
         }
 
-        if ($pay_type == 9 || $pay_type == 17) {
+        if ($pay_type == 9 || $pay_type == 17 ||$pay_type==13) {
             if (empty($this->request->userInfo['merchant'])) {
                 return $this->fail('请先绑定商户');
             }
diff --git a/app/common/logic/PaymentLogic.php b/app/common/logic/PaymentLogic.php
index 0bbd268..628fac1 100644
--- a/app/common/logic/PaymentLogic.php
+++ b/app/common/logic/PaymentLogic.php
@@ -109,7 +109,7 @@ class PaymentLogic extends BaseLogic
      */
     public static function ali_auth_code($auth_code, $order)
     {
-        $pattern = '/^([25-30]{2})(\d{14,22})$/';
+        $pattern = '/^(25|26|27|28|29|30)[0-9A-Za-z]{14,23}$/';
 
         if (!preg_match($pattern, (string)$auth_code)) {
             self::$error = '请使用正确的支付宝收付款条码';