调整统计

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -111,10 +111,9 @@ public class invCardManageAction implements IMINAction {
 		//查询累计收入
 		String countIncome = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectCountIncome(m);
-		//查询预估利润
+		//查询总成本价
 		String predictIncome = Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(OrderManageMapper.class).selectPredictIncome(m);
-
 		//查询累计收入
 		List<Map<String, String>> mapList = Service.lookup(IMINDataBaseService.class)
 														.getMybatisMapper(OrderManageMapper.class).selectCountIncomeb(m);

src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -216,10 +216,10 @@
 	</select>
 	<!--	预估利润-->
 	<select id="selectPredictIncome" resultType="java.lang.String" parameterType="java.util.Map">
-		SELECT IFNULL(CAST(SUM(PIF_ORDERAMOUT) AS DECIMAL(15,2)), 0.00)
-		FROM vm_order_details, vm_payment_inf
-		WHERE VOD_IS_WINNING = '01'
-		AND PIF_TRANFLOWNO = VOD_ORDER_ID
+		SELECT IFNULL(CAST(SUM(VCI_COST_PRICE) AS DECIMAL(15,2)), 0.00)
+		FROM vm_order_details a left join  vm_payment_inf b  on PIF_TRANFLOWNO = VOD_ORDER_ID
+		left join vm_pro_equ_rel c on c.VCI_ID = a.VOD_PRO_EQU_REL_ID
+		WHERE VOD_IS_WINNING in ('01','02')
 		AND PIF_STATUS = '1'
 		<if test="nowDate != null and nowDate != ''">
 			and substr(PIF_SUCCTIME,1,8) = #{nowDate,jdbcType=VARCHAR}