商城下单订单号

app-mall/controllers/OrderController.php

@@ -7,6 +7,7 @@ use bizMall\merchant\services\ExpressService;
 use bizMall\merchant\services\MerchantExtendService;
 use bizMall\merchant\services\MerchantService;
 use bizMall\merchant\services\ShopService;
+use bizMall\order\classes\OrderClass;
 use bizMall\order\services\OrderGoodsService;
 use bizMall\order\services\OrderService;
 use bizMall\promote\services\CouponService;
@@ -106,7 +107,7 @@ class OrderController extends BaseController
         $post['fromType'] = 1;//商城
         $post['prePrice'] = $prePrice;
         $post['actPrice'] = $actPrice;
-        $order = OrderService::addOrder($post);
+        $order = OrderClass::addOrder($post);
         $orderId = $order['id'];
         $orderSn = $order['orderSn'];
         $data = [
@@ -297,7 +298,7 @@ class OrderController extends BaseController
         $post['sourceType'] = $sourceType;
         $post['goodsNum'] = 1;
         $post['fromType'] = $fromType;
-        $order = OrderService::addOrder($post);
+        $order = OrderClass::addOrder($post);
         $orderId = $order['id'];
         $orderSn = $order['orderSn'];
         $sjId = $this->sjId;

biz-mall/order/classes/OrderClass.php

@@ -11,6 +11,7 @@ use bizMall\stat\classes\StatOrderCountClass;
 use bizMall\stat\classes\StatOrderMonthClass;
 use bizMall\user\classes\UserClass;
 use common\components\miniUtil;
+use common\components\orderSn;
 use common\components\stringUtil;
 use common\services\xhOrderDayNumService;
 use common\services\xhOrderMonthNumService;
@@ -66,7 +67,8 @@ class OrderClass extends BaseClass
     {
         $date = date("Y-m-d H:i:s");
         $merchantId = $data['merchantId'];
-        $data['orderSn'] = stringUtil::generateOrderNo($merchantId, $data['userId']);
+
+        $data['orderSn'] = orderSn::getOrderSn();
         $data['payStatus'] = 0;
         $data['createTime'] = $date;
         $data['addTime'] = time();

biz-mall/order/services/OrderService.php

@@ -23,12 +23,6 @@ class OrderService extends BaseService
 
     public static $baseFile = '\bizMall\order\classes\OrderClass';
 
-    //添加订单
-    public static function addOrder($data)
-    {
-        return OrderClass::addOrder($data);
-    }
-
     //获取订单信息 shish 2019.11.28
     public static function getOrderList($where)
     {

biz-mall/renew/classes/RenewSnClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizMall\renew\classes;
+
+use bizMall\base\classes\BaseClass;
+
+class RenewSnClass extends BaseClass
+{
+
+    public static $baseFile = '\bizMall\renew\models\RenewSn';
+
+}

biz-mall/renew/models/RenewSn.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizMall\renew\models;
+
+use bizMall\base\models\Base;
+
+class RenewSn extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhRenewSn';
+    }
+
+}

biz-mall/renew/services/RenewSnService.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizMall\renew\services;
+
+use bizMall\base\services\BaseService;
+
+class RenewSnService extends BaseService
+{
+	
+	public static $baseFile = '\bizMall\renew\classes\RenewSnClass';
+
+}

biz-mall/saas/classes/RenewClass.php

@@ -4,51 +4,51 @@ namespace bizMall\saas\classes;
 
 use bizMall\merchant\classes\MerchantClass;
 use bizMall\user\classes\UserClass;
+use common\components\orderSn;
 use common\components\stringUtil;
 use Yii;
 use bizMall\base\classes\BaseClass;
 
 class RenewClass extends BaseClass
 {
-	
-	public static $baseFile = '\bizMall\saas\models\Renew';
-	
-	public static function getRenewList($where)
-	{
-		$data = self::getList('*', $where, 'addTime DESC');
-		$list = isset($data['list']) ? $data['list'] : [];
-		if (empty($list)) {
-			return $data;
-		}
-		$ids = array_column($list, 'merchantId');
-		$merchant = MerchantClass::getMerchantByIds($ids);
-		$userIdList = array_column($list, 'userId');
-		$user = UserClass::getUserByIds($userIdList);
-		$setIds = array_column($list, 'setId');
-		$setIds = array_filter(array_unique($setIds));
-		$set = SetMealClass::getSetByIds($setIds);
-		foreach ($list as $key => $val) {
-			$merchantId = $val['merchantId'];
-			$userId = $val['userId'];
-			$setId = $val['setId'];
-			$list[$key]['merchantName'] = isset($merchant[$merchantId]['merchantName']) ? $merchant[$merchantId]['merchantName'] : '';
-			$list[$key]['userName'] = isset($user[$userId]['userName']) ? $user[$userId]['userName'] : '';
-			$list[$key]['mobile'] = isset($user[$userId]['mobile']) ? $user[$userId]['mobile'] : '';
-			$list[$key]['setName'] = isset($set[$setId]['name']) ? $set[$setId]['name'] : '';
-		}
-		$data['list'] = $list;
-		return $data;
-	}
-	
-	//增加续费订单 shish 2020.1.14
-	public static function addOrder($data)
-	{
-		$merchantId = $data['merchantId'];
-		$data['orderSn'] = stringUtil::generateOrderNo($merchantId, $data['userId']);
-		$data['payStatus'] = 0;
-		$data['addTime'] = time();
-		$return = self::add($data);
-		return $return;
-	}
-	
+
+    public static $baseFile = '\bizMall\saas\models\Renew';
+
+    public static function getRenewList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        $list = isset($data['list']) ? $data['list'] : [];
+        if (empty($list)) {
+            return $data;
+        }
+        $ids = array_column($list, 'merchantId');
+        $merchant = MerchantClass::getMerchantByIds($ids);
+        $userIdList = array_column($list, 'userId');
+        $user = UserClass::getUserByIds($userIdList);
+        $setIds = array_column($list, 'setId');
+        $setIds = array_filter(array_unique($setIds));
+        $set = SetMealClass::getSetByIds($setIds);
+        foreach ($list as $key => $val) {
+            $merchantId = $val['merchantId'];
+            $userId = $val['userId'];
+            $setId = $val['setId'];
+            $list[$key]['merchantName'] = isset($merchant[$merchantId]['merchantName']) ? $merchant[$merchantId]['merchantName'] : '';
+            $list[$key]['userName'] = isset($user[$userId]['userName']) ? $user[$userId]['userName'] : '';
+            $list[$key]['mobile'] = isset($user[$userId]['mobile']) ? $user[$userId]['mobile'] : '';
+            $list[$key]['setName'] = isset($set[$setId]['name']) ? $set[$setId]['name'] : '';
+        }
+        $data['list'] = $list;
+        return $data;
+    }
+
+    //增加续费订单 shish 2020.1.14
+    public static function addOrder($data)
+    {
+        $data['orderSn'] = orderSn::getRenewSn();
+        $data['payStatus'] = 0;
+        $data['addTime'] = time();
+        $return = self::add($data);
+        return $return;
+    }
+
 }

common/components/orderSn.php

@@ -9,177 +9,193 @@ use bizGhs\check\classes\CheckSnClass;
 use bizGhs\order\classes\OrderSnClass;
 use bizGhs\order\classes\PurchaseSnClass;
 use bizHd\px\classes\PxApplySnClass;
+use bizMall\renew\classes\RenewSnClass;
 use Yii;
 use yii\imagine\Image;
 
 //订单号生成 shish 2021.1.19
 class orderSn
 {
-	
-	//供货商订单号生成 shish 2021.1.19
-	public static function getGhsOrderSn()
-	{
-		$prefix = 'XSD_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'XSD';
-		}
-		$respond = OrderSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('订单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//零售商订单号生成 shish 2021.1.19
-	public static function getOrderSn()
-	{
-		$prefix = 'KD_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'KD';
-		}
-		$respond = \bizHd\order\classes\OrderSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('订单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//供货商采购单号 shish 2021.1.19
-	public static function getGhsPurchaseSn()
-	{
-		$prefix = 'PH_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'PH';
-		}
-		$respond = PurchaseSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('采购单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//供货商盘点单号 shish 2021.1.19
-	public static function getGhsCheckSn()
-	{
-		$prefix = 'PD_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'PD';
-		}
-		$respond = CheckSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('盘点单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//零售商采购单号 shish 2021.1.19
-	public static function getPurchaseSn()
-	{
-		$prefix = 'CG_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'CG';
-		}
-		$respond = \bizHd\purchase\classes\PurchaseSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('采购单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//零售商采购单号 shish 2021.1.19
-	public static function getPurchaseClearSn()
-	{
-		$prefix = 'PC_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'PC';
-		}
-		$respond = PurchaseClearSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//供货商入库订单号 linqh 2021.1.23
-	public static function getGhsStockInSn()
-	{
-		$prefix = 'RK_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'RK';
-		}
-		$respond = \bizGhs\order\classes\StockInSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('入库单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//供货商出库订单号 linqh 2021.1.23
-	public static function getGhsStockOutSn()
-	{
-		$prefix = 'CK_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'CK';
-		}
-		$respond = \bizGhs\order\classes\StockOutSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('出库单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//充值单号 shish 2021.2.20
-	public static function getRechargeSn()
-	{
-		$prefix = 'CZ_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'CZ';
-		}
-		$respond = RechargeSnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('充值单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
-	//供货商批量结算订单号 shish 2021.3.15
-	public static function getGhsOrderClearSn()
-	{
-		// BOC batchOrderClear
-		$prefix = 'BOC_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'BOC';
-		}
-		$respond = OrderClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('订单号没有生成');
-		}
-		return $prefix . $id;
-	}
-
-	//培训报名订单号 shish 2021.3.17
-	public static function getPxApplySn()
-	{
-		$prefix = 'PX_CS';
-		if (getenv('YII_ENV', 'local') == 'production') {
-			$prefix = 'PX';
-		}
-		$respond = PxApplySnClass::add(['id' => null]);
-		$id = $respond['id'] ?? 0;
-		if (empty($id)) {
-			util::fail('订单号没有生成');
-		}
-		return $prefix . $id;
-	}
-	
+
+    //供货商订单号生成 shish 2021.1.19
+    public static function getGhsOrderSn()
+    {
+        $prefix = 'XSD_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'XSD';
+        }
+        $respond = OrderSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('订单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //零售商订单号生成 shish 2021.1.19
+    public static function getOrderSn()
+    {
+        $prefix = 'KD_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'KD';
+        }
+        $respond = \bizHd\order\classes\OrderSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('订单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //供货商采购单号 shish 2021.1.19
+    public static function getGhsPurchaseSn()
+    {
+        $prefix = 'PH_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'PH';
+        }
+        $respond = PurchaseSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('采购单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //供货商盘点单号 shish 2021.1.19
+    public static function getGhsCheckSn()
+    {
+        $prefix = 'PD_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'PD';
+        }
+        $respond = CheckSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('盘点单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //零售商采购单号 shish 2021.1.19
+    public static function getPurchaseSn()
+    {
+        $prefix = 'CG_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'CG';
+        }
+        $respond = \bizHd\purchase\classes\PurchaseSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('采购单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //零售商采购单号 shish 2021.1.19
+    public static function getPurchaseClearSn()
+    {
+        $prefix = 'PC_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'PC';
+        }
+        $respond = PurchaseClearSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //供货商入库订单号 linqh 2021.1.23
+    public static function getGhsStockInSn()
+    {
+        $prefix = 'RK_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'RK';
+        }
+        $respond = \bizGhs\order\classes\StockInSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('入库单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //供货商出库订单号 linqh 2021.1.23
+    public static function getGhsStockOutSn()
+    {
+        $prefix = 'CK_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'CK';
+        }
+        $respond = \bizGhs\order\classes\StockOutSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('出库单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //充值单号 shish 2021.2.20
+    public static function getRechargeSn()
+    {
+        $prefix = 'CZ_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'CZ';
+        }
+        $respond = RechargeSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('充值单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //供货商批量结算订单号 shish 2021.3.15
+    public static function getGhsOrderClearSn()
+    {
+        // BOC batchOrderClear
+        $prefix = 'BOC_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'BOC';
+        }
+        $respond = OrderClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('订单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //培训报名订单号 shish 2021.3.17
+    public static function getPxApplySn()
+    {
+        $prefix = 'PX_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'PX';
+        }
+        $respond = PxApplySnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('订单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
+    //获取花店续费订单号 shish 2021.3.24
+    public static function getRenewSn()
+    {
+        $prefix = 'RN_CS';
+        if (getenv('YII_ENV', 'local') == 'production') {
+            $prefix = 'RN';
+        }
+        $respond = RenewSnClass::add(['id' => null]);
+        $id = $respond['id'] ?? 0;
+        if (empty($id)) {
+            util::fail('订单号没有生成');
+        }
+        return $prefix . $id;
+    }
+
 }

sql.sql

@@ -1710,4 +1710,13 @@ ALTER TABLE xhCustom CHANGE `adminId` `userId` INT(11) NOT NULL DEFAULT '0' COMM
 ALTER TABLE xhCustom ADD UNIQUE INDEX custom(`sjId`,`userId`);
 ALTER TABLE xhShop ADD `cashAccount` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '支付宝提现帐号' AFTER `cancelOrder`;
 ALTER TABLE xhShop ADD `cashName` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '支付宝提现姓名' AFTER `cashAccount`;
-ALTER TABLE xhShopAdmin ADD avatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '头像' AFTER `adminId`;
+ALTER TABLE xhShopAdmin ADD avatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '头像' AFTER `adminId`;
+
+确认三个公众号的模板消息已经导入完整
+
+ALTER TABLE xhRenew CHANGE `payCode` `returnCode` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '支付返回数据';
+DROP TABLE IF EXISTS `xhRenewSn`;
+CREATE TABLE IF NOT EXISTS `xhRenewSn` (
+  `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`id`)
+) AUTO_INCREMENT=18623508 COMMENT='续费订单号';