充值相关

common/services/xhRechargeService.php

@@ -153,7 +153,6 @@ class xhRechargeService
 			$merchantTotalRecharge = stringUtil::calcAdd($merchantAsset['totalRecharge'], $rechargeAmount);
 
 			$rechargeData = [
-				'id' => stringUtil::generateOrderNo($merchantId, $userId),
 				'payWay' => $payWay,
 				'payStyle' => $payStyle,
 				'merchantId' => $merchantId,
@@ -169,7 +168,7 @@ class xhRechargeService
 				'status'=>1,
 			];
 			$order = self::add($rechargeData);//用户充值记录增加
-			
+
 			$upData['integral'] = $totalIntegral;
 			$upData['balance'] = $totalBalance;
 			$upData['totalRecharge'] = $totalRecharge;

sql.txt

@@ -1,3 +1,9 @@
+2019.12.27 shish 充值相关
+ALTER TABLE `xhRecharge` DROP COLUMN `id`;
+ALTER TABLE `xhRecharge` ADD id INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
+ALTER TABLE `xhRecharge` DROP COLUMN `createTime`;
+ALTER TABLE `xhRecharge` DROP COLUMN `updateTime`;
+
 2019.12.25 shish 员工备注
 ALTER TABLE `xhAdmin` ADD remark VARCHAR(500) NOT NULL DEFAULT '' COMMENT '员工备注' AFTER `remind`;
 ALTER TABLE `xhApply` MODIFY `userId` INT NOT NULL DEFAULT 0 COMMENT '邀请花店的用户id，没有邀请花店，刚是平台花卉宝的用户';