Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/AdminController.php

@@ -88,7 +88,7 @@ class AdminController extends BaseController
 		util::complete('修改成功');
 	}
 	
-	//确认密码修改
+	//支付密码修改
 	public function actionConfirmPassword()
 	{
 		$post = Yii::$app->request->post();
@@ -103,15 +103,15 @@ class AdminController extends BaseController
 		}
 		$admin = $this->admin;
 		$adminId = $this->adminId;
-		if (!empty($admin['confirmPassword'])) {
+		if (!empty($admin['payPassword'])) {
 			if (empty($old)) {
 				util::fail('请填写旧密码');
 			}
-			if (password_verify($old, $admin['confirmPassword']) == false) {
+			if (password_verify($old, $admin['payPassword']) == false) {
 				util::fail('旧密码错误');
 			}
 		}
-		AdminService::updateById($adminId, ['confirmPassword' => password_hash($new, PASSWORD_BCRYPT)]);
+		AdminService::updateById($adminId, ['payPassword' => password_hash($new, PASSWORD_BCRYPT)]);
 		util::complete('修改成功');
 	}
 	

app-ghs/controllers/UserController.php

@@ -86,8 +86,8 @@ class UserController extends BaseController
             util::fail('二次输入手机号不一样');
         }
 
-        $confirmPassword = isset($post['confirmPassword']) ? $post['confirmPassword'] : '';
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = isset($post['payPassword']) ? $post['payPassword'] : '';
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $mobile = $post['mobile'];
         $user = UserService::getByMobile($mobile, $this->sjId);
@@ -106,8 +106,8 @@ class UserController extends BaseController
     public function actionRecharge()
     {
         $post = Yii::$app->request->post();
-        $confirmPassword = isset($post['confirmPassword']) ? $post['confirmPassword'] : '';
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = isset($post['payPassword']) ? $post['payPassword'] : '';
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $userId = isset($post['userId']) ? $post['userId'] : 0;
         $rechargeAmount = isset($post['rechargeAmount']) ? $post['rechargeAmount'] : 1;
@@ -144,8 +144,8 @@ class UserController extends BaseController
         //验证是否商家客户
         UserService::valid($user, $this->sjId);
         //验证确认密码
-        $confirmPassword = $post['confirmPassword'];
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = $post['payPassword'];
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $grade = xhMerchantExtendService::getGradeList($this->sjExtend, 'desc');
         //升级后的成长值

app-hd/controllers/AdminController.php

@@ -113,15 +113,15 @@ class AdminController extends BaseController
 		}
 		$admin = $this->admin;
 		$adminId = $this->adminId;
-		if (!empty($admin['confirmPassword'])) {
+		if (!empty($admin['payPassword'])) {
 			if (empty($old)) {
 				util::fail('请填写旧密码');
 			}
-			if (password_verify($old, $admin['confirmPassword']) == false) {
+			if (password_verify($old, $admin['payPassword']) == false) {
 				util::fail('旧密码错误');
 			}
 		}
-		AdminService::updateById($adminId, ['confirmPassword' => password_hash($new, PASSWORD_BCRYPT)]);
+		AdminService::updateById($adminId, ['payPassword' => password_hash($new, PASSWORD_BCRYPT)]);
 		util::complete('修改成功');
 	}
 	

app-hd/controllers/CustomController.php

@@ -67,8 +67,8 @@ class CustomController extends BaseController
             util::fail('二次输入手机号不一样');
         }
 
-        $confirmPassword = isset($post['confirmPassword']) ? $post['confirmPassword'] : '';
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = isset($post['payPassword']) ? $post['payPassword'] : '';
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $mobile = $post['mobile'];
         $user = UserService::getByMobile($mobile, $this->sjId);
@@ -87,8 +87,8 @@ class CustomController extends BaseController
     public function actionRecharge()
     {
         $post = Yii::$app->request->post();
-        $confirmPassword = isset($post['confirmPassword']) ? $post['confirmPassword'] : '';
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = isset($post['payPassword']) ? $post['payPassword'] : '';
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $userId = isset($post['userId']) ? $post['userId'] : 0;
         $rechargeAmount = isset($post['rechargeAmount']) ? $post['rechargeAmount'] : 1;
@@ -125,8 +125,8 @@ class CustomController extends BaseController
         //验证是否商家客户
         UserService::valid($user, $this->sjId);
         //验证确认密码
-        $confirmPassword = $post['confirmPassword'];
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = $post['payPassword'];
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $grade = xhMerchantExtendService::getGradeList($this->sjExtend, 'desc');
         //升级后的成长值

app-hd/controllers/PurchaseController.php

@@ -50,8 +50,8 @@ class PurchaseController extends BaseController
     public function actionDebtPay()
     {
         $get = Yii::$app->request->get();
-        $id = $get['id'] ?? 0;
-        $info = PurchaseClass::getInfo($id);
+        $orderSn = $get['orderSn'] ?? 0;
+        $info = PurchaseClass::getByCondition(['orderSn' => $orderSn]);
         PurchaseClass::valid($info, $this->shopId);
         PurchaseClass::debt($info);
         util::complete();

app-hd/controllers/UserController.php

@@ -112,8 +112,8 @@ class UserController extends BaseController
             util::fail('二次输入手机号不一样');
         }
 
-        $confirmPassword = isset($post['confirmPassword']) ? $post['confirmPassword'] : '';
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = isset($post['payPassword']) ? $post['payPassword'] : '';
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $mobile = $post['mobile'];
         $user = UserService::getByMobile($mobile, $this->sjId);
@@ -133,8 +133,8 @@ class UserController extends BaseController
     {
         util::fail('此功能已停用');
         $post = Yii::$app->request->post();
-        $confirmPassword = isset($post['confirmPassword']) ? $post['confirmPassword'] : '';
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = isset($post['payPassword']) ? $post['payPassword'] : '';
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $userId = isset($post['userId']) ? $post['userId'] : 0;
         $rechargeAmount = isset($post['rechargeAmount']) ? $post['rechargeAmount'] : 1;
@@ -172,8 +172,8 @@ class UserController extends BaseController
         //验证是否商家客户
         UserService::valid($user, $this->sjId);
         //验证确认密码
-        $confirmPassword = $post['confirmPassword'];
-        AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
+        $payPassword = $post['payPassword'];
+        AdminService::verifyPayPassword($this->adminId, $payPassword);
 
         $grade = xhMerchantExtendService::getGradeList($this->sjExtend, 'desc');
         //升级后的成长值

biz-ghs/admin/classes/AdminClass.php

@@ -79,7 +79,7 @@ class AdminClass extends BaseClass
             if (empty($shopAdmin)) {
                 $adminData = [
                     'password' => password_hash($mobile, PASSWORD_BCRYPT),
-                    'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
+                    'payPassword' => password_hash($mobile, PASSWORD_BCRYPT),
                     'mobile' => $mobile,
                     'currentShopId'=>$shopId,
                 ];
@@ -113,7 +113,7 @@ class AdminClass extends BaseClass
                 //这里需要输出值secret，否则修改密码那边会有问题
                 $list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
                 $list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
-                $list[$key]['confirmPassword'] = isset($val['confirmPassword']) && !empty($val['confirmPassword']) ? 'secret' : '';
+                $list[$key]['payPassword'] = isset($val['payPassword']) && !empty($val['payPassword']) ? 'secret' : '';
             }
         }
         return $list;

biz-ghs/admin/services/AdminService.php

@@ -23,10 +23,10 @@ class AdminService extends BaseService
         return 'SID_HT_' . $account . '_' . date("mdHis") . '_' . stringUtil::charsShuffle(18);
     }
 
-    public static function verifyConfirmPassword($adminId, $password)
+    public static function verifyPayPassword($adminId, $password)
     {
         $admin = AdminClass::getById($adminId);
-        $hash = isset($admin['confirmPassword']) ? $admin['confirmPassword'] : '';
+        $hash = isset($admin['payPassword']) ? $admin['payPassword'] : '';
         if (password_verify($password, $hash) == false) {
             util::fail('密码错误');
         }

biz-ghs/merchant/classes/MerchantClass.php

@@ -178,7 +178,7 @@ class MerchantClass extends BaseClass
         if (empty($shopAdmin)) {
             $adminData = [
                 'password' => password_hash($mobile, PASSWORD_BCRYPT),
-                'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
+                'payPassword' => password_hash($mobile, PASSWORD_BCRYPT),
                 'mobile' => $mobile
             ];
             AdminClass::updateById($adminId, $adminData);

biz-hd/admin/classes/AdminClass.php

@@ -56,7 +56,7 @@ class AdminClass extends BaseClass
 			if (empty($shopAdmin)) {
 				$adminData = [
 					'password' => password_hash($mobile, PASSWORD_BCRYPT),
-					'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
+					'payPassword' => password_hash($mobile, PASSWORD_BCRYPT),
 					'mobile' => $mobile
 				];
 				AdminClass::updateById($adminId, $adminData);
@@ -87,7 +87,7 @@ class AdminClass extends BaseClass
 				//这里需要输出值secret，否则修改密码那边会有问题
 				$list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
 				$list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
-				$list[$key]['confirmPassword'] = isset($val['confirmPassword']) && !empty($val['confirmPassword']) ? 'secret' : '';
+				$list[$key]['payPassword'] = isset($val['payPassword']) && !empty($val['payPassword']) ? 'secret' : '';
 			}
 		}
 		return $list;

biz-hd/admin/services/AdminService.php

@@ -23,10 +23,10 @@ class AdminService extends BaseService
         return 'SID_HT_' . $account . '_' . date("mdHis") . '_' . stringUtil::charsShuffle(18);
     }
 
-    public static function verifyConfirmPassword($adminId, $password)
+    public static function verifyPayPassword($adminId, $password)
     {
         $admin = AdminClass::getById($adminId);
-        $hash = isset($admin['confirmPassword']) ? $admin['confirmPassword'] : '';
+        $hash = isset($admin['payPassword']) ? $admin['payPassword'] : '';
         if (password_verify($password, $hash) == false) {
             util::fail('密码错误');
         }

biz-hd/purchase/services/PurchaseService.php

@@ -11,52 +11,53 @@ use Yii;
 
 class PurchaseService extends BaseService
 {
-	
-	public static $baseFile = '\bizHd\purchase\classes\PurchaseClass';
-	
-	//采购记录 ssh 2021.1.24
-	public static function getPurchaseList($where)
-	{
-		$data = PurchaseClass::getList('*', $where, 'addTime DESC');
-		$data['list'] = self::groupInfo($data['list']);
-		$data['allNum'] = 0;
-		$data['unPayNum'] = 0;
-		$data['unSendNum'] = 0;
-		$data['sendingNum'] = 0;
-		$data['finishNum'] = 0;
-		$data['debtNum'] = 0;
-		return $data;
-	}
-	
-	//组合信息 ssh 2021.1.25
-	public static function groupInfo($list)
-	{
-		if (empty($list)) {
-			return $list;
-		}
-		
-		$supplierIds = array_unique(array_filter(array_column($list, 'supplierId')));
-		$supplierInfo = GhsClass::getGhsByIds($supplierIds);
-
-		$adminIds = array_unique(array_filter(array_column($list, 'adminId')));
-		$adminInfo = AdminClass::getAdminByIds($adminIds);
-		
-		foreach ($list as $key => $val) {
-			$supplierId = $val['supplierId'];
-			$list[$key]['supplierName'] = $supplierInfo[$supplierId]['name'] ?? '';
-			$list[$key]['supplierAvatar'] = $supplierInfo[$supplierId]['logoUrl'] ?? imgUtil::getPrefix() . '/hhb_small.png';
-			$adminId = $val['adminId'] ?? 0;
-			$list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
-		}
-		return $list;
-	}
-	
-	//所有的欠款采购单 ssh 2021.1.26
-	public static function getDebtList($where)
-	{
-		$list = PurchaseClass::getAllList('*', $where, 'addTime DESC');
-		$count = PurchaseClass::getCount($where);
-		return ['list' => $list, 'debtNum' => $count];
-	}
-	
+
+    public static $baseFile = '\bizHd\purchase\classes\PurchaseClass';
+
+    //采购记录 ssh 2021.1.24
+    public static function getPurchaseList($where)
+    {
+        $data = PurchaseClass::getList('*', $where, 'addTime DESC');
+        $data['list'] = self::groupInfo($data['list']);
+        $data['allNum'] = 0;
+        $data['unPayNum'] = 0;
+        $data['unSendNum'] = 0;
+        $data['sendingNum'] = 0;
+        $data['finishNum'] = 0;
+        $data['debtNum'] = 0;
+        return $data;
+    }
+
+    //组合信息 ssh 2021.1.25
+    public static function groupInfo($list)
+    {
+        if (empty($list)) {
+            return $list;
+        }
+
+        $supplierIds = array_unique(array_filter(array_column($list, 'supplierId')));
+        $supplierInfo = GhsClass::getGhsByIds($supplierIds);
+
+        $adminIds = array_unique(array_filter(array_column($list, 'adminId')));
+        $adminInfo = AdminClass::getAdminByIds($adminIds);
+
+        foreach ($list as $key => $val) {
+            $supplierId = $val['supplierId'];
+            $list[$key]['supplierName'] = $supplierInfo[$supplierId]['name'] ?? '';
+            $list[$key]['supplierAvatar'] = $supplierInfo[$supplierId]['logoUrl'] ?? imgUtil::getPrefix() . '/hhb_small.png';
+            $adminId = $val['adminId'] ?? 0;
+            $list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
+            $list[$key]['status'] = rand(1, 4);
+        }
+        return $list;
+    }
+
+    //所有的欠款采购单 ssh 2021.1.26
+    public static function getDebtList($where)
+    {
+        $list = PurchaseClass::getAllList('*', $where, 'addTime DESC');
+        $count = PurchaseClass::getCount($where);
+        return ['list' => $list, 'debtNum' => $count];
+    }
+
 }

biz-mall/admin/classes/AdminClass.php

@@ -36,7 +36,7 @@ class AdminClass extends BaseClass
                 //这里需要输出值secret，否则修改密码那边会有问题
                 $list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
                 $list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
-                $list[$key]['confirmPassword'] = isset($val['confirmPassword']) && !empty($val['confirmPassword']) ? 'secret' : '';
+                $list[$key]['payPassword'] = isset($val['payPassword']) && !empty($val['payPassword']) ? 'secret' : '';
             }
         }
         return $list;

biz-mall/admin/services/AdminService.php

@@ -23,10 +23,10 @@ class AdminService extends BaseService
         return 'SID_HT_' . $account . '_' . date("mdHis") . '_' . stringUtil::charsShuffle(18);
     }
 
-    public static function verifyConfirmPassword($adminId, $password)
+    public static function verifyPayPassword($adminId, $password)
     {
         $admin = AdminClass::getById($adminId);
-        $hash = isset($admin['confirmPassword']) ? $admin['confirmPassword'] : '';
+        $hash = isset($admin['payPassword']) ? $admin['payPassword'] : '';
         if (password_verify($password, $hash) == false) {
             util::fail('密码错误');
         }

biz-mall/merchant/classes/MerchantClass.php

@@ -176,7 +176,7 @@ class MerchantClass extends BaseClass
         if (empty($shopAdmin)) {
             $adminData = [
                 'password' => password_hash($mobile, PASSWORD_BCRYPT),
-                'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
+                'payPassword' => password_hash($mobile, PASSWORD_BCRYPT),
                 'mobile' => $mobile
             ];
             AdminClass::updateById($adminId, $adminData);

common/services/xhAdminService.php

@@ -128,7 +128,7 @@ class xhAdminService
 		$data['adminName'] = $nickName;
 		$data['avatar'] = '';
 		$data['password'] = isset($baseInfo['password']) ? md5($baseInfo['password']) : '';
-		$data['confirmPassword'] = '';
+		$data['payPassword'] = '';
 		$data['openId'] = $baseInfo['openid'];
 		$data['unionId'] = isset($baseInfo['unionId']) ? $baseInfo['unionId'] : '';
 		$data['subscribe'] = isset($baseInfo['subscribe']) ? $baseInfo['subscribe'] : 0;

console/controllers/UpgradeController.php

@@ -102,7 +102,7 @@ ALTER TABLE xhOrder ADD INDEX merchant(merchantId,`status`);
 ALTER TABLE xhOrder ADD INDEX userId(userId,`status`);
 ALTER TABLE xhUserAsset ADD inviteNum INT NOT NULL DEFAULT 0 COMMENT '邀请新人数量' AFTER `discount`;
 ALTER TABLE xhAdmin MODIFY `password` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '密码';
-ALTER TABLE xhAdmin MODIFY `confirmPassword` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '确认密码';
+ALTER TABLE xhAdmin MODIFY `payPassword` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '确认密码';
 ALTER TABLE `xhUser` ADD INDEX mobile(merchantId,`mobile`);
 ALTER TABLE xhUserAsset DROP COLUMN `point`;
 ALTER TABLE xhUserAsset MODIFY `integral` INT NOT NULL DEFAULT 0 COMMENT '积分';
@@ -981,12 +981,12 @@ UPDATE `xhAdmin` SET id=18528,merchantId=12358,roleId=683 WHERE id=1;";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		$password = password_hash('123456', PASSWORD_BCRYPT);
-		$confirmPassword = password_hash('123456', PASSWORD_BCRYPT);
-		$sql = "update `xhAdmin` set password='{$password}',confirmPassword='{$confirmPassword}' where id=18528";
+		$payPassword = password_hash('123456', PASSWORD_BCRYPT);
+		$sql = "update `xhAdmin` set password='{$password}',payPassword='{$payPassword}' where id=18528";
 		Yii::$app->db->createCommand($sql)->execute();
 		$password = password_hash('123456', PASSWORD_BCRYPT);
-		$confirmPassword = password_hash('123456', PASSWORD_BCRYPT);
-		$sql = "update `xhAdmin` set password='{$password}',confirmPassword='{$confirmPassword}' where id=18529";
+		$payPassword = password_hash('123456', PASSWORD_BCRYPT);
+		$sql = "update `xhAdmin` set password='{$password}',payPassword='{$payPassword}' where id=18529";
 		Yii::$app->db->createCommand($sql)->execute();
 		
 		//花美灵开放平台

sql.sql

@@ -2024,6 +2024,7 @@ ALTER TABLE xhPtItemClass DROP COLUMN `addTime`;
 ALTER TABLE xhPtItemClass DROP COLUMN `updateTime`;
 ALTER TABLE xhPtItemClass ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `inTurn`;
 ALTER TABLE xhPtItemClass ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;
+ALTER TABLE xhAdmin CHANGE `confirmPassword` `payPassword` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '支付密码';
 
 ========
 ==linqh 2021-4-9