From f5830e2ac20281aa6881032ddb86305fadf04ea9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 28 Apr 2021 17:51:53 +0800 Subject: [PATCH] businessCircle --- .../controller/callback/AliPayController.java | 5 ++-- .../domain/po/AliBusinessCircleOrder.java | 1 + .../AliBusinessCircleOrderService.java | 5 ++-- .../AliBusinessCircleOrderServiceImpl.java | 25 +++++++++++-------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java index 08b289153..013c06c33 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java @@ -256,7 +256,8 @@ public class AliPayController extends BaseController { aliBusinessCircleOrder.setMallId(mallId); aliBusinessCircleOrder.setMallName(mallName); - aliBusinessCircleOrderService.createOrder(aliBusinessCircleOrder); + + aliBusinessCircleOrderService.createOrder(merchant,aliBusinessCircleOrder); return "success"; } //退款成功 @@ -295,7 +296,7 @@ public class AliPayController extends BaseController { aliBusinessCircleOrder.setMallId(mallId); aliBusinessCircleOrder.setMallName(mallName); - aliBusinessCircleOrderService.insertRefundNoticeOrder(aliBusinessCircleOrder); + aliBusinessCircleOrderService.insertRefundNoticeOrder(merchant,aliBusinessCircleOrder); return "success"; } }else{ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java index 566ab8a8d..ea30a7d11 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index 777319059..5e6838a5f 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.AliBusinessCircleOrder; +import com.iformall.domain.po.WxMerchant; import java.util.List; @@ -35,9 +36,9 @@ public interface AliBusinessCircleOrderService { List getRefundOrderByTransactionId(String transactionId, String tenantId); - void createOrder(AliBusinessCircleOrder record); + void createOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record); - void insertRefundNoticeOrder(AliBusinessCircleOrder record); + void insertRefundNoticeOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record); /** * 积分 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 831726e4a..582ceabdb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -82,7 +82,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } @Override - public void createOrder(AliBusinessCircleOrder record) { + public void createOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record) { String lockKey = StringUtils.join(ALI_CIRCLE_KEY,record.getTransactionId(), ":",EnumYesOrNo.NO.getCode(),":","lock"); long time = System.currentTimeMillis() + 2000; String timeStr = String.valueOf(time); @@ -99,12 +99,15 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder //TODO 第三方获取门店(标识可能发生变化) // WxMerchant wxMerchant = wxMerchantService.getById(Long.parseLong(record.getMallStoreId())); - WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getMallStoreId()); - if(wxMerchant != null){ - record.setMerchantId(wxMerchant.getId()); - }else{ - logger.error("--Ali商圈付款通知消息未找到门店--mallStoreId="+record.getMallStoreId()); - } + //必有门店 +// WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getMallStoreId()); +// if(wxMerchant != null){ +// record.setMerchantId(wxMerchant.getId()); +// }else{ +// logger.error("--Ali商圈付款通知消息未找到门店--mallStoreId="+record.getMallStoreId()); +// } + record.setMerchantId(wxMerchant.getId()); + AliPayCUser userQ = new AliPayCUser(); userQ.updateTenantInfo(record); userQ.setAlipayUserId(record.getBuyerId()); @@ -140,7 +143,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setMerchantId(record.getMerchantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setSpend(record.getPayAmount()); - creditHistory.setChangePurpose("Ali商圈消费:消费商户["+record.getMallName()+"] ("+record.getPayAmountStr()+"元) "); + creditHistory.setChangePurpose("Ali商圈消费:消费商户["+wxMerchant.getName()+"] ("+record.getPayAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) { @@ -169,7 +172,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } @Override - public void insertRefundNoticeOrder(AliBusinessCircleOrder record) { + public void insertRefundNoticeOrder(WxMerchant wxMerchant, AliBusinessCircleOrder record) { AliBusinessCircleOrder order = this.getOrderByTransactionId(record.getTransactionId(),record.getTenantId()); if(order == null){ logger.error("--Ali商圈退款--付款消息未找到--transactionId="+record.getTransactionId()); @@ -219,7 +222,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setCUserId(record.getCUserId()); creditHistory.setCreateDate(new Date()); creditHistory.setCouponId(record.getId()); - creditHistory.setMerchantId(record.getMerchantId()); + creditHistory.setMerchantId(order.getMerchantId()); creditHistory.setCreditType(EnumScoreType.REFUND_CONSUMPTION.getCode()); int points = 0; if((refundAmount + record.getRefundAmount()) == amount){ @@ -233,7 +236,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder creditHistory.setCreditNum(points); creditHistory.setSpend(0-record.getRefundAmount()); - creditHistory.setChangePurpose("Ali商圈消费退款:商户["+record.getMallName()+"] ("+record.getRefundAmountStr()+"元) "); + creditHistory.setChangePurpose("Ali商圈消费退款:商户["+wxMerchant.getName()+"] ("+record.getRefundAmountStr()+"元) "); creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); Integer creditNum = 0; if (creditHistory.getCreditNum() != null) {