autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-11 10:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-08 11:42:33 +08:00
parent fceaeb4ba5
commit 5bfdddf075
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -927,7 +927,7 @@ public class OrderService {
payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel()); payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel());
// 判断是微信支付还是汇付支付 // 判断是微信支付还是汇付支付
MemberTransactionRecord record = memberTransactionRecordService.selectByOrderCode(orderCode); MemberTransactionRecord record = memberTransactionRecordService.selectByOrderCode(orderCode, ActionTypeEnum.FORWARD.getValue());
if (record != null) { if (record != null) {
String paymentInstitutions = record.getPaymentInstitutions(); String paymentInstitutions = record.getPaymentInstitutions();
if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.WECHAT_PAY.getValue())) { if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.WECHAT_PAY.getValue())) {

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberTransactionRecordMapper.java
View File

@@ -11,5 +11,5 @@ public interface MemberTransactionRecordMapper {
List<MemberTransactionRecord> selectByMemberId(String memberId); List<MemberTransactionRecord> selectByMemberId(String memberId);
MemberTransactionRecord selectByOrderCode(@Param("orderCode") String orderCode); MemberTransactionRecord selectByOrderCode(@Param("orderCode") String orderCode, @Param("actionType") String actionType);
} }

8
jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java
View File

@@ -16,5 +16,11 @@ public interface IMemberTransactionRecordService {
List<MemberTransactionVO> selectMemberTransactionRecordList(String memberId); List<MemberTransactionVO> selectMemberTransactionRecordList(String memberId);
MemberTransactionRecord selectByOrderCode(String orderCode); /**
* 查询会员交易记录
* @param orderCode
* @param actionType com.jsowell.common.enums.ykc.ActionTypeEnum
* @return
*/
MemberTransactionRecord selectByOrderCode(String orderCode, String actionType);
} }

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java
View File

@@ -39,8 +39,8 @@ public class MemberTransactionRecordServiceImpl implements IMemberTransactionRec
} }
@Override @Override
public MemberTransactionRecord selectByOrderCode(String orderCode) { public MemberTransactionRecord selectByOrderCode(String orderCode, String actionType) {
return memberTransactionRecordMapper.selectByOrderCode(orderCode); return memberTransactionRecordMapper.selectByOrderCode(orderCode, actionType);
} }
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -670,7 +670,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
weChatRefundDTO.setRefundAmount(residue); weChatRefundDTO.setRefundAmount(residue);
// 查到该笔订单付款金额到哪里了 // 查到该笔订单付款金额到哪里了
MemberTransactionRecord transactionRecord = memberTransactionRecordService.selectByOrderCode(orderBasicInfo.getOrderCode()); MemberTransactionRecord transactionRecord = memberTransactionRecordService.selectByOrderCode(orderBasicInfo.getOrderCode(), ActionTypeEnum.FORWARD.getValue());
logger.info("查到该笔订单付款金额到哪里了:{}", JSON.toJSONString(transactionRecord)); logger.info("查到该笔订单付款金额到哪里了:{}", JSON.toJSONString(transactionRecord));
if (StringUtils.equals(transactionRecord.getPaymentInstitutions(), PaymentInstitutionsEnum.WECHAT_PAY.getValue())) { if (StringUtils.equals(transactionRecord.getPaymentInstitutions(), PaymentInstitutionsEnum.WECHAT_PAY.getValue())) {
this.weChatRefund(weChatRefundDTO); this.weChatRefund(weChatRefundDTO);

1
jsowell-pile/src/main/resources/mapper/pile/MemberTransactionRecordMapper.xml
View File

@@ -124,5 +124,6 @@
FROM `member_transaction_record` FROM `member_transaction_record`
where del_flag = '0' where del_flag = '0'
and order_code = #{orderCode} and order_code = #{orderCode}
and action_type = #{actionType}
</select> </select>
</mapper> </mapper>