订单数变化

biz/order/classes/OrderClass.php

@@ -2,6 +2,7 @@
 
 namespace biz\order\classes;
 
+use biz\merchant\classes\MerchantAssetClass;
 use biz\merchant\classes\MerchantClass;
 use biz\message\classes\InformAdminClass;
 use biz\message\classes\InformUserClass;
@@ -64,6 +65,13 @@ class OrderClass extends BaseClass
         $data['sendNum'] = $riseNum;
         $data['totalFlow'] = OrderSendClass::TOTAL_FLOW;
         $return = self::add($data);
+
+        //全部订单+1，待付款订单+1
+	    $merchantAsset = MerchantAssetClass::getByMerchantId($merchantId,true);
+	    $merchantAsset->unPayOrder += 1;
+	    $merchantAsset->totalOrder += 1;
+	    $merchantAsset->save();
+
         return $return;
     }
 

common/services/xhPayToolService.php

@@ -167,8 +167,18 @@ class xhPayToolService
 			$mExpend = $mAsset['totalExpend'];
 			$mIncome = stringUtil::calcAdd($mAsset['totalIncome'], $totalFee);
 			$mUseRecharge = stringUtil::calcAdd($mAsset['usedRecharge'], $totalFee);
-			$mTotalDeal = $mAsset['totalDeal'] + 1;//总交易数+1
-			$mUpdateData = ['totalIncome' => $mIncome, 'usedRecharge' => $mUseRecharge, 'totalDeal' => $mTotalDeal];
+			$mTotalDeal = $mAsset['totalDeal'] + 1;//付款成功成交量+1
+			$mUnSendOrder = $mAsset['unSendOrder'] + 1;//待配送订单+1
+			$mUnPayOrder = $mAsset['unPayOrder'] - 1;//待付款订单-1
+			$mPayOrder = $mAsset['payOrder'] + 1;//付款订单+1
+			$mUpdateData = [
+				'totalIncome' => $mIncome,
+				'usedRecharge' => $mUseRecharge,
+				'totalDeal' => $mTotalDeal,
+				'payOrder' => $mPayOrder,
+				'unPayOrder' => $mUnPayOrder,
+				'unSendOrder' => $mUnSendOrder,
+			];
 			//支付方式要转到商家资产变更里去
 			$order['payWay'] = $payWay;
 			xhMerchantAssetService::incomeChangeAsset($merchant, $mAsset, $shopId, $mUpdateData, $order, $capitalType);//商家资产改变
@@ -293,14 +303,14 @@ class xhPayToolService
 			xhUserCapitalService::add($userCapitalData);//用户资金流水增加
 			
 			$transaction->commit();
-
+			
 			//如果是小程序支付可以获取unionId并进行更新关联
 			if ($payWay == $wxWay && $wxPayType == 1) {
 				OrderClass::payToUpdateUnionId($merchant, $merchantExtend, $orderSn, $user);
 			}
-
+			
 			return ['balance' => $remainBalance];
-
+			
 		} catch (Exception $e) {
 			$transaction->rollBack();
 			util::fail('支付没有成功');

console/controllers/UpgradeController.php

@@ -1446,6 +1446,10 @@ merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 ALTER TABLE `xhUserAsset` MODIFY `member` SMALLINT NOT NULL DEFAULT 0 COMMENT '会员等级 0普遍客户 大于等于1 会员';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
+		$sql = "ALTER TABLE `xhMerchantAsset` MODIFY `totalDeal` INT NOT NULL DEFAULT 0 COMMENT '总成交量（忘了有什么用）';
+ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT '总订单数；包括付款和未付款的';";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+
 	}
 	
 	//数据迁移 shish 2020.1.12