|
@@ -34,14 +34,14 @@ func SendDataExportMailForPayed() {
|
|
|
filePath := qutil.ObjToString(order["download_url"])
|
|
|
orderCode := qutil.ObjToString(order["order_code"])
|
|
|
fileCount, err := util.GetDataExportFileDataLen(config.ExConf.ExcelReadyPath + filePath)
|
|
|
- if err == nil && dataCount == fileCount { //文件数据量不对
|
|
|
+ if err == nil && fileCount >= dataCount { //文件数据量不对(新进数据可能存在大于实际支付数据量)
|
|
|
//移动至已支付目录
|
|
|
_, err = util.MoveFile(config.ExConf.ExcelReadyPath+filePath, config.ExConf.ExcelPayedPath+filePath)
|
|
|
var payedFileCount int
|
|
|
if err == nil {
|
|
|
payedFileCount, err = util.GetDataExportFileDataLen(config.ExConf.ExcelReadyPath + filePath)
|
|
|
}
|
|
|
- if err == nil && payedFileCount == dataCount {
|
|
|
+ if err == nil && payedFileCount >= dataCount {
|
|
|
now := time.Now()
|
|
|
userMail := qutil.ObjToString(order["user_mail"])
|
|
|
//发送邮件
|