From 50a6e433090a538ceeade3e922c04842a641d7e4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Jan 2022 18:23:42 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81callback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/config/ShiroConfig.java | 1 + .../impl/WxCouponOrderServiceImpl.java | 5 ++- .../impl/WxProfitSharingOrderServiceImpl.java | 35 +++++++++---------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java index 6972f71ee..32334bcee 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java @@ -111,6 +111,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/business/circle/**", "anon"); // 商圈回调 filterChainDefinitionMap.put("/alipay/notify/**", "anon"); + filterChainDefinitionMap.put("/ttPay/notify/**", "anon"); filterChainDefinitionMap.put("/jinmao/notify/**", "anon"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 7bbdc6eaf..88b4a109e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -3,7 +3,6 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -29,8 +28,6 @@ import com.iformall.pay.WxPayConstant; import com.iformall.service.*; import com.iformall.service.order.OrderAdapterService; import com.iformall.service.order.OrderFactory; -import com.iformall.service.order.entity.WxComposeChildOrderPrice; -import com.iformall.service.order.entity.WxComposeChildOrderShare; import com.iformall.service.order.entity.WxComposeOrder; import com.iformall.service.order.util.OrderHelper; import com.iformall.service.pay.PayServiceFactory; @@ -767,6 +764,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (couponOrder.getCouponPrice() > 0) { recordAfterVerified(couponOrder, merchant.getId()); + //TODO (系统设置不分账抖音也需要分账)抖音先记账, 定时去处理分账业务 WxPayOrder wxPayOrder = new WxPayOrder(); Long orderId = couponOrder.getOrderId(); if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { @@ -776,6 +774,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxPayOrder.setOrderId(orderId); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); + wxProfitSharingOrderService.finishDouyinSharingOrder(wxPayOrder); } 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 9aa2938f9..cd0a6739b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -546,17 +546,14 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - final IdWorker idworker = IdWorker.get(); - - WxAppinfo appInfo = getAppinfo(wxPayOrder.getTenantId(),wxPayOrder.getPayVendor()); WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); - //分账检查是否已创建分账订单 WxProfitSharingOrder record = new WxProfitSharingOrder(); //创建分账订单 Date currentDate = new Date(); + final IdWorker idworker = IdWorker.get(); record.setId(idworker.nextId()); record.updateTenantInfo(payAccount); record.setTransactionId(wxPayOrder.getTransactionId()); @@ -571,21 +568,21 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ record.setType(EnumProfitSharingOrderType.PROFIT_SHARING_DOUYIN_SINGLE.getCode()); wxProfitSharingOrderMapper.insert(record); - //分账提交 - PayShareResult shareResult = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor()).noReciverShare(appInfo,payAccount,record,wxPayOrder.getPayOrderNo(),wxPayOrder.getShareAmount()); - if (!shareResult.isSuccess()) { - record.setSharingStatus(shareResult.getCode()); - record.setErrorMsg(shareResult.getMsg()); - record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateById(record); - return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),record.getErrorMsg()); - } - - record.setSharingOrderNo(shareResult.getShareOrderNo()); - record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); - record.setUpdateTime(new Date()); - wxProfitSharingOrderMapper.updateById(record); - return new ResultData(shareResult.getData()); +// //分账提交 +// PayShareResult shareResult = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor()).noReciverShare(appInfo,payAccount,record,wxPayOrder.getPayOrderNo(),wxPayOrder.getShareAmount()); +// if (!shareResult.isSuccess()) { +// record.setSharingStatus(shareResult.getCode()); +// record.setErrorMsg(shareResult.getMsg()); +// record.setUpdateTime(new Date()); +// wxProfitSharingOrderMapper.updateById(record); +// return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),record.getErrorMsg()); +// } +// +// record.setSharingOrderNo(shareResult.getShareOrderNo()); +// record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); +// record.setUpdateTime(new Date()); +// wxProfitSharingOrderMapper.updateById(record); + return new ResultData(); } @Override