Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
freemud-pay-job
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lihui.wang
freemud-pay-job
Commits
ea49182b
Commit
ea49182b
authored
Sep 27, 2018
by
lihui.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加了部分日志
parent
ee38a6f2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
11 deletions
+26
-11
freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/AliFuWuChuangSingleMessageSender.java
+6
-7
freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/PayMessageServiceImpl.java
+10
-2
freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/util/InterrprentUtil.java
+10
-1
freemud-pay-module/freemud-pay-push-message/src/main/resources/mapper/PayMessageDMMapper.xml
+0
-1
No files found.
freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/AliFuWuChuangSingleMessageSender.java
View file @
ea49182b
...
@@ -5,17 +5,13 @@ import com.alipay.api.DefaultAlipayClient;
...
@@ -5,17 +5,13 @@ import com.alipay.api.DefaultAlipayClient;
import
com.alipay.api.request.AlipayMobilePublicMessageSingleSendRequest
;
import
com.alipay.api.request.AlipayMobilePublicMessageSingleSendRequest
;
import
com.alipay.api.response.AlipayMobilePublicMessageSingleSendResponse
;
import
com.alipay.api.response.AlipayMobilePublicMessageSingleSendResponse
;
import
com.freemud.pay.job.config.AliPayConfig
;
import
com.freemud.pay.job.config.AliPayConfig
;
import
com.freemud.pay.job.dao.dbModel.ActiveDM
;
import
com.freemud.pay.job.dao.dbModel.PayPlatformAccountDM
;
import
com.freemud.pay.job.dao.dbModel.PayPlatformAccountDM
;
import
com.freemud.pay.job.dao.dbModel.StoreDM
;
import
com.freemud.pay.job.entity.PayMessage
;
import
com.freemud.pay.job.entity.PayMessage
;
import
com.freemud.pay.job.service.*
;
import
com.freemud.pay.job.service.*
;
import
com.freemud.pay.job.service.util.InterrprentUtil
;
import
com.freemud.pay.job.service.util.InterrprentUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.io.*
;
import
java.text.SimpleDateFormat
;
/**
/**
* All rights Reserved, Designed By www.freemud.cn
* All rights Reserved, Designed By www.freemud.cn
...
@@ -30,6 +26,8 @@ import java.text.SimpleDateFormat;
...
@@ -30,6 +26,8 @@ import java.text.SimpleDateFormat;
*/
*/
public
class
AliFuWuChuangSingleMessageSender
implements
IMessageProcessor
{
public
class
AliFuWuChuangSingleMessageSender
implements
IMessageProcessor
{
protected
final
Logger
logger
=
LoggerFactory
.
getLogger
(
getClass
());
@Autowired
@Autowired
IPayPlatformAccountService
IPayPlatformAccountService
;
IPayPlatformAccountService
IPayPlatformAccountService
;
...
@@ -54,6 +52,7 @@ public class AliFuWuChuangSingleMessageSender implements IMessageProcessor {
...
@@ -54,6 +52,7 @@ public class AliFuWuChuangSingleMessageSender implements IMessageProcessor {
PayPlatformAccountDM
payPlatformAccountDM
=
IPayPlatformAccountService
.
getPayPlatformAccount
(
payMessage
.
getPayMessage
().
getPartnerid
());
PayPlatformAccountDM
payPlatformAccountDM
=
IPayPlatformAccountService
.
getPayPlatformAccount
(
payMessage
.
getPayMessage
().
getPartnerid
());
if
(
payPlatformAccountDM
==
null
){
if
(
payPlatformAccountDM
==
null
){
payMessage
.
setNoRetry
(
true
);
payMessage
.
setNoRetry
(
true
);
logger
.
info
(
"平台信息为空"
);
return
false
;
return
false
;
}
}
try
{
try
{
...
@@ -71,7 +70,7 @@ public class AliFuWuChuangSingleMessageSender implements IMessageProcessor {
...
@@ -71,7 +70,7 @@ public class AliFuWuChuangSingleMessageSender implements IMessageProcessor {
}
}
else
if
(
response
.
getCode
()
==
"12007"
)
//未关注
else
if
(
response
.
getCode
()
==
"12007"
)
//未关注
{
{
iPayMessageService
.
updateMessage
Statu
s
(
3
,
payMessage
.
getPayMessage
().
getId
());
iPayMessageService
.
updateMessage
TryTime
s
(
3
,
payMessage
.
getPayMessage
().
getId
());
}
}
else
else
{
{
...
...
freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/impl/PayMessageServiceImpl.java
View file @
ea49182b
...
@@ -10,13 +10,13 @@ import com.freemud.pay.job.service.IMessageProcessor;
...
@@ -10,13 +10,13 @@ import com.freemud.pay.job.service.IMessageProcessor;
import
com.freemud.pay.job.service.IPayMessageService
;
import
com.freemud.pay.job.service.IPayMessageService
;
import
com.freemud.pay.job.service.MessageProcessorFactory
;
import
com.freemud.pay.job.service.MessageProcessorFactory
;
import
com.freemud.pay.job.service.IPayMessageActiveService
;
import
com.freemud.pay.job.service.IPayMessageActiveService
;
import
groovy.util.logging.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -36,6 +36,8 @@ import java.util.Map;
...
@@ -36,6 +36,8 @@ import java.util.Map;
@Service
(
"payMessageServiceImpl"
)
@Service
(
"payMessageServiceImpl"
)
public
class
PayMessageServiceImpl
implements
IPayMessageService
{
public
class
PayMessageServiceImpl
implements
IPayMessageService
{
protected
final
Logger
logger
=
LoggerFactory
.
getLogger
(
getClass
());
@Autowired
@Autowired
IPayMessageRepository
iPayMessageRepository
;
IPayMessageRepository
iPayMessageRepository
;
...
@@ -63,6 +65,7 @@ public class PayMessageServiceImpl implements IPayMessageService {
...
@@ -63,6 +65,7 @@ public class PayMessageServiceImpl implements IPayMessageService {
if
(
message
.
getPayMessageActiveId
()<
0
)
if
(
message
.
getPayMessageActiveId
()<
0
)
{
{
markMessageAsNoProcess
(
message
);
markMessageAsNoProcess
(
message
);
logger
.
info
(
"活动ID不存在"
);
return
;
return
;
}
}
PayMessageActiveDM
active
=
iPayMessageActiveService
.
getPayMessageActiveDM
(
message
.
getPayMessageActiveId
(),
baseParam
);
PayMessageActiveDM
active
=
iPayMessageActiveService
.
getPayMessageActiveDM
(
message
.
getPayMessageActiveId
(),
baseParam
);
...
@@ -70,6 +73,7 @@ public class PayMessageServiceImpl implements IPayMessageService {
...
@@ -70,6 +73,7 @@ public class PayMessageServiceImpl implements IPayMessageService {
||
StringUtils
.
isEmpty
(
active
.
getAction
()))
||
StringUtils
.
isEmpty
(
active
.
getAction
()))
{
{
markMessageAsNoProcess
(
message
);
markMessageAsNoProcess
(
message
);
logger
.
info
(
"活动action不存在"
);
return
;
return
;
}
}
boolean
result
=
false
;
boolean
result
=
false
;
...
@@ -85,19 +89,23 @@ public class PayMessageServiceImpl implements IPayMessageService {
...
@@ -85,19 +89,23 @@ public class PayMessageServiceImpl implements IPayMessageService {
result
=
(
processor
==
null
)
result
=
(
processor
==
null
)
?
false
?
false
:
processor
.
Process
(
payMessage
);
:
processor
.
Process
(
payMessage
);
logger
.
info
(
"消息推送成功"
);
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
//Logger.Warn(string.Format("failed process #{0},exception:{1}", message.Id, ex));
//Logger.Warn(string.Format("failed process #{0},exception:{1}", message.Id, ex));
logger
.
error
(
"消息推送失败"
);
}
}
if
(
result
)
if
(
result
)
{
{
markMessageAsSuccess
(
message
);
markMessageAsSuccess
(
message
);
logger
.
info
(
"消息状态更新成功,状态为1"
);
}
}
else
else
{
{
markMessageAsFailed
(
message
);
markMessageAsFailed
(
message
);
logger
.
error
(
"消息状态更新失败,状态码为-1"
);
}
}
}
}
...
...
freemud-pay-module/freemud-pay-push-message/src/main/java/com/freemud/pay/job/service/util/InterrprentUtil.java
View file @
ea49182b
...
@@ -5,6 +5,8 @@ import com.freemud.pay.job.dao.dbModel.StoreDM;
...
@@ -5,6 +5,8 @@ import com.freemud.pay.job.dao.dbModel.StoreDM;
import
com.freemud.pay.job.entity.PayMessage
;
import
com.freemud.pay.job.entity.PayMessage
;
import
com.freemud.pay.job.service.IActiveService
;
import
com.freemud.pay.job.service.IActiveService
;
import
com.freemud.pay.job.service.IStoreService
;
import
com.freemud.pay.job.service.IStoreService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
java.io.*
;
import
java.io.*
;
...
@@ -23,6 +25,8 @@ import java.text.SimpleDateFormat;
...
@@ -23,6 +25,8 @@ import java.text.SimpleDateFormat;
*/
*/
public
class
InterrprentUtil
{
public
class
InterrprentUtil
{
protected
final
Logger
logger
=
LoggerFactory
.
getLogger
(
getClass
());
@Autowired
@Autowired
IStoreService
iStoreService
;
IStoreService
iStoreService
;
...
@@ -40,6 +44,7 @@ public class InterrprentUtil {
...
@@ -40,6 +44,7 @@ public class InterrprentUtil {
String
templateContent
=
readToFile
(
"templates"
+
"\\"
+
context
.
getPayMessageActive
().
getTemplateid
()+
".txt"
);
String
templateContent
=
readToFile
(
"templates"
+
"\\"
+
context
.
getPayMessageActive
().
getTemplateid
()+
".txt"
);
templateContent
=
templateContent
.
replace
(
"#id#"
,
context
.
getPayMessage
().
getId
().
toString
())
templateContent
=
templateContent
.
replace
(
"#id#"
,
context
.
getPayMessage
().
getId
().
toString
())
.
replace
(
"#toUserId#"
,
context
.
getPayMessage
().
getUserid
())
.
replace
(
"#toUserId#"
,
context
.
getPayMessage
().
getUserid
())
.
replace
(
"#fmId#"
,
context
.
getPayMessage
().
getFmid
())
.
replace
(
"#fmId#"
,
context
.
getPayMessage
().
getFmid
())
...
@@ -59,7 +64,7 @@ public class InterrprentUtil {
...
@@ -59,7 +64,7 @@ public class InterrprentUtil {
if
(
context
.
getPayMessageActive
().
getCouponactiveid
()
>
0
)
if
(
context
.
getPayMessageActive
().
getCouponactiveid
()
>
0
)
{
{
/**
/**
*
todo code 解密沒有
*
解密
*/
*/
EncryptionHelper
encryptionHelper
=
new
EncryptionHelper
();
EncryptionHelper
encryptionHelper
=
new
EncryptionHelper
();
String
code
=
context
.
getPayMessage
().
getCode
().
isEmpty
()?
null
:
encryptionHelper
.
Decode
(
context
.
getPayMessage
().
getCode
().
trim
());
String
code
=
context
.
getPayMessage
().
getCode
().
isEmpty
()?
null
:
encryptionHelper
.
Decode
(
context
.
getPayMessage
().
getCode
().
trim
());
...
@@ -72,6 +77,8 @@ public class InterrprentUtil {
...
@@ -72,6 +77,8 @@ public class InterrprentUtil {
templateContent
=
templateContent
.
replace
(
"#code#"
,
code
)
templateContent
=
templateContent
.
replace
(
"#code#"
,
code
)
.
replace
(
"#validFrom#"
,
dateformat2
.
format
(
couponInfo
.
getStartdate
()))
.
replace
(
"#validFrom#"
,
dateformat2
.
format
(
couponInfo
.
getStartdate
()))
.
replace
(
"#validEnd#"
,
dateformat2
.
format
(
couponInfo
.
getEnddate
()));
.
replace
(
"#validEnd#"
,
dateformat2
.
format
(
couponInfo
.
getEnddate
()));
}
else
{
logger
.
info
(
"活动券码号为空"
);
}
}
return
templateContent
;
return
templateContent
;
...
@@ -88,8 +95,10 @@ public class InterrprentUtil {
...
@@ -88,8 +95,10 @@ public class InterrprentUtil {
in
.
close
();
in
.
close
();
}
catch
(
FileNotFoundException
e
)
{
}
catch
(
FileNotFoundException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
logger
.
error
(
"读取文件失败"
);
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
logger
.
error
(
"读取文件流失败"
);
}
}
try
{
try
{
return
new
String
(
filecontent
,
encoding
);
return
new
String
(
filecontent
,
encoding
);
...
...
freemud-pay-module/freemud-pay-push-message/src/main/resources/mapper/PayMessageDMMapper.xml
View file @
ea49182b
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
FROM [Freemud_ThirdParty].[dbo].[Pay_Message] a WITH ( NOLOCK )
FROM [Freemud_ThirdParty].[dbo].[Pay_Message] a WITH ( NOLOCK )
INNER JOIN ${linkServer}zhuihu.dbo.Pay p WITH ( NOLOCK ) ON a.FMId = p.ZhuiHuOrderId
INNER JOIN ${linkServer}zhuihu.dbo.Pay p WITH ( NOLOCK ) ON a.FMId = p.ZhuiHuOrderId
INNER JOIN zhuihu.dbo.[Partner] part WITH(NOLOCK) ON part.ID=a.PartnerId
INNER JOIN zhuihu.dbo.[Partner] part WITH(NOLOCK) ON part.ID=a.PartnerId
]]>
]]>
</select>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment