|
|
|
@@ -114,7 +114,11 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService |
|
|
|
WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); |
|
|
|
if(wxMerchant != null){ |
|
|
|
record.setMerchantId(wxMerchant.getId()); |
|
|
|
record.setShopName(wxMerchant.getName()); |
|
|
|
}else{ |
|
|
|
if(StringUtils.isBlank(record.getShopName())){ |
|
|
|
record.setShopName("第三方门店"); |
|
|
|
} |
|
|
|
logger.info("--第三方付款通知消息未找到门店--shopName="+record.getShopName()+"&shopNumber="+record.getShopNumber()); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -155,7 +159,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService |
|
|
|
creditHistory.setMerchantId(record.getMerchantId()); |
|
|
|
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); |
|
|
|
creditHistory.setSpend(record.getPayAmount()); |
|
|
|
creditHistory.setChangePurpose(record.getSourceAppName()+"消费:商户["+record.getShopName()+"] ("+record.getPayAmountStr()+"元) "); |
|
|
|
creditHistory.setChangePurpose(record.getSourceAppName()+"·消费:商户["+record.getShopName()+"] ("+record.getPayAmountStr()+"元) "); |
|
|
|
creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); |
|
|
|
Integer creditNum = 0; |
|
|
|
if (creditHistory.getCreditNum() != null) { |
|
|
|
@@ -194,7 +198,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService |
|
|
|
}else{ |
|
|
|
WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(EnumThirdOrderType.RMB_PAY,record.getRefundId(),record.getTenantId()); |
|
|
|
if(refundOrder != null){ |
|
|
|
logger.error("--Ali商圈退款--退款消息已存在---RefundId="+record.getRefundId()); |
|
|
|
logger.error("--第三方退款--退款消息已存在---RefundId="+record.getRefundId()); |
|
|
|
}else{ |
|
|
|
String lockKey = StringUtils.join(THIRD_CIRCLE_KEY,record.getRefundId(), ":",EnumYesOrNo.YES.getCode(),":", "lock"); |
|
|
|
long time = System.currentTimeMillis() + 2000; |
|
|
|
@@ -271,7 +275,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService |
|
|
|
|
|
|
|
creditHistory.setCreditNum(points); |
|
|
|
creditHistory.setSpend(0-record.getRefundAmount()); |
|
|
|
creditHistory.setChangePurpose(record.getSourceAppName()+"消费退款:商户["+record.getShopName()+"] ("+record.getRefundAmountStr()+"元) "); |
|
|
|
creditHistory.setChangePurpose(record.getSourceAppName()+"·消费退款:商户["+record.getShopName()+"] ("+record.getRefundAmountStr()+"元) "); |
|
|
|
creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); |
|
|
|
Integer creditNum = 0; |
|
|
|
if (creditHistory.getCreditNum() != null) { |
|
|
|
@@ -350,21 +354,31 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService |
|
|
|
WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); |
|
|
|
if(wxMerchant != null){ |
|
|
|
record.setMerchantId(wxMerchant.getId()); |
|
|
|
record.setShopName(wxMerchant.getName()); |
|
|
|
}else{ |
|
|
|
if(StringUtils.isBlank(record.getShopName())){ |
|
|
|
record.setShopName("第三方门店"); |
|
|
|
} |
|
|
|
logger.info("--第三方积分抵扣未找到门店--shopName="+record.getShopName()+"&shopNumber="+record.getShopNumber()); |
|
|
|
} |
|
|
|
|
|
|
|
WxCreditHistory wxCreditHistory = new WxCreditHistory(); |
|
|
|
wxCreditHistory.setTenantId(record.getFinalTenantId()); |
|
|
|
wxCreditHistory.setCUserId(basicInfo.getId()); |
|
|
|
wxCreditHistory.setOperatorId(basicInfo.getId()); |
|
|
|
wxCreditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); |
|
|
|
wxCreditHistory.setCreditNum(record.getAmount()); |
|
|
|
wxCreditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); |
|
|
|
wxCreditHistory.setChangePurpose(record.getSourceAppName()+"积分抵扣{}"+record.getSummary()); |
|
|
|
wxCreditHistory.setCouponId(record.getId()); |
|
|
|
wxCreditHistoryService.saveOrUpdate(wxCreditHistory,record.getTenantId()); |
|
|
|
|
|
|
|
WxCreditHistory creditHistory = new WxCreditHistory(); |
|
|
|
creditHistory.setTenantId(record.getFinalTenantId()); |
|
|
|
creditHistory.setCUserId(basicInfo.getId()); |
|
|
|
creditHistory.setOperatorId(basicInfo.getId()); |
|
|
|
creditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); |
|
|
|
creditHistory.setCreditNum(record.getAmount()); |
|
|
|
creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); |
|
|
|
creditHistory.setChangePurpose(record.getSourceAppName()+"·积分抵扣{}"+record.getSummary()); |
|
|
|
creditHistory.setCouponId(record.getId()); |
|
|
|
creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory, record.getTenantId()); |
|
|
|
Integer creditNum = 0; |
|
|
|
if (creditHistory.getCreditNum() != null) { |
|
|
|
creditNum = creditHistory.getCreditNum(); |
|
|
|
} |
|
|
|
if(creditNum == 0){ |
|
|
|
throw new MallinkException(ErrorCode.CREDIT_ZERO.getCode(), "本次扣减积分为0"); |
|
|
|
} |
|
|
|
wxThirdPartyOrdersMapper.insertNoticeOrder(record); |
|
|
|
} |
|
|
|
redisLock.unlock(lockKey, timeStr); |
|
|
|
|