门店收入

biz/message/classes/InformAdminClass.php

@@ -65,7 +65,7 @@ class InformAdminClass extends BaseClass
 		$producer->publish($msg, 'informExchange', 'informRoute');
 		
 	}
-
+	
 	//宝贝售出提醒 shish 2020.5.31
 	public static function goodsSoldInform($params, $admin, $TMList)
 	{
@@ -137,15 +137,24 @@ class InformAdminClass extends BaseClass
 		return $data;
 	}
 	
+	//收入提醒 shish 2020.5.31
 	public static function incomeInform($params, $admin, $TMList)
 	{
-		$totalFee = isset($params['totalFee']) ? $params['totalFee'] : 0;
-		$orderId = isset($params['orderId']) ? $params['orderId'] : '';
-		$orderSn = isset($params['orderSn']) ? $params['orderSn'] : '';
-		$orderName = '商品';
-		$userName = '石头';
-		$data['briefContent'] = "客户" . $userName . "付款" . $totalFee . '元';
-		//收入提醒
+		$order = $params['order'];
+		$totalFee = isset($order['totalFee']) ? $order['totalFee'] : 0;
+		$orderId = isset($order['orderId']) ? $order['orderId'] : '';
+		$orderSn = isset($order['orderSn']) ? $order['orderSn'] : '';
+		$payTime = isset($order['payTime']) && !empty($order['payTime']) ? date("Y-m-d H:i", $order['payTime']) : '未知';
+		$store = isset($order['store']) ? $order['store'] : 0;
+		$sourceTypeId = $order['sourceType'];
+		if ($store == 1) {
+			$incomeStyle = '门店收入';
+		} else {
+			$sourceTypeList = [0 => '微信', 1 => '支付宝', 2 => '小程序', 3 => '朋友圈', 4 => '美团', 5 => '系统'];
+			$incomeStyle = isset($sourceTypeList[$sourceTypeId]) ? $sourceTypeList[$sourceTypeId] . '收入' : '未知';
+		}
+		$data = [];
+		$data['briefContent'] = "客户付款" . $totalFee . '元';
 		$openId = isset($admin['adminBaseInfo']['openId']) ? $admin['adminBaseInfo']['openId'] : '';
 		$miniOpenId = isset($admin['adminBaseInfo']['miniOpenId']) ? $admin['adminBaseInfo']['miniOpenId'] : '';
 		$shortTempId = 'OPENTM207422813';
@@ -155,13 +164,11 @@ class InformAdminClass extends BaseClass
 			"template_id" => $tempId,
 			"url" => Yii::$app->params['adminUrl'] . '/order/detail',
 			"data" => [
-				"first" => ["value" => '您有新的收入！', "color" => "#173177"],
-				"keyword1" => ["value" => (string)$orderSn, "color" => "#173177"],
-				"keyword2" => ["value" => $orderName, "color" => "#173177"],
-				"keyword3" => ["value" => number_format($totalFee, 2) . '元', "color" => "#173177"],
-				"keyword4" => ["value" => number_format($totalFee, 2) . '元', "color" => "#173177"],
-				"keyword5" => ["value" => $userName, "color" => "#173177"],
-				"remark" => ["value" => '点此查看详细', "color" => "#173177"]
+				"first" => ["value" => '您有新的收入~', "color" => "#173177"],
+				"keyword1" => ["value" => number_format($totalFee, 2) . '元', "color" => "#173177"],
+				"keyword2" => ["value" => $incomeStyle, "color" => "#173177"],
+				"keyword3" => ["value" => $payTime, "color" => "#173177"],
+				"remark" => ["value" => '点此查看、发货', "color" => "#173177"]
 			]
 		];
 		if (!empty($miniOpenId)) {

common/services/xhMerchantAssetService.php

@@ -88,14 +88,10 @@ class xhMerchantAssetService
 						}
 					}
 				}
-				//sourceType 0商城 1门店 2微信朋友圈 3美团
 				//收入提醒 shish 2020.1.30
 				$params = [
-					'sourceType' => $order['sourceType'],
 					'miniAppId' => $openMerchant['miniAppId'],
-					'orderId' => $orderId,
-					'orderSn' => $orderSn,
-					'totalFee' => $order['actPrice'],
+					'order' => $order,
 				];
 				$type = 'income';
 				InformAdminService::addInform($shopId, $type, $params);