变更为执行人关于托福赏金的判断,支持追加赏金操作

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);

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;
@@ -26,61 +23,27 @@ public class AcClient {
 	@Autowired
 	ObjectMapper om;
  
-	@Autowired
-	AppShopConfigService appShopConfigService;
 	
 	Set<String> userCardCodeSet=new HashSet<String>(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<String,Object> 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<String,Object> companyBalancePayToClient(String payCompanyId,String incomeUserid,  String orderId, BigDecimal payAt, String remarks){
+		String urls = "/accore/accore/tpa/pay/companyBalancePayToClient";
 		Map<String,Object> 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<String,Object> 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<String,Object> platformRecharge(String payUserid,  BigDecimal rechargeAmount, String refsn,String remark ){
-
-		String urls = "/accore/accore/acct/account/platform/recharge";
-		Map<String,Object> 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<String,Object> 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<String,Object> shopBalancePayToClient(String payBranchId,String acctPrjType, String orderId, BigDecimal orderAmount, String remark,
-													 String incomeUserid,String receBranchId){
-		AppShopConfig payConfig=appShopConfigService.getShopConfigByBranchId(payBranchId);
+	public Map<String,Object> 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<String,Object> 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<String,Object> 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<String,Object> 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<String,Object> companyBalancePayToCompany(String payCompanyId,String incomeCompanyId, String orderId, BigDecimal payAt, String remarks ){
+		String urls = "/accore/accore/tpa/pay/companyBalancePayToCompany";
 		Map<String,Object> 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<String,Object> tipMap = restTemplate.postForMap(urls,m);
 		Tips tips= BaseUtils.mapToTips(tipMap);
 		if(!tips.isOk()){