修改统计界面的东西

core/CoreApp/controllers/User.php

@@ -851,14 +851,23 @@ class User extends Start_Controller
 				$smtmoney[] = $smtm;
 				$ttmoney[] = $ttm;
 				$amzmoney[] = $amzm;
+				// $dlzsl += count($dlz);
+				// $dlzje += $dlzm  + $dlzbty;
+				// $smtsl += count($smt);
+				// $smtje += $smtm + $smtbty;
+				// $ttsl += count($tt);
+				// $ttje += $ttm  + $ttbty;
+				// $amzsl += count($amz);
+				// $amzje += $amzm  + $amzbty;
+
 				$dlzsl += count($dlz);
-				$dlzje += $dlzm  + $dlzbty;
+				$dlzje += $dlzm ;
 				$smtsl += count($smt);
-				$smtje += $smtm + $smtbty;
+				$smtje += $smtm ;
 				$ttsl += count($tt);
-				$ttje += $ttm  + $ttbty;
+				$ttje += $ttm ;
 				$amzsl += count($amz);
-				$amzje += $amzm  + $amzbty;
+				$amzje += $amzm ;
 
 				/**
 		//减去的实收金额
@@ -867,18 +876,26 @@ class User extends Start_Controller
 					**/
 
 				//实收和补/退净额
-				$dlzssje += $dlzmss + $dlzbtj;
-				$smtssje += $smtmss + $smtbtj;
-				$ttssje += $ttmss + $ttbtj;
-				$amzssje += $amzmss + $amzbtj;
+				// $dlzssje += $dlzmss + $dlzbtj;
+				// $smtssje += $smtmss + $smtbtj;
+				// $ttssje += $ttmss + $ttbtj;
+				// $amzssje += $amzmss + $amzbtj;
+
+				$dlzssje += $dlzmss;
+				$smtssje += $smtmss;
+				$ttssje += $ttmss ;
+				$amzssje += $amzmss;
 
 				//数量及金额结束
 				$sd = array_merge($dlz, $smt, $tt,$amz);
 				foreach ($sd as $v) {
 					if (isset($shopdata[$v['shop']])) {
 						$shopdata[$v['shop']]['num'] += 1;
-						$shopdata[$v['shop']]['money'] += $v['shouldmoney']  + $v['refundy'] ;
-						$shopdata[$v['shop']]['tmoney'] += $v['budget']  + $v['refundj'];
+						// $shopdata[$v['shop']]['money'] += $v['shouldmoney']  + $v['refundy'] ;
+						// $shopdata[$v['shop']]['tmoney'] += $v['budget']  + $v['refundj'];
+
+						$shopdata[$v['shop']]['money'] += $v['shouldmoney']  ;
+						$shopdata[$v['shop']]['tmoney'] += $v['budget'] ;
 					}
 				}
 			} else if ($n > 13 && $i <= $n / 2) {
@@ -1063,14 +1080,24 @@ class User extends Start_Controller
 					$smtmoney[] = $smtm;
 					$ttmoney[] = $ttm;
 					$amzmoney[] = $amzm;
+					// $dlzsl += count($dlz);
+					// $dlzje += $dlzm + $dlzbty;
+					// $smtsl += count($smt);
+					// $smtje += $smtm + $smtbty;
+					// $ttsl += count($tt);
+					// $ttje += $ttm + $ttbty;
+					// $amzsl += count($amz);
+					// $amzje += $amzm + $amzbty;
+
+
 					$dlzsl += count($dlz);
-					$dlzje += $dlzm + $dlzbty;
+					$dlzje += $dlzm;
 					$smtsl += count($smt);
-					$smtje += $smtm + $smtbty;
+					$smtje += $smtm;
 					$ttsl += count($tt);
-					$ttje += $ttm + $ttbty;
+					$ttje += $ttm;
 					$amzsl += count($amz);
-					$amzje += $amzm + $amzbty;
+					$amzje += $amzm;
 
 					/**
 			//减去的实收金额
@@ -1079,18 +1106,23 @@ class User extends Start_Controller
 						**/
 
 					//实收和补/退
-					$dlzssje += $dlzmss + $dlzbtj;
-					$smtssje += $smtmss + $smtbtj;
-					$ttssje += $ttmss + $ttbtj;
-					$amzssje += $amzmss + $amzbtj;
+					// $dlzssje += $dlzmss + $dlzbtj;
+					// $smtssje += $smtmss + $smtbtj;
+					// $ttssje += $ttmss + $ttbtj;
+					// $amzssje += $amzmss + $amzbtj;
+
+					$dlzssje += $dlzmss;
+					$smtssje += $smtmss;
+					$ttssje += $ttmss;
+					$amzssje += $amzmss;
 
 					//数量及金额结束
 					$sd = array_merge($dlz, $smt, $tt, $amz);
 					foreach ($sd as $v) {
 						if (isset($shopdata[$v['shop']])) {
 							$shopdata[$v['shop']]['num'] += 1;
-							$shopdata[$v['shop']]['money'] += $v['shouldmoney'] + $v['refundy'];
-							$shopdata[$v['shop']]['tmoney'] += $v['budget'] + $v['refundj'];
+							$shopdata[$v['shop']]['money'] += $v['shouldmoney'];
+							$shopdata[$v['shop']]['tmoney'] += $v['budget'] ;
 						}
 					}
 				}