|
|
@@ -94,53 +94,60 @@
|
|
|
SUM(zfSum) sellZfSum,
|
|
|
SUM(mfSum) sellMfSum,
|
|
|
IFNULL(SUM(wxSum), 0.00)+IFNULL(SUM(zfSum), 0.00) allSell,
|
|
|
- VOD_PRO_EQU_REL_ID vciId
|
|
|
+ VCI_EQUIPMENT_ID vciId,
|
|
|
+ SUM(cbSum) sellCbSum
|
|
|
FROM (
|
|
|
SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,
|
|
|
COUNT(1) allCount,
|
|
|
SUM(VOI_ORDER_AMT) wxSum,
|
|
|
'0' zfSum,
|
|
|
'0' mfSum,
|
|
|
- VOD_PRO_EQU_REL_ID
|
|
|
- FROM vm_payment_inf, vm_order_inf, vm_order_details
|
|
|
+ VCI_EQUIPMENT_ID,
|
|
|
+ SUM(VCI_COST_PRICE) cbSum
|
|
|
+ FROM vm_payment_inf, vm_order_inf, vm_order_details, vm_pro_equ_rel
|
|
|
WHERE PIF_STATUS = '1'
|
|
|
AND VOI_ID = PIF_TRANFLOWNO
|
|
|
AND VOI_ID = VOD_ORDER_ID
|
|
|
+ AND VCI_ID = VOD_PRO_EQU_REL_ID
|
|
|
AND PIF_PAYTYPE IN ('91')
|
|
|
AND VOI_ORDER_AMT != '0.00'
|
|
|
- GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VOD_PRO_EQU_REL_ID
|
|
|
+ GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VCI_EQUIPMENT_ID
|
|
|
UNION ALL
|
|
|
SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,
|
|
|
COUNT(1) allCount,
|
|
|
'0' wxSum,
|
|
|
SUM(VOI_ORDER_AMT) zfSum,
|
|
|
'0' mfSum,
|
|
|
- VOD_PRO_EQU_REL_ID
|
|
|
- FROM vm_payment_inf, vm_order_inf, vm_order_details
|
|
|
+ VCI_EQUIPMENT_ID,
|
|
|
+ SUM(VCI_COST_PRICE) cbSum
|
|
|
+ FROM vm_payment_inf, vm_order_inf, vm_order_details, vm_pro_equ_rel
|
|
|
WHERE PIF_STATUS = '1'
|
|
|
AND VOI_ID = PIF_TRANFLOWNO
|
|
|
AND VOI_ID = VOD_ORDER_ID
|
|
|
+ AND VCI_ID = VOD_PRO_EQU_REL_ID
|
|
|
AND PIF_PAYTYPE IN ('92')
|
|
|
AND VOI_ORDER_AMT != '0.00'
|
|
|
- GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VOD_PRO_EQU_REL_ID
|
|
|
+ GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VCI_EQUIPMENT_ID
|
|
|
UNION ALL
|
|
|
SELECT SUBSTR(PIF_SUCCTIME, 1, 8) AS succTime,
|
|
|
COUNT(1) allCount,
|
|
|
'0' wxSum,
|
|
|
'0' zfSum,
|
|
|
SUM(PIF_ORDERAMOUT) mfSum,
|
|
|
- VOD_PRO_EQU_REL_ID
|
|
|
- FROM vm_payment_inf, vm_order_inf, vm_order_details
|
|
|
+ VCI_EQUIPMENT_ID,
|
|
|
+ SUM(VCI_COST_PRICE) cbSum
|
|
|
+ FROM vm_payment_inf, vm_order_inf, vm_order_details, vm_pro_equ_rel
|
|
|
WHERE PIF_STATUS = '1'
|
|
|
AND VOI_ID = PIF_TRANFLOWNO
|
|
|
AND VOI_ID = VOD_ORDER_ID
|
|
|
+ AND VCI_ID = VOD_PRO_EQU_REL_ID
|
|
|
AND PIF_PAYTYPE IN ('91', '92')
|
|
|
AND VOI_ORDER_AMT = '0.00'
|
|
|
- GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VOD_PRO_EQU_REL_ID
|
|
|
+ GROUP BY SUBSTR(PIF_SUCCTIME, 1, 8), VCI_EQUIPMENT_ID
|
|
|
) b
|
|
|
where 1=1
|
|
|
<if test="equNum != null and equNum != ''">
|
|
|
- AND VOD_PRO_EQU_REL_ID = #{equNum,jdbcType=VARCHAR}
|
|
|
+ AND VCI_EQUIPMENT_ID = #{equNum,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="datesTime != null and datesTime != ''">
|
|
|
and succTime between substr((#{datesTime, jdbcType=VARCHAR}),1,8)
|
|
|
@@ -150,7 +157,7 @@
|
|
|
and succTime = #{nowDate,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
GROUP BY succTime, vciId
|
|
|
- ORDER BY succTime DESC
|
|
|
+ ORDER BY succTime, vciId DESC
|
|
|
</select>
|
|
|
<!-- 总订单数-->
|
|
|
<select id="selectCountOrderNum" resultType="java.lang.String" parameterType="java.util.Map">
|