|
|
@@ -319,8 +319,8 @@ class PreparePerfCalc {
|
|
|
->select('ID,DEC_SN,ORDER_SN,USER_ID,TYPE,TO_USER_ID,IS_ADMIN,DEC_AMOUNT,DEC_PV,PERIOD_NUM,
|
|
|
CALC_MONTH,IS_DEL,P_CALC_MONTH,CREATED_AT,DEC_ID')
|
|
|
->where(
|
|
|
- "PERIOD_NUM=:PERIOD_NUM AND IS_DEL=0 AND TYPE='ZC' AND CREATED_AT<=:LAST_FLAG_TIME",
|
|
|
- [':PERIOD_NUM' => $this->_periodNum,':LAST_FLAG_TIME' => $this->_lastTime]
|
|
|
+ "PERIOD_NUM=:PERIOD_NUM AND IS_DEL=0 AND TYPE='ZC'",
|
|
|
+ [':PERIOD_NUM' => $this->_periodNum]
|
|
|
)
|
|
|
->orderBy('CREATED_AT DESC,ID DESC')
|
|
|
->offset($offset)
|
|
|
@@ -432,8 +432,8 @@ class PreparePerfCalc {
|
|
|
$allData = OrderDec::findUseDbCalc()
|
|
|
->select('CREATED_AT,ID,SN,USER_ID,ORDER_TYPE,ORDER_AMOUNT,PV,PAY_AMOUNT,PAY_PV,PERIOD_NUM,PAY_TYPE')
|
|
|
->where(
|
|
|
- "PERIOD_NUM=:PERIOD_NUM AND IS_DELETE=0 AND ORDER_TYPE=:ORDER_TYPE AND CREATED_AT<=:LAST_FLAG_TIME",
|
|
|
- [':PERIOD_NUM' => $this->_periodNum, ':ORDER_TYPE'=>'ZC', ':LAST_FLAG_TIME' => $this->_lastTime])
|
|
|
+ "PERIOD_NUM=:PERIOD_NUM AND IS_DELETE=0 AND ORDER_TYPE=:ORDER_TYPE",
|
|
|
+ [':PERIOD_NUM' => $this->_periodNum, ':ORDER_TYPE'=>'ZC'])
|
|
|
->orderBy('ID DESC')
|
|
|
->offset($offset)
|
|
|
->limit($this->_limit)
|
|
|
@@ -545,8 +545,8 @@ class PreparePerfCalc {
|
|
|
->select('ID,SN,DEC_SN,USER_ID,ORDER_TYPE,ORDER_AMOUNT,PAY_AMOUNT,PAY_PV,PAY_TYPE,PERIOD_NUM,STATUS,IS_DELETE,
|
|
|
P_CALC_MONTH,CREATED_AT')
|
|
|
->where(
|
|
|
- "PERIOD_NUM=:PERIOD_NUM AND IS_DELETE=0 AND ORDER_TYPE=:ORDER_TYPE AND CREATED_AT<=:LAST_FLAG_TIME",
|
|
|
- [':PERIOD_NUM' => $this->_periodNum, ':ORDER_TYPE'=>DeclarationForm::TYPE_FX, ':LAST_FLAG_TIME' => $this->_lastTime]
|
|
|
+ "PERIOD_NUM=:PERIOD_NUM AND IS_DELETE=0 AND ORDER_TYPE=:ORDER_TYPE",
|
|
|
+ [':PERIOD_NUM' => $this->_periodNum, ':ORDER_TYPE'=>DeclarationForm::TYPE_FX]
|
|
|
)
|
|
|
->orderBy('CREATED_AT DESC,ID DESC')
|
|
|
->offset($offset)
|
|
|
@@ -673,8 +673,8 @@ class PreparePerfCalc {
|
|
|
'ID,SN,DEC_SN,USER_ID,ORDER_TYPE,ORDER_AMOUNT,PAY_AMOUNT,PAY_PV,PAY_TYPE,PERIOD_NUM,STATUS,IS_DELETE,
|
|
|
P_CALC_MONTH,CREATED_AT')
|
|
|
->where(
|
|
|
- "PERIOD_NUM=:PERIOD_NUM AND IS_DELETE=0 AND ORDER_TYPE=:ORDER_TYPE AND CREATED_AT<=:LAST_FLAG_TIME",
|
|
|
- [':PERIOD_NUM' => $this->_periodNum, ':ORDER_TYPE'=>DeclarationForm::TYPE_FX, ':LAST_FLAG_TIME' => $this->_lastTime]
|
|
|
+ "PERIOD_NUM=:PERIOD_NUM AND IS_DELETE=0 AND ORDER_TYPE=:ORDER_TYPE",
|
|
|
+ [':PERIOD_NUM' => $this->_periodNum, ':ORDER_TYPE'=>DeclarationForm::TYPE_FX]
|
|
|
)
|
|
|
->orderBy('CREATED_AT DESC,ID DESC')
|
|
|
->offset($offset)
|