From 8e6b38c72083dce3a804278c162ad9e643b034be Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 26 Jun 2023 19:12:04 +0800 Subject: [PATCH 1/4] //sharing --- .../service/impl/WxProfitSharingOrderServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index f76992e69..0ac964938 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -342,7 +342,9 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ }else if(EnumPayWay.PAY_WAY_TT.getCode().equals(payOrder.getPayVendor()) && EnumPayMchType.DIRECT.getCode().equals(payOrder.getMchType()) && !sharingOrder.getMerchantId().equals(wxComposeChildOrderShare.getMerchantId()) - && EnumTtPayChannel.ALI_PAY.getCode().equals(payOrder.getTtPayWay())){ +// && EnumTtPayChannel.ALI_PAY.getCode().equals(payOrder.getTtPayWay()) + ){ + //todo 微信支付最大分账30% 限制 //抖音 直连 多商户 支付宝支付 进件支付宝 分账 否则记账 JSONObject jo = new JSONObject(); jo.put("type",EnumProfitPaymentReceiverType.getEnum(receiver.getReceiverType()).getMessage()); From 50cd4152faccba9da1ce060ed9690c5264ba59cb Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 09:23:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A5=A8?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C=E3=80=81=E6=96=B0=E5=A2=9E=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E5=8D=A1=E6=96=B0=E5=A2=9E=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=81=E6=96=B0=E5=A2=9E=E6=B6=88=E8=B4=B9=E5=8D=A1?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCreditHistoryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index bc6552ef5..06550a184 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -589,7 +589,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxCreditHistory saveOrUpdate(WxCreditHistory record,TenantEntity tenantEntity) { WxCreditHistory history = wxCreditHistoryMapper.selectOne(new LambdaQueryWrapper().eq(WxCreditHistory::getTicketNumber, record.getTicketNumber())); - if (history == null){ + if (history != null){ throw new MallinkException(ErrorCode.SMALL_TICKET_IS_USED); } WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId()); From f472d42bc643714efacde3123c6824f4b7ec3df8 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Tue, 27 Jun 2023 13:27:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A5=A8?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCreditHistoryServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 06550a184..88a635a58 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -588,9 +588,11 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxCreditHistory saveOrUpdate(WxCreditHistory record,TenantEntity tenantEntity) { - WxCreditHistory history = wxCreditHistoryMapper.selectOne(new LambdaQueryWrapper().eq(WxCreditHistory::getTicketNumber, record.getTicketNumber())); - if (history != null){ - throw new MallinkException(ErrorCode.SMALL_TICKET_IS_USED); + if (StringUtils.isNotBlank(record.getTicketNumber())){ + WxCreditHistory history = wxCreditHistoryMapper.selectOne(new LambdaQueryWrapper().eq(WxCreditHistory::getTicketNumber, record.getTicketNumber())); + if (history != null){ + throw new MallinkException(ErrorCode.SMALL_TICKET_IS_USED); + } } WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId()); if (wxCUserBasicInfo == null) { From 9af4688466788ca756260dc560d2f3badaef19ac Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 27 Jun 2023 14:20:25 +0800 Subject: [PATCH 4/4] //bug --- mallinkService/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mallinkService/pom.xml b/mallinkService/pom.xml index c08a17ef9..d78dee99c 100644 --- a/mallinkService/pom.xml +++ b/mallinkService/pom.xml @@ -40,11 +40,6 @@ alipay-easysdk 2.2.0 - - com.iformall - mallinkAdmin - 1.0 - \ No newline at end of file