From 15dc003284c1cde74fea97868857330edce96475 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 6 Sep 2022 19:25:18 +0800 Subject: [PATCH] =?UTF-8?q?//=20=E5=88=86=E8=B4=A6=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/callback/TtPayController.java | 25 +++++++++++++------ .../service/WxProfitSharingOrderService.java | 4 ++- .../impl/WxProfitSharingOrderServiceImpl.java | 5 ++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java index 67cc9a742..c4f38faba 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java @@ -6,10 +6,7 @@ import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxBatchOrder; -import com.iformall.domain.po.WxPayAccount; -import com.iformall.domain.po.WxPayOrder; +import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg; import com.iformall.douyin.pay.DouYinPayHelper; @@ -48,6 +45,9 @@ public class TtPayController extends BaseController { @Autowired private WxPayAccountService payAccountService; + @Autowired + private WxProfitSharingOrderService wxProfitSharingOrderService; + @Autowired private WxRefundOrderService wxRefundOrderService; @@ -227,10 +227,21 @@ public class TtPayController extends BaseController { resultMap.put("err_no",0); resultMap.put("err_tips","success"); - }else if("settle".equals(type)){ - + }else if("settle".equals(type)){//分账回调 + String order_id = (String) pMap.get("order_id"); + String settle_id = (String) pMap.get("settle_id"); + String out_settle_no = (String) pMap.get("out_settle_no"); + String status = (String) pMap.get("status"); + WxProfitSharingOrder wxProfitSharingOrder = new WxProfitSharingOrder(); + wxProfitSharingOrder.setTenantId(appinfo.getTenantId()); + wxProfitSharingOrder.setOutSettleNo(Long.parseLong(out_settle_no)); + WxProfitSharingOrder one = wxProfitSharingOrderService.findOne(wxProfitSharingOrder); + if(one != null){ + wxProfitSharingOrderService.querySharingOrder(wxProfitSharingOrder); + resultMap.put("err_no",0); + resultMap.put("err_tips","success"); + } } - return resultMap; } catch (Exception e){ logger.error(e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java index 8ef9eedda..39a26eec9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java @@ -51,7 +51,9 @@ public interface WxProfitSharingOrderService { Map queryOrderSummary(TenantEntity tenantEntity); ResultData findOrderDetails(Long id,String tenantId); - + + WxProfitSharingOrder findOne(WxProfitSharingOrder wxProfitSharingOrder); + // void updatetttttttttttttt(String tenantId); // ResultData handerSharingOrder(WxProfitSharingOrder sharingOrder); 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 320b1eef0..b08a41bea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -473,6 +473,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(result); } + @Override + public WxProfitSharingOrder findOne(WxProfitSharingOrder wxProfitSharingOrder) { + return wxProfitSharingOrderMapper.selectOne(new QueryWrapper<>(wxProfitSharingOrder)); + } + public void queryMerchantCount(TenantEntity tenantEntity, Map result) { String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //全部商户个数