From e2691be14e5ad72304308cfb0427c2c6d70b72fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 29 Dec 2022 11:31:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E5=85=B3=E4=BA=8E=E6=89=98=E7=A6=8F=E8=B5=8F=E9=87=91?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD,=E6=94=AF=E6=8C=81=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E8=B5=8F=E9=87=91=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ctrl/XmTaskExecuserController.java | 8 +- .../com/xm/core/service/client/AcClient.java | 124 +++++------------- 2 files changed, 37 insertions(+), 95 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index d7a0ff7d..dde178d3 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -536,15 +536,13 @@ public class XmTaskExecuserController { xmTaskUpdate.setId(xmTask.getId()); xmTaskUpdate.setTaskState("4"); if(needPay){ - XmTaskExecuser xmTaskExecuserDb=this.xmTaskExecuserService.selectOneById(map("taskId",xmTask.getId(),"userid",xmTask.getExecutorUserid())); - acClient.shopBalancePayToClient("plaftform-branch-001","platfrom", - xmTask.getId(),xmTask.getQuoteFinalAt(),"任务【"+xmTask.getName()+"】验收完毕，发放佣金.",xmTask.getExecutorUserid(),xmTaskExecuserDb.getExecUserBranchId()); + //XmTaskExecuser xmTaskExecuserDb=this.xmTaskExecuserService.selectOneById(map("taskId",xmTask.getId(),"userid",xmTask.getExecutorUserid())); //调用ac系统付款给服务商 + acClient.platformBalancePayToClient(xmTask.getExecutorUserid(),xmTask.getId(),xmTask.getQuoteFinalAt(),"任务【"+xmTask.getName()+"】验收完毕，发放佣金."); + xmTaskUpdate.setEtoDevTime(new Date()); xmTaskUpdate.setBidStep("7"); xmTaskUpdate.setEstate("3"); - acClient.shopBalancePayToClient(platformBranchId,"platform",xmTask.getId(),xmTask.getEfunds(), - "任务【"+xmTask.getName()+"】验收完毕，发放佣金.",xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getExecUserBranchId()); } xmTaskService.updateSomeFieldByPk(xmTaskUpdate); diff --git a/xm-core/src/main/java/com/xm/core/service/client/AcClient.java b/xm-core/src/main/java/com/xm/core/service/client/AcClient.java index 76c7d6fd..ad87d48e 100644 --- a/xm-core/src/main/java/com/xm/core/service/client/AcClient.java +++ b/xm-core/src/main/java/com/xm/core/service/client/AcClient.java @@ -6,11 +6,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.BaseUtils; import com.mdp.core.utils.SequenceFormat; import com.mdp.micro.client.CallBizService; -import com.mdp.tpa.client.entity.AppShopConfig; -import com.mdp.tpa.client.service.AppShopConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.util.HashMap; @@ -25,62 +22,28 @@ public class AcClient { @Autowired ObjectMapper om; - - @Autowired - AppShopConfigService appShopConfigService; + Set userCardCodeSet=new HashSet(1000); /** - * 结算商家付款给客户。不适用第三方支付、而是直接使用本系统账户余额支付。登记流水及记账一次性完成 - * @param payShopId 支付商户编号 - * @param payLocationId 支付方店铺编号 - * @param acctPrjType 核算项目类型 platfrom/shop/location + * 企业付款给个人 + * @param payCompanyId 支付方企业编号 + * @param incomeUserid 收款方用户编号 * @param orderId 订单号 如没有，调用者自行编码一个订单号 - * @param orderAmount 订单总金额 如果有多次付款，即为所有子单总金额之和 - * @param remark 备注 - * @param goodsShopId 收款方商户编号 - * @param goodsLocationId 收款方店铺编号 + * @param payAt 订单总金额 如果有多次付款，即为所有子单总金额之和 + * @param remarks 备注 * @return */ - public Map shopBalancePayToClient(String payShopId,String payLocationId,String acctPrjType, String orderId, BigDecimal orderAmount, String remark, - String incomeUserid, String goodsShopId, String goodsLocationId){ - String urls = "/accore/accore/tpa/pay/shopBalancePayToClient"; + public Map companyBalancePayToClient(String payCompanyId,String incomeUserid, String orderId, BigDecimal payAt, String remarks){ + String urls = "/accore/accore/tpa/pay/companyBalancePayToClient"; Map m=new HashMap<>(); - m.put("payShopId", payShopId); - m.put("payLocationId", payLocationId); - m.put("acctPrjType", acctPrjType); - m.put("orderId",orderId); - m.put("orderAmount", orderAmount); - m.put("remark", remark); + m.put("payCompanyId", payCompanyId); m.put("incomeUserid", incomeUserid); - m.put("goodsShopId", goodsShopId); - m.put("goodsLocationId", goodsLocationId); - Map tipMap = restTemplate.postForMap(urls,m); - Tips tips= BaseUtils.mapToTips(tipMap); - if(!tips.isOk()){ - throw new BizException(tips); - } - return tipMap; - } - - /** - * 给平台充值，登记到平台账户中，用于下一步支付给第三方 - * @param payUserid 订单号 如没有，调用者自行编码一个订单号 - * @param rechargeAmount 订单总金额 如果有多次付款，即为所有子单总金额之和 - * @param refsn 关联流水号 - * @param remark 备注 - * @return - */ - public Map platformRecharge(String payUserid, BigDecimal rechargeAmount, String refsn,String remark ){ - - String urls = "/accore/accore/acct/account/platform/recharge"; - Map m=new HashMap<>(); - m.put("payUserid", payUserid); - m.put("rechargeAmount", rechargeAmount); - m.put("refsn", refsn); - m.put("remark",remark); + m.put("orderId",orderId); + m.put("payAt", payAt); + m.put("remarks", remarks); Map tipMap = restTemplate.postForMap(urls,m); Tips tips= BaseUtils.mapToTips(tipMap); if(!tips.isOk()){ @@ -90,34 +53,21 @@ public class AcClient { } /** - * 结算商家付款给客户。不适用第三方支付、而是直接使用本系统账户余额支付。登记流水及记账一次性完成 - * @param payBranchId 支付商户归属机构编号 - * @param acctPrjType 核算项目类型 platfrom/shop/location - * @param orderId 订单号 如没有，调用者自行编码一个订单号 - * @param orderAmount 订单总金额 如果有多次付款，即为所有子单总金额之和 - * @param remark 备注 - * @param receBranchId 收款方商户归属机构编号 + * 平台给个人付款 + * @param incomeUserid 收款用户编号 + * @param payAt 订单总金额 + * @param orderId 关联流水号 + * @param remarks 备注 * @return */ - public Map shopBalancePayToClient(String payBranchId,String acctPrjType, String orderId, BigDecimal orderAmount, String remark, - String incomeUserid,String receBranchId){ - AppShopConfig payConfig=appShopConfigService.getShopConfigByBranchId(payBranchId); + public Map platformBalancePayToClient(String incomeUserid,String orderId, BigDecimal payAt, String remarks ){ - AppShopConfig receConfig=payConfig; - if( StringUtils.hasText(receBranchId) && !payBranchId.equals(receBranchId)){ - receConfig=appShopConfigService.getShopConfigByBranchId(receBranchId); - } - String urls = "/accore/accore/tpa/pay/shopBalancePayToClient"; + String urls = "/accore/accore/tpa/pay/platformBalancePayToClient"; Map m=new HashMap<>(); - m.put("payShopId", payConfig.getShopId()); - m.put("payLocationId", payConfig.getHeadLocationId()); - m.put("acctPrjType", acctPrjType); - m.put("orderId",orderId); - m.put("orderAmount", orderAmount); - m.put("remark", remark); m.put("incomeUserid", incomeUserid); - m.put("goodsShopId", receConfig.getShopId()); - m.put("goodsLocationId", receConfig.getHeadLocationId()); + m.put("payAt", payAt); + m.put("orderId", orderId); + m.put("remarks",remarks); Map tipMap = restTemplate.postForMap(urls,m); Tips tips= BaseUtils.mapToTips(tipMap); if(!tips.isOk()){ @@ -125,30 +75,24 @@ public class AcClient { } return tipMap; } + /** - * 结算商家 付款 给 合作商家、用于退还合作商家缴纳的活动保证金等。核销卡券时，付款给合作商家等。不适用第三方支付、而是直接使用本系统账户余额支付。登记流水及记账一次性完成 - * @param payShopId 支付商户编号 - * @param payLocationId 支付方店铺编号 - * @param acctPrjType 核算项目类型 platfrom/shop/location + * 企业之间付款 + * @param payCompanyId 支付归属机构号 + * @param incomeCompanyId 收款方用户编号 * @param orderId 订单号 如没有，调用者自行编码一个订单号 - * @param orderAmount 订单总金额 如果有多次付款，即为所有子单总金额之和 - * @param remark 备注 - * @param goodsShopId 收款方商户编号 - * @param goodsLocationId 收款方店铺编号 + * @param payAt 订单总金额 如果有多次付款，即为所有子单总金额之和 + * @param remarks 备注 * @return */ - public Map shopBanlancePayToShop(String payShopId,String payLocationId,String acctPrjType, String orderId, BigDecimal orderAmount, String remark, - String goodsShopId, String goodsLocationId){ - String urls = "/accore/accore/tpa/pay/shopBanlancePayToShop"; + public Map companyBalancePayToCompany(String payCompanyId,String incomeCompanyId, String orderId, BigDecimal payAt, String remarks ){ + String urls = "/accore/accore/tpa/pay/companyBalancePayToCompany"; Map m=new HashMap<>(); - m.put("payShopId", payShopId); - m.put("payLocationId", payLocationId); - m.put("acctPrjType", acctPrjType); + m.put("payCompanyId", payCompanyId); + m.put("incomeCompanyId", incomeCompanyId); m.put("orderId",orderId); - m.put("orderAmount", orderAmount); - m.put("remark", remark); - m.put("goodsShopId", goodsShopId); - m.put("goodsLocationId", goodsLocationId); + m.put("payAt", payAt); + m.put("remarks", remarks); Map tipMap = restTemplate.postForMap(urls,m); Tips tips= BaseUtils.mapToTips(tipMap); if(!tips.isOk()){