From 7379155cb962a4a49fcbf971abc8283053782faf Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 7 Sep 2018 11:48:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E5=88=86=E8=B4=A6]:?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=BA=9B=E9=94=99=E8=AF=AF=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxProfitSharingOrderServiceImpl.java | 8 ++++++-- .../service/impl/WxProfitSharingReceiverServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java index 18bb72a41..1ebf7d071 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java @@ -24,7 +24,8 @@ import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; - +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; @Service @@ -138,6 +139,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData createSharingOrder(WxPayOrder wxPayOrder) { final IdWorker idworker = IdWorker.get(); @@ -236,6 +238,8 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ record.setErrorMsg("返回值校验失败"); + record.setUpdateTime(new Date()); + wxProfitSharingOrderMapper.updateByPrimaryKey(record); return new ResultData(ErrorCode.PROFIT_SHARING_RETURN_INVALID.getCode(), ErrorCode.PROFIT_SHARING_RETURN_INVALID.getMessage()); } @@ -292,7 +296,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(ErrorCode.PROFIT_SHARING_QUERY_REQUEST_FAILED.getCode(), returnMap.get("return_msg")); } - if (!WxPayment.verifyNotify(returnMap,payAccount.getApiKey())){ + if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ return new ResultData(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(), ErrorCode.PROFIT_SHARING_RETURN_INVALID.getMessage()); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java index 768e65813..51222c45c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -196,9 +196,11 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if (!"SUCCESS".equals(result_code)) { return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), returnMap.get("result_msg")); } + if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); } + wxProfitSharingReceiverMapper.deleteByPrimaryKey(receiver); return new ResultData(returnMap); }